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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 2 additions & 2 deletions bundle.konflux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
44 changes: 36 additions & 8 deletions hack/bump-version.sh
Original file line number Diff line number Diff line change
@@ -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 <version>"
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
8 changes: 7 additions & 1 deletion hack/patch-bundle-dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF >>bundle.Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion index.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions konflux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down