Skip to content

Commit 980e23a

Browse files
authored
updated version to 4.12.0 (#2400)
Signed-off-by: Henry Li <henry.h.li@ibm.com>
1 parent 29269d0 commit 980e23a

14 files changed

+34
-34
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
3838
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
3939
RELEASE_VERSION ?= $(shell cat ./version/version.go | grep "Version =" | awk '{ print $$3}' | tr -d '"')
4040
PREVIOUS_VERSION := 3.23.0
41-
LATEST_VERSION ?= 4.11.0
41+
LATEST_VERSION ?= 4.12.0
4242

4343
LOCAL_OS := $(shell uname)
4444
ifeq ($(LOCAL_OS),Linux)
@@ -83,8 +83,8 @@ BUNDLE_IMAGE_NAME ?= common-service-operator-bundle
8383
# Current Operator image with registry
8484
IMG ?= icr.io/cpopen/common-service-operator:$(LATEST_VERSION)
8585

86-
CHANNELS := v4.11
87-
DEFAULT_CHANNEL := v4.11
86+
CHANNELS := v4.12
87+
DEFAULT_CHANNEL := v4.12
8888

8989
# Options for 'bundle-build'
9090
ifneq ($(origin CHANNELS), undefined)
@@ -248,7 +248,7 @@ bundle-manifests: clis
248248

249249
generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests
250250
$(OPERATOR_SDK) generate kustomize manifests -q
251-
- make bundle-manifests CHANNELS=v4.11 DEFAULT_CHANNEL=v4.11
251+
- make bundle-manifests CHANNELS=v4.12 DEFAULT_CHANNEL=v4.12
252252

253253
##@ Helm Chart Generation
254254

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow
2020

2121
## Operator versions
2222

23-
- 4.11.0
23+
- 4.12.0
2424

2525
## Prerequisites
2626

bundle.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=ibm-common-service-operator
8-
LABEL operators.operatorframework.io.bundle.channels.v1=v4.11
9-
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.11
8+
LABEL operators.operatorframework.io.bundle.channels.v1=v4.12
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.12
1010
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
]
2323
capabilities: Seamless Upgrades
2424
cloudPakThemesVersion: styles4100.css
25-
containerImage: icr.io/cpopen/common-service-operator:4.11.0
25+
containerImage: icr.io/cpopen/common-service-operator:4.12.0
2626
createdAt: "2025-02-20T00:28:09Z"
2727
description: The IBM Cloud Pak foundational services operator is used to deploy IBM foundational services.
2828
features.operators.openshift.io/disconnected: "true"
@@ -34,9 +34,9 @@ metadata:
3434
features.operators.openshift.io/token-auth-gcp: "false"
3535
nss.operator.ibm.com/managed-operators: ibm-common-service-operator
3636
nss.operator.ibm.com/managed-webhooks: ""
37-
olm.skipRange: ">=3.3.0 <4.11.0"
38-
operatorChannel: v4.11
39-
operatorVersion: 4.11.0
37+
olm.skipRange: ">=3.3.0 <4.12.0"
38+
operatorChannel: v4.12
39+
operatorVersion: 4.12.0
4040
operators.openshift.io/infrastructure-features: '["disconnected"]'
4141
operators.operatorframework.io/builder: operator-sdk-v1.38.0
4242
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -47,7 +47,7 @@ metadata:
4747
operatorframework.io/arch.ppc64le: supported
4848
operatorframework.io/arch.s390x: supported
4949
operatorframework.io/os.linux: supported
50-
name: ibm-common-service-operator.v4.11.0
50+
name: ibm-common-service-operator.v4.12.0
5151
namespace: placeholder
5252
spec:
5353
apiservicedefinitions: {}
@@ -207,7 +207,7 @@ spec:
207207
208208
## Operator versions
209209
210-
- 4.11.0
210+
- 4.12.0
211211
212212
## Prerequisites
213213
@@ -383,7 +383,7 @@ spec:
383383
fieldPath: metadata.annotations['olm.targetNamespaces']
384384
- name: OPERATOR_NAME
385385
value: ibm-common-service-operator
386-
image: icr.io/cpopen/common-service-operator:4.11.0
386+
image: icr.io/cpopen/common-service-operator:4.12.0
387387
imagePullPolicy: IfNotPresent
388388
livenessProbe:
389389
failureThreshold: 10
@@ -631,7 +631,7 @@ spec:
631631
minKubeVersion: 1.19.0
632632
provider:
633633
name: IBM
634-
version: 4.11.0
634+
version: 4.12.0
635635
webhookdefinitions:
636636
- admissionReviewVersions:
637637
- v1
@@ -674,5 +674,5 @@ spec:
674674
type: ValidatingAdmissionWebhook
675675
webhookPath: /validate-operator-ibm-com-v3-commonservice
676676
relatedImages:
677-
- image: icr.io/cpopen/common-service-operator:4.11.0
677+
- image: icr.io/cpopen/common-service-operator:4.12.0
678678
name: COMMON_SERVICE_OPERATOR_IMAGE

bundle/metadata/annotations.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ annotations:
44
operators.operatorframework.io.bundle.manifests.v1: manifests/
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: ibm-common-service-operator
7-
operators.operatorframework.io.bundle.channels.v1: v4.11
8-
operators.operatorframework.io.bundle.channel.default.v1: v4.11
7+
operators.operatorframework.io.bundle.channels.v1: v4.12
8+
operators.operatorframework.io.bundle.channel.default.v1: v4.12
99
operators.operatorframework.io.metrics.builder: operator-sdk-v1.38.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

common/scripts/multiarch_image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ALL_PLATFORMS="amd64 ppc64le s390x"
2424
IMAGE_REPO=${1}
2525
IMAGE_NAME=${2}
2626
VERSION=${3-"$(git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)"}
27-
RELEASE_VERSION=${4:-4.11.0}
27+
RELEASE_VERSION=${4:-4.12.0}
2828
MAX_PULLING_RETRY=${MAX_PULLING_RETRY-10}
2929
RETRY_INTERVAL=${RETRY_INTERVAL-10}
3030
# support other container tools, e.g. podman

config/ibm-common-service-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ spec:
731731
value: "false"
732732
- name: OPERATOR_NAME
733733
value: ibm-common-service-operator
734-
image: icr.io/cpopen/common-service-operator:4.11.0
734+
image: icr.io/cpopen/common-service-operator:4.12.0
735735
imagePullPolicy: IfNotPresent
736736
livenessProbe:
737737
failureThreshold: 10

config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: icr.io/cpopen/common-service-operator
77
newName: icr.io/cpopen/common-service-operator
8-
newTag: 4.11.0
8+
newTag: 4.12.0

config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
alm-examples: '[]'
66
capabilities: Seamless Upgrades
77
cloudPakThemesVersion: styles4100.css
8-
containerImage: icr.io/cpopen/common-service-operator:4.11.0
8+
containerImage: icr.io/cpopen/common-service-operator:4.12.0
99
createdAt: "2020-10-19T21:38:33Z"
1010
description: The IBM Cloud Pak foundational services operator is used to deploy
1111
IBM foundational services.
@@ -19,8 +19,8 @@ metadata:
1919
nss.operator.ibm.com/managed-operators: ibm-common-service-operator
2020
nss.operator.ibm.com/managed-webhooks: ""
2121
olm.skipRange: ""
22-
operatorChannel: v4.11
23-
operatorVersion: 4.11.0
22+
operatorChannel: v4.12
23+
operatorVersion: 4.12.0
2424
operators.openshift.io/infrastructure-features: '["disconnected"]'
2525
operators.operatorframework.io/builder: operator-sdk-v1.2.0
2626
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -195,7 +195,7 @@ spec:
195195
196196
## Operator versions
197197
198-
- 4.11.0
198+
- 4.12.0
199199
200200
## Prerequisites
201201
@@ -267,6 +267,6 @@ spec:
267267
provider:
268268
name: IBM
269269
relatedImages:
270-
- image: icr.io/cpopen/common-service-operator:4.11.0
270+
- image: icr.io/cpopen/common-service-operator:4.12.0
271271
name: COMMON_SERVICE_OPERATOR_IMAGE
272272
version: 0.0.0

helm-cluster-scoped/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: ibm-common-service-operator-cluster-scoped
33
description: A Helm chart for ibm-common-service-operator
44
type: application
5-
version: 4.11.0
6-
appVersion: 4.11.0
5+
version: 4.12.0
6+
appVersion: 4.12.0

helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: ibm-common-service-operator
33
description: A Helm chart for ibm-common-service-operator
44
type: application
5-
version: 4.11.0
6-
appVersion: 4.11.0
5+
version: 4.12.0
6+
appVersion: 4.12.0

helm/templates/operator-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
- s390x
3838
containers:
3939
- name: ibm-common-service-operator
40-
image: {{ .Values.global.imagePullPrefix}}/{{ .Values.imageRegistryNamespaceOperator}}/common-service-operator:4.11.0
40+
image: {{ .Values.global.imagePullPrefix}}/{{ .Values.imageRegistryNamespaceOperator}}/common-service-operator:4.12.0
4141
command:
4242
- /manager
4343
env:

testdata/deploy/deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ spec:
1515
name: ibm-common-service-operator
1616
annotations:
1717
description: The IBM Common Service Operator is used to deploy IBM Common Services
18-
operatorChannel: v4.11
19-
operatorVersion: 4.11.0
18+
operatorChannel: v4.12
19+
operatorVersion: 4.12.0
2020
cloudPakThemesVersion: styles4100.css
2121
spec:
2222
affinity:

version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
package version
1818

1919
var (
20-
Version = "4.11.0"
20+
Version = "4.12.0"
2121
)

0 commit comments

Comments
 (0)