Skip to content

Commit dda38ae

Browse files
Jeremy-Cheng-stackJeremy Cheng
andauthored
bump cs version to 4.18 and update im opcon version (#2751)
* bump cs version to 4.18 and update im opcon version Signed-off-by: Jeremy Cheng <Jeremy.Cheng@ibm.com> * additional version bump for im, commonui, and zen in odlm.go Signed-off-by: Jeremy Cheng <Jeremy.Cheng@ibm.com> * Set Zen default channel to v6.4 Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> --------- Signed-off-by: Jeremy Cheng <Jeremy.Cheng@ibm.com> Signed-off-by: Jeremy Cheng <jeremyjcheng@gmail.com> Co-authored-by: Jeremy Cheng <Jeremy.Cheng@ibm.com>
1 parent 2ca0636 commit dda38ae

File tree

15 files changed

+78
-39
lines changed

15 files changed

+78
-39
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ BUILD_VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
4242
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
4343
RELEASE_VERSION ?= $(shell cat ./version/version.go | grep "Version =" | awk '{ print $$3}' | tr -d '"')
4444
PREVIOUS_VERSION := 3.23.0
45-
LATEST_VERSION ?= 4.17.0
45+
LATEST_VERSION ?= 4.18.0
4646

4747
LOCAL_OS := $(shell uname)
4848
ifeq ($(LOCAL_OS),Linux)
@@ -98,8 +98,8 @@ RELEASE_IMAGE ?= $(DOCKER_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(BUILD_VERSION)
9898
RELEASE_IMAGE_ARCH ?= $(DOCKER_REGISTRY)/$(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(BUILD_VERSION)
9999
LOCAL_ARCH_IMAGE ?= $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(BUILD_VERSION)
100100

101-
CHANNELS := v4.17
102-
DEFAULT_CHANNEL := v4.17
101+
CHANNELS := v4.18
102+
DEFAULT_CHANNEL := v4.18
103103

104104
# Options for 'bundle-build'
105105
ifneq ($(origin CHANNELS), undefined)
@@ -258,7 +258,7 @@ bundle-manifests: clis
258258

259259
generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests
260260
$(OPERATOR_SDK) generate kustomize manifests -q
261-
- make bundle-manifests CHANNELS=v4.17 DEFAULT_CHANNEL=v4.17
261+
- make bundle-manifests CHANNELS=v4.18 DEFAULT_CHANNEL=v4.18
262262

263263
##@ Helm Chart Generation
264264

README.md

Lines changed: 1 addition & 1 deletion
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.17.0
23+
- 4.18.0
2424

2525
## Prerequisites
2626

bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
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.17
9-
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.17
8+
LABEL operators.operatorframework.io.bundle.channels.v1=v4.18
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.18
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-alpha

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

Lines changed: 10 additions & 10 deletions
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.17.0
25+
containerImage: icr.io/cpopen/common-service-operator:4.18.0
2626
createdAt: "2026-01-20T18:13:21Z"
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.17.0"
38-
operatorChannel: v4.17
39-
operatorVersion: 4.17.0
37+
olm.skipRange: ">=3.3.0 <4.18.0"
38+
operatorChannel: v4.18
39+
operatorVersion: 4.18.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-alpha
@@ -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.17.0
50+
name: ibm-common-service-operator.v4.18.0
5151
namespace: placeholder
5252
spec:
5353
apiservicedefinitions: {}
@@ -207,7 +207,7 @@ spec:
207207
208208
## Operator versions
209209
210-
- 4.17.0
210+
- 4.18.0
211211
212212
## Prerequisites
213213
@@ -309,7 +309,7 @@ spec:
309309
value: ibm-common-service-operator
310310
- name: CPFS_UTILS_IMAGE
311311
value: icr.io/cpopen/cpfs/cpfs-utils:latest
312-
image: icr.io/cpopen/common-service-operator:4.17.0
312+
image: icr.io/cpopen/common-service-operator:4.18.0
313313
imagePullPolicy: IfNotPresent
314314
livenessProbe:
315315
failureThreshold: 10
@@ -579,7 +579,7 @@ spec:
579579
minKubeVersion: 1.19.0
580580
provider:
581581
name: IBM
582-
version: 4.17.0
582+
version: 4.18.0
583583
webhookdefinitions:
584584
- admissionReviewVersions:
585585
- v1
@@ -622,11 +622,11 @@ spec:
622622
type: ValidatingAdmissionWebhook
623623
webhookPath: /validate-operator-ibm-com-v3-commonservice
624624
relatedImages:
625-
- image: icr.io/cpopen/common-service-operator:4.17.0
625+
- image: icr.io/cpopen/common-service-operator:4.18.0
626626
name: COMMON_SERVICE_OPERATOR_IMAGE
627627
- image: icr.io/cpopen/cpfs/cpfs-utils:latest
628628
name: CPFS_UTILS_IMAGE
629629
- image: icr.io/cpopen/cpfs/must-gather:latest
630630
name: MUST_GATHER_IMAGE
631-
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.17.0
631+
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.18.0
632632
name: CPFS_OADP_PLUGINS_IMAGE

bundle/metadata/annotations.yaml

Lines changed: 3 additions & 3 deletions
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.17
8-
operators.operatorframework.io.bundle.channel.default.v1: v4.17
7+
operators.operatorframework.io.bundle.channels.v1: v4.18
8+
operators.operatorframework.io.bundle.channel.default.v1: v4.18
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-alpha
@@ -15,4 +15,4 @@ annotations:
1515
operators.operatorframework.io.test.config.v1: tests/scorecard/
1616

1717
# OpenShift annotations.
18-
com.redhat.openshift.versions: v4.12-v4.17
18+
com.redhat.openshift.versions: v4.12-v4.18

common/scripts/multiarch_image.sh

Lines changed: 1 addition & 1 deletion
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.17.0}
27+
RELEASE_VERSION=${4:-4.18.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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ spec:
636636
value: "false"
637637
- name: OPERATOR_NAME
638638
value: ibm-common-service-operator
639-
image: icr.io/cpopen/common-service-operator:4.17.0
639+
image: icr.io/cpopen/common-service-operator:4.18.0
640640
imagePullPolicy: IfNotPresent
641641
livenessProbe:
642642
failureThreshold: 10

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
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.17.0
8+
newTag: 4.18.0

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

Lines changed: 6 additions & 6 deletions
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.17.0
8+
containerImage: icr.io/cpopen/common-service-operator:4.18.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.17
23-
operatorVersion: 4.17.0
22+
operatorChannel: v4.18
23+
operatorVersion: 4.18.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.17.0
198+
- 4.18.0
199199
200200
## Prerequisites
201201
@@ -267,12 +267,12 @@ spec:
267267
provider:
268268
name: IBM
269269
relatedImages:
270-
- image: icr.io/cpopen/common-service-operator:4.17.0
270+
- image: icr.io/cpopen/common-service-operator:4.18.0
271271
name: COMMON_SERVICE_OPERATOR_IMAGE
272272
- image: icr.io/cpopen/cpfs/cpfs-utils:latest
273273
name: CPFS_UTILS_IMAGE
274274
- image: icr.io/cpopen/cpfs/must-gather:latest
275275
name: MUST_GATHER_IMAGE
276-
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.17.0
276+
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.18.0
277277
name: CPFS_OADP_PLUGINS_IMAGE
278278
version: 0.0.0

helm-cluster-scoped/Chart.yaml

Lines changed: 2 additions & 2 deletions
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.17.0
6-
appVersion: 4.17.0
5+
version: 4.18.0
6+
appVersion: 4.18.0

0 commit comments

Comments
 (0)