update openshift release#2120
Open
AndrewChubatiuk wants to merge 1 commit intomasterfrom
Open
Conversation
Contributor
There was a problem hiding this comment.
2 issues found across 3 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name=".github/workflows/operatorhub.yaml">
<violation number="1" location=".github/workflows/operatorhub.yaml:113">
P0: Remove the stray trailing text line; it breaks workflow YAML syntax.</violation>
</file>
<file name="Makefile">
<violation number="1" location="Makefile:291">
P1: The generated CSV no longer sets `spec.replaces`, which can break OLM upgrade paths between operator versions.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review, or fix all with cubic.
| PREV_HEAD="$$PREV_HEAD" $(YQ) -i '(.entries[] | select(.schema == "olm.channel")).entries = [{"name": "victoriametrics-operator.v$(VERSION)", "replaces": strenv(PREV_HEAD)}] + (.entries[] | select(.schema == "olm.channel") | .entries | map(select(.name != "victoriametrics-operator.v$(VERSION)")))' \ | ||
| config/manifests/catalog-templates/latest.yaml; \ | ||
| PREV_HEAD="$$PREV_HEAD" $(YQ) -i '.spec.relatedImages = [{"name": "victoriametrics-operator", "image": "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"}] | .spec.replaces = strenv(PREV_HEAD)' \ | ||
| $(YQ) -i '.spec.relatedImages = [{"name": "victoriametrics-operator", "image": "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"}]' \ |
Contributor
There was a problem hiding this comment.
P1: The generated CSV no longer sets spec.replaces, which can break OLM upgrade paths between operator versions.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At Makefile, line 291:
<comment>The generated CSV no longer sets `spec.replaces`, which can break OLM upgrade paths between operator versions.</comment>
<file context>
@@ -286,27 +286,10 @@ olm: operator-sdk opm yq docs
- PREV_HEAD="$$PREV_HEAD" $(YQ) -i '(.entries[] | select(.schema == "olm.channel")).entries = [{"name": "victoriametrics-operator.v$(VERSION)", "replaces": strenv(PREV_HEAD)}] + (.entries[] | select(.schema == "olm.channel") | .entries | map(select(.name != "victoriametrics-operator.v$(VERSION)")))' \
- config/manifests/catalog-templates/latest.yaml; \
- PREV_HEAD="$$PREV_HEAD" $(YQ) -i '.spec.relatedImages = [{"name": "victoriametrics-operator", "image": "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"}] | .spec.replaces = strenv(PREV_HEAD)' \
+ $(YQ) -i '.spec.relatedImages = [{"name": "victoriametrics-operator", "image": "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"}]' \
bundle/$(VERSION)/manifests/victoriametrics-operator.clusterserviceversion.yaml
- cp config/manifests/catalog-templates/latest.yaml bundle/$(VERSION)/catalog-templates/latest.yaml
</file context>
54880dc to
cb11c2a
Compare
cb11c2a to
885f239
Compare
885f239 to
fe96a56
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by cubic
Update OpenShift support to v4.22 and simplify the OperatorHub flow by switching to the
operators/victoriametrics-operatorlayout and dropping in-repo catalog generation..annotations."com.redhat.openshift.versions"tov4.12-v4.22.olmartifact fromrelease.yaml, moves the bundle tooperators/victoriametrics-operator/<version>, sets CSVspec.replaceswhen a previous version exists, updates channel templates in-place when present, and opens PRs under that path.opmfrom theolmMakefile target; deleteconfig/manifests/catalog-templates/latest.yaml; stop building localcatalog/; keepoperator-sdkandyqonly.relatedImages; stop settingspec.replacesduring build.Written for commit 885f239. Summary will update on new commits. Review in cubic