Skip to content

Commit 0fda06b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #704 from lwan-wanglin/cherrypick-v1.x
Cherrypick v1.x
2 parents 2b4263c + 564ca0b commit 0fda06b

File tree

11 files changed

+59
-25
lines changed

11 files changed

+59
-25
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ FROM ${RUNTIME_IMAGE}
3636
LABEL com.redhat.component="Multiarch Tuning Operator"
3737
LABEL distribution-scope="public"
3838
LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle"
39-
LABEL release="1.2.0"
40-
LABEL version="1.2.0"
39+
LABEL release="1.2.1"
40+
LABEL version="1.2.1"
4141
LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9"
4242
LABEL url="https://github.com/openshift/multiarch-tuning-operator"
4343
LABEL vendor="Red Hat, Inc."

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARTIFACT_DIR ?= ./_output
99
# To re-generate a bundle for another specific version without changing the standard setup, you can:
1010
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
1111
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
12-
VERSION ?= 1.2.0
12+
VERSION ?= 1.2.1
1313

1414
# CHANNELS define the bundle channels used in the bundle.
1515
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

‎bundle.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ COPY bundle/tests/scorecard /tests/scorecard/
2424
LABEL com.redhat.component="Multiarch Tuning Operator"
2525
LABEL distribution-scope="public"
2626
LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle"
27-
LABEL release="1.2.0"
28-
LABEL version="1.2.0"
27+
LABEL release="1.2.1"
28+
LABEL version="1.2.1"
2929
LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9"
3030
LABEL url="https://github.com/openshift/multiarch-tuning-operator"
3131
LABEL vendor="Red Hat, Inc."

‎bundle.konflux.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ COPY --from=builder /code/bundle/tests/scorecard /tests/scorecard/
3636
LABEL com.redhat.component="Multiarch Tuning Operator"
3737
LABEL distribution-scope="public"
3838
LABEL name="multiarch-tuning/multiarch-tuning-operator-bundle"
39-
LABEL release="1.2.0"
40-
LABEL version="1.2.0"
39+
LABEL release="1.2.1"
40+
LABEL version="1.2.1"
4141
LABEL cpe="cpe:/a:redhat:multiarch_tuning_operator:1.1::el9"
4242
LABEL url="https://github.com/openshift/multiarch-tuning-operator"
4343
LABEL vendor="Red Hat, Inc."

‎bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ metadata:
2727
categories: OpenShift Optional, Other
2828
console.openshift.io/disable-operand-delete: "false"
2929
containerImage: registry.ci.openshift.org/origin/multiarch-tuning-operator:v1.x
30-
createdAt: "2025-09-15T17:52:09Z"
30+
createdAt: "2025-11-12T04:49:47Z"
3131
features.operators.openshift.io/cnf: "false"
3232
features.operators.openshift.io/cni: "false"
3333
features.operators.openshift.io/csi: "false"
@@ -54,7 +54,7 @@ metadata:
5454
operatorframework.io/arch.arm64: supported
5555
operatorframework.io/arch.ppc64le: supported
5656
operatorframework.io/arch.s390x: supported
57-
name: multiarch-tuning-operator.v1.2.0
57+
name: multiarch-tuning-operator.v1.2.1
5858
namespace: openshift-multiarch-tuning-operator
5959
spec:
6060
apiservicedefinitions: {}
@@ -480,7 +480,7 @@ spec:
480480
provider:
481481
name: Red Hat
482482
url: https://github.com/openshift/multiarch-tuning-operator
483-
version: 1.2.0
483+
version: 1.2.1
484484
webhookdefinitions:
485485
- admissionReviewVersions:
486486
- v1

‎config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
operatorframework.io/arch.arm64: supported
3232
operatorframework.io/arch.ppc64le: supported
3333
operatorframework.io/arch.s390x: supported
34-
name: multiarch-tuning-operator.v1.2.0
34+
name: multiarch-tuning-operator.v1.2.1
3535
namespace: openshift-multiarch-tuning-operator
3636
spec:
3737
apiservicedefinitions: {}
@@ -102,4 +102,4 @@ spec:
102102
provider:
103103
name: Red Hat
104104
url: https://github.com/openshift/multiarch-tuning-operator
105-
version: 1.2.0
105+
version: 1.2.1

‎deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spec:
99
source: multiarch-tuning-operator-catalog
1010
sourceNamespace: openshift-marketplace
1111
installPlanApproval: Automatic
12-
startingCSV: multiarch-tuning-operator.v1.2.0
12+
startingCSV: multiarch-tuning-operator.v1.2.1

‎hack/bump-version.sh‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,39 @@
11
#!/bin/bash
22

3-
yq -i ".spec.version=\"${VERSION:-1.0.0}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml
4-
yq -i ".metadata.name=\"multiarch-tuning-operator.v${VERSION:-1.0.0}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml
5-
yq -i ".spec.startingCSV=\"multiarch-tuning-operator.v${VERSION:-1.0.0}\"" deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml
6-
sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION:-1.0.0}\"/" Dockerfile
7-
sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION:-1.0.0}\"/" Dockerfile
8-
sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION:-1.0.0}\"/" konflux.Dockerfile
9-
sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION:-1.0.0}\"/" konflux.Dockerfile
10-
sed -i "s/^VERSION ?= .*/VERSION ?= ${VERSION:-1.0.0}/" Makefile
3+
set -e
4+
5+
# Accept version as first argument, fall back to VERSION env var, or show usage
6+
if [ -n "$1" ]; then
7+
VERSION="$1"
8+
elif [ -z "$VERSION" ]; then
9+
echo "Usage: $0 <version>"
10+
echo " or set VERSION environment variable"
11+
echo "Example: $0 1.2.1"
12+
exit 1
13+
fi
14+
15+
echo "Bumping version to: $VERSION"
16+
17+
yq -i ".spec.version=\"${VERSION}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml
18+
yq -i ".metadata.name=\"multiarch-tuning-operator.v${VERSION}\"" config/manifests/bases/multiarch-tuning-operator.clusterserviceversion.yaml
19+
yq -i ".spec.startingCSV=\"multiarch-tuning-operator.v${VERSION}\"" deploy/base/operators.coreos.com/subscriptions/openshift-multiarch-tuning-operator/subscription.yaml
20+
yq eval-all -i "(select(.schema==\"olm.channel\").entries[0].name)=\"multiarch-tuning-operator.v${VERSION}\"" index.base.yaml
21+
22+
23+
if [[ "$(uname)" == "Darwin" ]]; then
24+
# macOS BSD sed
25+
sed -i '' "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" Dockerfile
26+
sed -i '' "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" Dockerfile
27+
sed -i '' "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" konflux.Dockerfile
28+
sed -i '' "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" konflux.Dockerfile
29+
sed -i '' "s/^VERSION ?= .*/VERSION ?= ${VERSION}/" Makefile
30+
else
31+
# Linux GNU sed
32+
sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" Dockerfile
33+
sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" Dockerfile
34+
sed -i "s/^LABEL release=.*/LABEL release=\"${VERSION}\"/" konflux.Dockerfile
35+
sed -i "s/^LABEL version=.*/LABEL version=\"${VERSION}\"/" konflux.Dockerfile
36+
sed -i "s/^VERSION ?= .*/VERSION ?= ${VERSION}/" Makefile
37+
fi
38+
echo "make bundle"
1139
make bundle

‎hack/patch-bundle-dockerfile.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ LABEL io.k8s.display-name="Multiarch Tuning Operator"
2424
LABEL io.openshift.tags="openshift,operator,multiarch,scheduling"'
2525

2626
# Remove the content of the bundle.konflux.Dockerfile starting from the line with the comment "# Labels from hack/patch-bundle-dockerfile.sh"
27-
sed -i '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile
27+
if [[ "$(uname)" == "Darwin" ]]; then
28+
# macOS BSD sed
29+
sed -i '' '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile
30+
else
31+
# Linux GNU sed
32+
sed -i '/# Labels from hack\/patch-bundle-dockerfile.sh/,$d' bundle.konflux.Dockerfile
33+
fi
2834
# Append the content to the bundle.Dockerfile and bundle.konflux.Dockerfile
2935
cat <<EOF >>bundle.Dockerfile
3036

‎index.base.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ schema: olm.channel
1111
package: multiarch-tuning-operator
1212
name: v1.x
1313
entries:
14-
- name: multiarch-tuning-operator.v1.2.0
14+
- name: multiarch-tuning-operator.v1.2.1

0 commit comments

Comments
 (0)