Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/operatorhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
upstream: k8s-operatorhub/community-operators
- fork: VictoriaMetrics/openshift-community-operators-prod
upstream: redhat-openshift-ecosystem/community-operators-prod
- fork: VictoriaMetrics/openshift-certified-operators
upstream: redhat-openshift-ecosystem/certified-operators
steps:
- name: Sync forks
run: |
Expand Down Expand Up @@ -81,12 +83,10 @@ jobs:

mv bundle/* ${OPERATOR_DIR}/
if [ -f ${OPERATOR_DIR}/Makefile ]; then
yq -i 'del(.updateGraph)' ${OPERATOR_DIR}/ci.yaml
if [ ! -z $OLD_VERSION ]; then
yq -i -I2 '.catalog_templates.[].replaces = strenv(OLD_ENTRY)' ${OPERATOR_DIR}/${NEW_VERSION}/release-config.yaml
fi
else
yq -i 'del(.fbc)' ${OPERATOR_DIR}/ci.yaml
rm -f ${OPERATOR_DIR}/${NEW_VERSION}/release-config.yaml
fi
echo "VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
echo ${{secrets.REPO_KEY}} | docker login --username ${{secrets.REPO_USER}} --password-stdin
echo ${{secrets.QUAY_ACCESSKEY}} | docker login quay.io --username '${{secrets.QUAY_USER}}' --password-stdin
make publish
TAG=${TAG} make olm
TAG=${TAG} REGISTRY=quay.io make olm
gh release upload ${{github.event.release.tag_name}} ./dist/install-no-webhook.yaml#install-no-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
gh release upload ${{github.event.release.tag_name}} ./dist/install-with-webhook.yaml#install-with-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
gh release upload ${{github.event.release.tag_name}} ./config/crd/overlay/crd.yaml#crd.yaml --clobber || echo "fix me NOT enough security permissions"
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -256,19 +256,21 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi
$(KUSTOMIZE) build config/crd/overlay > dist/crd.yaml

olm: operator-sdk opm yq docs
$(eval DIGEST = $(shell $(CONTAINER_TOOL) buildx imagetools inspect $(REGISTRY)/$(ORG)/$(REPO):$(TAG)-ubi --format "{{print .Manifest.Digest}}"))
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make sure it returns the manifest list digest instead of arch-specific manifest

Copy link
Copy Markdown
Contributor Author

@AndrewChubatiuk AndrewChubatiuk Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does return list digest, you can recheck if you want

rm -rf bundle*
$(OPERATOR_SDK) generate kustomize manifests -q
cd config/manifests && \
$(KUSTOMIZE) edit set image manager=$(REGISTRY)/$(ORG)/$(REPO):$(TAG)-ubi
$(KUSTOMIZE) edit set image manager=$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle \
-q --overwrite --version $(VERSION) \
--channels=beta --default-channel=beta --output-dir=bundle/$(VERSION)
$(OPERATOR_SDK) bundle validate ./bundle/$(VERSION)
cp config/manifests/ci.yaml bundle/
cp config/manifests/release-config.yaml bundle/$(VERSION)/
$(YQ) -i '.metadata.annotations.containerImage = "$(REGISTRY)/$(ORG)/$(REPO):$(TAG)"' \
$(YQ) -i '.metadata.annotations.containerImage = "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"' \
bundle/$(VERSION)/manifests/victoriametrics-operator.clusterserviceversion.yaml
$(YQ) -i '.annotations."com.redhat.openshift.versions" = "v4.12-v4.19"' \
$(YQ) -i '.relatedImages = [{"name": "victoriametrics-operator", "image": "$(REGISTRY)/$(ORG)/$(REPO)@$(DIGEST)"}]' \
bundle/$(VERSION)/manifests/victoriametrics-operator.clusterserviceversion.yaml
$(YQ) -i '.annotations."com.redhat.openshift.versions" = "v4.12-v4.20"' \
bundle/$(VERSION)/metadata/annotations.yaml
$(if $(findstring localhost,$(REGISTRY)), \
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(REGISTRY)/$(ORG)/$(REPO)-bundle:$(TAG) .; \
Expand Down
27 changes: 0 additions & 27 deletions config/manifests/ci.yaml

This file was deleted.