From de61540217adc6eb1dc13b35f3d4e117180259f9 Mon Sep 17 00:00:00 2001 From: Alexander Bushkin Date: Thu, 6 Aug 2026 19:27:52 +0200 Subject: [PATCH] Bump version to v1.9.2 --- Makefile | 14 +++++++++++++- bundle.openshift.Dockerfile | 4 ++-- .../compliance-operator.clusterserviceversion.yaml | 10 +++++----- catalog/preamble.json | 4 ++-- .../compliance-operator.clusterserviceversion.yaml | 6 +++--- images/must-gather/Containerfile | 2 +- images/openscap/Containerfile | 2 +- images/operator/Dockerfile | 2 +- version.Makefile | 4 ++-- version/version.go | 2 +- 10 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 646ca4a739..7994888f16 100644 --- a/Makefile +++ b/Makefile @@ -386,8 +386,20 @@ endif .PHONY: update-version-numbers update-version-numbers: check-operator-version ## Set skip range and version numbers in manifests. + @CURRENT_VERSION=$$(grep '^VERSION?=' version.Makefile | cut -d= -f2); \ + if [ "$(VERSION)" != "$$CURRENT_VERSION" ]; then \ + sed -i "s/^ARG CO_OLD_VERSION=.*/ARG CO_OLD_VERSION=\"$$CURRENT_VERSION\"/" bundle.openshift.Dockerfile; \ + sed -i 's/^ARG CO_NEW_VERSION=.*/ARG CO_NEW_VERSION="$(VERSION)"/' bundle.openshift.Dockerfile; \ + sed -i "s/^PREVIOUS_VERSION?=.*/PREVIOUS_VERSION?=$$CURRENT_VERSION/" version.Makefile; \ + fi + sed -i 's/^VERSION?=.*/VERSION?=$(VERSION)/' version.Makefile + sed -i 's/Version = ".*"/Version = "$(VERSION)"/' version/version.go + sed -i 's/version=.*/version=$(VERSION)/' images/operator/Dockerfile + sed -i 's/version=.*/version=$(VERSION)/' images/openscap/Containerfile + sed -i 's/version=.*/version=$(VERSION)/' images/must-gather/Containerfile sed -i "s/\(^ version: \).*/\1$(VERSION)/" config/manifests/bases/compliance-operator.clusterserviceversion.yaml - sed -i "s/\(^ replaces: compliance-operator.v\).*/\1$(PREVIOUS_VERSION)/" config/manifests/bases/compliance-operator.clusterserviceversion.yaml + @PREV=$$(grep '^PREVIOUS_VERSION?=' version.Makefile | cut -d= -f2); \ + sed -i "s/\(^ replaces: compliance-operator.v\).*/\1$$PREV/" config/manifests/bases/compliance-operator.clusterserviceversion.yaml sed -i "s/\(olm.skipRange: '>=.*\)<.*'/\1<$(VERSION)'/" config/manifests/bases/compliance-operator.clusterserviceversion.yaml sed -i "s/\(\"name\": \"compliance-operator.v\).*\"/\1$(VERSION)\"/" catalog/preamble.json sed -i "s/\(\"skipRange\": \">=.*\)<.*\"/\1<$(VERSION)\"/" catalog/preamble.json diff --git a/bundle.openshift.Dockerfile b/bundle.openshift.Dockerfile index c3b73fb3ce..9993cea743 100644 --- a/bundle.openshift.Dockerfile +++ b/bundle.openshift.Dockerfile @@ -1,5 +1,5 @@ -ARG CO_OLD_VERSION="1.9.0" -ARG CO_NEW_VERSION="1.9.1" +ARG CO_OLD_VERSION="1.9.1" +ARG CO_NEW_VERSION="1.9.2" FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder diff --git a/bundle/manifests/compliance-operator.clusterserviceversion.yaml b/bundle/manifests/compliance-operator.clusterserviceversion.yaml index 4714c779dd..0aa04a2d16 100644 --- a/bundle/manifests/compliance-operator.clusterserviceversion.yaml +++ b/bundle/manifests/compliance-operator.clusterserviceversion.yaml @@ -160,9 +160,9 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring,Security - createdAt: "2026-06-11T13:25:22Z" + createdAt: "2026-08-06T09:33:37Z" must-gather-image: ghcr.io/complianceascode/must-gather-ocp:latest - olm.skipRange: '>=0.1.17 <1.9.1' + olm.skipRange: '>=0.1.17 <1.9.2' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-compliance operators.openshift.io/infrastructure-features: '["disconnected", "fips", "proxy-aware"]' @@ -177,7 +177,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: compliance-operator.v1.9.1 + name: compliance-operator.v1.9.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -1745,5 +1745,5 @@ spec: name: operator - image: ghcr.io/complianceascode/k8scontent:latest name: profile - replaces: compliance-operator.v1.9.0 - version: 1.9.1 + replaces: compliance-operator.v1.9.1 + version: 1.9.2 diff --git a/catalog/preamble.json b/catalog/preamble.json index 3eacf56dec..091067fdda 100644 --- a/catalog/preamble.json +++ b/catalog/preamble.json @@ -13,8 +13,8 @@ "package": "compliance-operator", "entries": [ { - "name": "compliance-operator.v1.9.1", - "skipRange": ">=0.1.17 <1.9.1" + "name": "compliance-operator.v1.9.2", + "skipRange": ">=0.1.17 <1.9.2" } ] } diff --git a/config/manifests/bases/compliance-operator.clusterserviceversion.yaml b/config/manifests/bases/compliance-operator.clusterserviceversion.yaml index ba4b13869f..ee55ac82f1 100644 --- a/config/manifests/bases/compliance-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/compliance-operator.clusterserviceversion.yaml @@ -161,7 +161,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring,Security must-gather-image: ghcr.io/complianceascode/must-gather-ocp:latest - olm.skipRange: '>=0.1.17 <1.9.1' + olm.skipRange: '>=0.1.17 <1.9.2' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-compliance operators.openshift.io/infrastructure-features: '["disconnected", "fips", "proxy-aware"]' @@ -1589,5 +1589,5 @@ spec: provider: name: Red Hat Inc. url: www.redhat.com - replaces: compliance-operator.v1.9.0 - version: 1.9.1 + replaces: compliance-operator.v1.9.1 + version: 1.9.2 diff --git a/images/must-gather/Containerfile b/images/must-gather/Containerfile index 055602438a..a7d676aa86 100644 --- a/images/must-gather/Containerfile +++ b/images/must-gather/Containerfile @@ -14,7 +14,7 @@ LABEL \ com.redhat.component="openshift-compliance-must-gather-container" \ io.openshift.maintainer.product="OpenShift Container Platform" \ io.openshift.maintainer.component="Compliance Operator" \ - version=1.9.1 + version=1.9.2 # Install openshift-clients, jq, tar, and rsync, which are required for # must-gather. diff --git a/images/openscap/Containerfile b/images/openscap/Containerfile index bbc5fc8cb5..19c778c9ba 100644 --- a/images/openscap/Containerfile +++ b/images/openscap/Containerfile @@ -15,7 +15,7 @@ LABEL \ io.openshift.maintainer.product="OpenShift Container Platform" \ io.openshift.maintainer.component="Compliance Operator" \ run="podman run --privileged -v /:/host -eHOSTROOT=/host -ePROFILE=xccdf_org.ssgproject.content_profile_coreos-fedramp -eCONTENT=ssg-rhcos4-ds.xml -eREPORT_DIR=/reports -eRULE=xccdf_org.ssgproject.content_rule_selinux_state" \ - version=1.9.1 + version=1.9.2 RUN microdnf -y update glibc RUN microdnf -y install openscap openscap-scanner diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile index 6e9c184800..34d0b2611a 100644 --- a/images/operator/Dockerfile +++ b/images/operator/Dockerfile @@ -27,7 +27,7 @@ LABEL \ com.redhat.component="openshift-compliance-operator-container" \ io.openshift.maintainer.product="OpenShift Container Platform" \ io.openshift.maintainer.component="Compliance Operator" \ - version=1.9.1 + version=1.9.2 WORKDIR / diff --git a/version.Makefile b/version.Makefile index 419f683e7e..9724f9fe9f 100644 --- a/version.Makefile +++ b/version.Makefile @@ -2,5 +2,5 @@ # - 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) -PREVIOUS_VERSION?=1.9.0 -VERSION?=1.9.1 +PREVIOUS_VERSION?=1.9.1 +VERSION?=1.9.2 diff --git a/version/version.go b/version/version.go index 32264b49f5..b870ef7e6a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.9.1" + Version = "1.9.2" )