diff --git a/Dockerfile b/Dockerfile index b3dee555c..543129532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,8 @@ FROM ${RUNTIME_IMAGE} LABEL com.redhat.component="Multiarch Tuning Operator" LABEL distribution-scope="public" LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle" -LABEL release="1.2.0" -LABEL version="1.2.0" +LABEL release="1.2.1" +LABEL version="1.2.1" LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9" LABEL url="https://github.com/openshift/multiarch-tuning-operator" LABEL vendor="Red Hat, Inc." diff --git a/Makefile b/Makefile index 1674c2455..bc6959237 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ ARTIFACT_DIR ?= ./_output # To re-generate a bundle for another specific version without changing the standard setup, you can: # - 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.2.0 +VERSION ?= 1.2.1 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 05b3842e7..fa605d325 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -24,8 +24,8 @@ COPY bundle/tests/scorecard /tests/scorecard/ LABEL com.redhat.component="Multiarch Tuning Operator" LABEL distribution-scope="public" LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle" -LABEL release="1.2.0" -LABEL version="1.2.0" +LABEL release="1.2.1" +LABEL version="1.2.1" LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9" LABEL url="https://github.com/openshift/multiarch-tuning-operator" LABEL vendor="Red Hat, Inc." diff --git a/bundle.konflux.Dockerfile b/bundle.konflux.Dockerfile index 7eccf432a..c19cf0697 100644 --- a/bundle.konflux.Dockerfile +++ b/bundle.konflux.Dockerfile @@ -36,8 +36,8 @@ COPY --from=builder /code/bundle/tests/scorecard /tests/scorecard/ LABEL com.redhat.component="Multiarch Tuning Operator" LABEL distribution-scope="public" LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle" -LABEL release="1.2.0" -LABEL version="1.2.0" +LABEL release="1.2.1" +LABEL version="1.2.1" LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9" LABEL url="https://github.com/openshift/multiarch-tuning-operator" LABEL vendor="Red Hat, Inc." diff --git a/bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml b/bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml index a0d15178b..95bde7db1 100644 --- a/bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml +++ b/bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml @@ -27,7 +27,7 @@ metadata: categories: OpenShift Optional, Other console.openshift.io/disable-operand-delete: "false" containerImage: registry.ci.openshift.org/origin/multiarch-tuning-operator:v1.x - createdAt: "2025-09-15T17:52:09Z" + createdAt: "2025-11-12T04:49:47Z" features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "false" features.operators.openshift.io/csi: "false" @@ -54,7 +54,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: multiarch-tuning-operator.v1.2.0 + name: multiarch-tuning-operator.v1.2.1 namespace: openshift-multiarch-tuning-operator spec: apiservicedefinitions: {} @@ -480,7 +480,7 @@ spec: provider: name: Red Hat url: https://github.com/openshift/multiarch-tuning-operator - version: 1.2.0 + version: 1.2.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml b/config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml index ce96d3c8f..728dfdbd4 100644 --- a/config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml @@ -31,7 +31,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: multiarch-tuning-operator.v1.2.0 + name: multiarch-tuning-operator.v1.2.1 namespace: openshift-multiarch-tuning-operator spec: apiservicedefinitions: {} @@ -102,4 +102,4 @@ spec: provider: name: Red Hat url: https://github.com/openshift/multiarch-tuning-operator - version: 1.2.0 + version: 1.2.1 diff --git a/deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml b/deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml index b4e382d78..ebff01739 100644 --- a/deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml +++ b/deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml @@ -9,4 +9,4 @@ spec: source: multiarch-tuning-operator-catalog sourceNamespace: openshift-marketplace installPlanApproval: Automatic - startingCSV: multiarch-tuning-operator.v1.2.0 + startingCSV: multiarch-tuning-operator.v1.2.1 diff --git a/hack/bump-version.sh b/hack/bump-version.sh index b12bf51a1..14f0a5c61 100755 --- a/hack/bump-version.sh +++ b/hack/bump-version.sh @@ -1,11 +1,39 @@ #!/bin/bash -yq -i ".spec.version=\"${VERSION:-1.0.0}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml -yq -i ".metadata.name=\"multiarch-tuning-operator.v${VERSION:-1.0.0}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml -yq -i ".spec.startingCSV=\"multiarch-tuning-operator.v${VERSION:-1.0.0}\"" deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml -sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION:-1.0.0}\"/" Dockerfile -sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION:-1.0.0}\"/" Dockerfile -sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION:-1.0.0}\"/" konflux.Dockerfile -sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION:-1.0.0}\"/" konflux.Dockerfile -sed -i "s/^VERSION ?= .*/VERSION ?= ${VERSION:-1.0.0}/" Makefile +set -e + +# Accept version as first argument, fall back to VERSION env var, or show usage +if [ -n "$1" ]; then + VERSION="$1" +elif [ -z "$VERSION" ]; then + echo "Usage: $0 " + echo " or set VERSION environment variable" + echo "Example: $0 1.2.1" + exit 1 +fi + +echo "Bumping version to: $VERSION" + +yq -i ".spec.version=\"${VERSION}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml +yq -i ".metadata.name=\"multiarch-tuning-operator.v${VERSION}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml +yq -i ".spec.startingCSV=\"multiarch-tuning-operator.v${VERSION}\"" deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml +yq eval-all -i "(select(.schema==\"olm.channel\").entries[0].name)=\"multiarch-tuning-operator.v${VERSION}\"" index.base.yaml + + +if [[ "$(uname)" == "Darwin" ]]; then + # macOS BSD sed + sed -i '' "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" Dockerfile + sed -i '' "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" Dockerfile + sed -i '' "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" konflux.Dockerfile + sed -i '' "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" konflux.Dockerfile + sed -i '' "s/^VERSION ?= .*/VERSION ?= ${VERSION}/" Makefile +else + # Linux GNU sed + sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" Dockerfile + sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" Dockerfile + sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" konflux.Dockerfile + sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" konflux.Dockerfile + sed -i "s/^VERSION ?= .*/VERSION ?= ${VERSION}/" Makefile +fi +echo "make bundle" make bundle \ No newline at end of file diff --git a/hack/patch-bundle-dockerfile.sh b/hack/patch-bundle-dockerfile.sh index 95fc85954..d10458434 100755 --- a/hack/patch-bundle-dockerfile.sh +++ b/hack/patch-bundle-dockerfile.sh @@ -24,7 +24,13 @@ LABEL io.k8s.display-name="Multiarch Tuning Operator" LABEL io.openshift.tags="openshift,operator,multiarch,scheduling"' # Remove the content of the bundle.konflux.Dockerfile starting from the line with the comment "# Labels from hack/patch-bundle-dockerfile.sh" -sed -i '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile +if [[ "$(uname)" == "Darwin" ]]; then + # macOS BSD sed + sed -i '' '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile +else + # Linux GNU sed + sed -i '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile +fi # Append the content to the bundle.Dockerfile and bundle.konflux.Dockerfile cat <>bundle.Dockerfile diff --git a/index.base.yaml b/index.base.yaml index 2e17708b2..910744a98 100644 --- a/index.base.yaml +++ b/index.base.yaml @@ -11,4 +11,4 @@ schema: olm.channel package: multiarch-tuning-operator name: v1.x entries: - - name: multiarch-tuning-operator.v1.2.0 + - name: multiarch-tuning-operator.v1.2.1 diff --git a/konflux.Dockerfile b/konflux.Dockerfile index 0f4f4bc1f..f9e57847c 100644 --- a/konflux.Dockerfile +++ b/konflux.Dockerfile @@ -36,9 +36,9 @@ USER 65532:65532 LABEL com.redhat.component="Multiarch Tuning Operator" LABEL distribution-scope="public" LABEL name="multiarch-tuning/multiarch-tuning-rhel9-operator" +LABEL release="1.2.1" +LABEL version="1.2.1" LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9" -LABEL release="1.2.0" -LABEL version="1.2.0" LABEL url="https://github.com/openshift/multiarch-tuning-operator" LABEL vendor="Red Hat, Inc." LABEL description="The Multiarch Tuning Operator enhances the user experience for administrators of Openshift \