From 1ce686575dd9568c22677be554821e6b30286ef3 Mon Sep 17 00:00:00 2001 From: Watson Yuuma Sato Date: Tue, 4 Aug 2026 12:10:56 +0200 Subject: [PATCH 1/2] Update other required files with specified version The make bundle target is not updating some of the files. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index d7c8f0637..e570728c4 100644 --- a/Makefile +++ b/Makefile @@ -335,6 +335,14 @@ image: test-unit clean-controller-gen ## Build the operator image. .PHONY: bundle bundle: check-operator-version operator-sdk manifests update-skip-range kustomize ## Generate bundle manifests and metadata, then validate generated files. + @CURRENT_VERSION=$$(grep '^VERSION?=' version.Makefile | cut -d= -f2); \ + if [ "$(VERSION)" != "$$CURRENT_VERSION" ]; then \ + sed -i "s/^ARG FIO_OLD_VERSION=.*/ARG FIO_OLD_VERSION=\"$$CURRENT_VERSION\"/" bundle.openshift.Dockerfile; \ + sed -i 's/^ARG FIO_NEW_VERSION=.*/ARG FIO_NEW_VERSION="$(VERSION)"/' bundle.openshift.Dockerfile; \ + fi + sed -i 's/^VERSION?=.*/VERSION?=$(VERSION)/' version.Makefile + sed -i 's/Version = ".*"/Version = "$(VERSION)"/' version/version.go + sed -i 's/version=.*/version=$(VERSION)/' build/Dockerfile.openshift $(SDK_BIN) generate kustomize manifests --apis-dir=./pkg/apis -q @echo "kustomize using deployment image $(IMG)" cd config/manager && $(KUSTOMIZE) edit set image $(APP_NAME)=$(IMG) From 84734ed9cd2c7be7d2844c4aa95035fb5e7a72ea Mon Sep 17 00:00:00 2001 From: Watson Yuuma Sato Date: Tue, 4 Aug 2026 13:20:08 +0200 Subject: [PATCH 2/2] Bump version to v1.4.1 --- build/Dockerfile.openshift | 2 +- bundle.Dockerfile | 4 ++-- bundle.openshift.Dockerfile | 4 ++-- ...le-integrity-operator.clusterserviceversion.yaml | 13 ++++++------- bundle/metadata/annotations.yaml | 4 ++-- catalog/preamble.json | 4 ++-- ...le-integrity-operator.clusterserviceversion.yaml | 2 +- version.Makefile | 2 +- version/version.go | 2 +- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/build/Dockerfile.openshift b/build/Dockerfile.openshift index 0bfd6c70f..657e3b694 100644 --- a/build/Dockerfile.openshift +++ b/build/Dockerfile.openshift @@ -35,7 +35,7 @@ LABEL \ com.redhat.component="openshift-file-integrity-operator-container" \ io.openshift.maintainer.product="OpenShift Container Platform" \ io.openshift.maintainer.component="File Integrity Operator" \ - version=1.4.0 + version=1.4.1 # io.openshift.build.commit.id=98271bc2812881010146f47e4587dcd449b846bd \ # io.openshift.build.source-location=https://github.com/openshift/file-integrity-operator.git \ # io.openshift.build.commit.url=https://github.com/openshift/file-integrity-operator.git/commit/98271bc2812881010146f47e4587dcd449b846bd \ diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 924578a9a..a7a6e955f 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=file-integrity-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.42.2 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle.openshift.Dockerfile b/bundle.openshift.Dockerfile index 6d23340fb..9b7a50029 100644 --- a/bundle.openshift.Dockerfile +++ b/bundle.openshift.Dockerfile @@ -1,5 +1,5 @@ -ARG FIO_OLD_VERSION="1.3.8" -ARG FIO_NEW_VERSION="1.4.0" +ARG FIO_OLD_VERSION="1.4.0" +ARG FIO_NEW_VERSION="1.4.1" ARG OPERATOR_IMAGE="" FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder diff --git a/bundle/manifests/file-integrity-operator.clusterserviceversion.yaml b/bundle/manifests/file-integrity-operator.clusterserviceversion.yaml index 52327ef61..17ad44ae4 100644 --- a/bundle/manifests/file-integrity-operator.clusterserviceversion.yaml +++ b/bundle/manifests/file-integrity-operator.clusterserviceversion.yaml @@ -19,15 +19,15 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring,Security - createdAt: "2026-05-04T11:14:39Z" - olm.skipRange: '>=1.0.0 <1.4.0' + createdAt: "2026-08-04T11:18:37Z" + olm.skipRange: '>=1.0.0 <1.4.1' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-file-integrity operators.openshift.io/infrastructure-features: '["disconnected", "fips"]' operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]' - operators.operatorframework.io/builder: operator-sdk-v1.42.2 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 + operators.operatorframework.io/builder: operator-sdk-v1.27.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/openshift/file-integrity-operator labels: operatorframework.io/arch.amd64: supported @@ -35,7 +35,7 @@ metadata: operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported operatorframework.io/os.zos: supported - name: file-integrity-operator.v1.4.0 + name: file-integrity-operator.v1.4.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -327,5 +327,4 @@ spec: relatedImages: - image: quay.io/file-integrity-operator/file-integrity-operator:latest name: operator - version: 1.4.0 - replaces: file-integrity-operator.v1.3.8 + version: 1.4.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 2eccfd980..3d29017e6 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,9 +6,9 @@ annotations: operators.operatorframework.io.bundle.package.v1: file-integrity-operator operators.operatorframework.io.bundle.channels.v1: alpha operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.42.2 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/catalog/preamble.json b/catalog/preamble.json index df09e5649..9cc500dbf 100644 --- a/catalog/preamble.json +++ b/catalog/preamble.json @@ -13,8 +13,8 @@ "package": "file-integrity-operator", "entries": [ { - "name": "file-integrity-operator.v1.4.0", - "skipRange": ">=1.0.0 <1.4.0" + "name": "file-integrity-operator.v1.4.1", + "skipRange": ">=1.0.0 <1.4.1" } ] } diff --git a/config/manifests/bases/file-integrity-operator.clusterserviceversion.yaml b/config/manifests/bases/file-integrity-operator.clusterserviceversion.yaml index 5360e7307..904e9e221 100644 --- a/config/manifests/bases/file-integrity-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/file-integrity-operator.clusterserviceversion.yaml @@ -19,7 +19,7 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring,Security - olm.skipRange: '>=1.0.0 <1.4.0' + olm.skipRange: '>=1.0.0 <1.4.1' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-file-integrity operators.openshift.io/infrastructure-features: '["disconnected", "fips"]' diff --git a/version.Makefile b/version.Makefile index 87e82ffc3..c8ae428dc 100644 --- a/version.Makefile +++ b/version.Makefile @@ -2,4 +2,4 @@ # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION?=1.4.0 +VERSION?=1.4.1 diff --git a/version/version.go b/version/version.go index 6f3e4ce07..70012cb41 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.4.0" + Version = "1.4.1" )