Skip to content

Commit 589298e

Browse files
authored
bump version to 4.15.0 (#2606)
Signed-off-by: YuChen <yuchen.shen@mail.utoronto.ca>
1 parent b8b2060 commit 589298e

File tree

15 files changed

+66
-38
lines changed

15 files changed

+66
-38
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
3737
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
3838
RELEASE_VERSION ?= $(shell cat ./version/version.go | grep "Version =" | awk '{ print $$3}' | tr -d '"')
3939
PREVIOUS_VERSION := 3.23.0
40-
LATEST_VERSION ?= 4.14.0
40+
LATEST_VERSION ?= 4.15.0
4141

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

85-
CHANNELS := v4.14
86-
DEFAULT_CHANNEL := v4.14
85+
CHANNELS := v4.15
86+
DEFAULT_CHANNEL := v4.15
8787

8888
# Options for 'bundle-build'
8989
ifneq ($(origin CHANNELS), undefined)
@@ -247,7 +247,7 @@ bundle-manifests: clis
247247

248248
generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests
249249
$(OPERATOR_SDK) generate kustomize manifests -q
250-
- make bundle-manifests CHANNELS=v4.14 DEFAULT_CHANNEL=v4.14
250+
- make bundle-manifests CHANNELS=v4.15 DEFAULT_CHANNEL=v4.15
251251

252252
##@ Helm Chart Generation
253253

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.14.0
23+
- 4.15.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.14
9-
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.14
8+
LABEL operators.operatorframework.io.bundle.channels.v1=v4.15
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.15
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

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.14.0
25+
containerImage: icr.io/cpopen/common-service-operator:4.15.0
2626
createdAt: "2025-05-16T03:15:01Z"
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.14.0"
38-
operatorChannel: v4.14
39-
operatorVersion: 4.14.0
37+
olm.skipRange: ">=3.3.0 <4.15.0"
38+
operatorChannel: v4.15
39+
operatorVersion: 4.15.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.14.0
50+
name: ibm-common-service-operator.v4.15.0
5151
namespace: placeholder
5252
spec:
5353
apiservicedefinitions: {}
@@ -207,7 +207,7 @@ spec:
207207
208208
## Operator versions
209209
210-
- 4.14.0
210+
- 4.15.0
211211
212212
## Prerequisites
213213
@@ -385,7 +385,7 @@ spec:
385385
value: ibm-common-service-operator
386386
- name: CPFS_UTILS_IMAGE
387387
value: icr.io/cpopen/cpfs/cpfs-utils:latest
388-
image: icr.io/cpopen/common-service-operator:4.14.0
388+
image: icr.io/cpopen/common-service-operator:4.15.0
389389
imagePullPolicy: IfNotPresent
390390
livenessProbe:
391391
failureThreshold: 10
@@ -642,7 +642,7 @@ spec:
642642
minKubeVersion: 1.19.0
643643
provider:
644644
name: IBM
645-
version: 4.14.0
645+
version: 4.15.0
646646
webhookdefinitions:
647647
- admissionReviewVersions:
648648
- v1
@@ -685,11 +685,11 @@ spec:
685685
type: ValidatingAdmissionWebhook
686686
webhookPath: /validate-operator-ibm-com-v3-commonservice
687687
relatedImages:
688-
- image: icr.io/cpopen/common-service-operator:4.14.0
688+
- image: icr.io/cpopen/common-service-operator:4.15.0
689689
name: COMMON_SERVICE_OPERATOR_IMAGE
690690
- image: icr.io/cpopen/cpfs/cpfs-utils:latest
691691
name: CPFS_UTILS_IMAGE
692692
- image: icr.io/cpopen/cpfs/must-gather:latest
693693
name: MUST_GATHER_IMAGE
694-
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.14.0
694+
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.15.0
695695
name: CPFS_OADP_PLUGINS_IMAGE

bundle/metadata/annotations.yaml

Lines changed: 2 additions & 2 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.14
8-
operators.operatorframework.io.bundle.channel.default.v1: v4.14
7+
operators.operatorframework.io.bundle.channels.v1: v4.15
8+
operators.operatorframework.io.bundle.channel.default.v1: v4.15
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

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.14.0}
27+
RELEASE_VERSION=${4:-4.15.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
@@ -732,7 +732,7 @@ spec:
732732
value: "false"
733733
- name: OPERATOR_NAME
734734
value: ibm-common-service-operator
735-
image: icr.io/cpopen/common-service-operator:4.14.0
735+
image: icr.io/cpopen/common-service-operator:4.15.0
736736
imagePullPolicy: IfNotPresent
737737
livenessProbe:
738738
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.14.0
8+
newTag: 4.15.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.14.0
8+
containerImage: icr.io/cpopen/common-service-operator:4.15.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.14
23-
operatorVersion: 4.14.0
22+
operatorChannel: v4.15
23+
operatorVersion: 4.15.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.14.0
198+
- 4.15.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.14.0
270+
- image: icr.io/cpopen/common-service-operator:4.15.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.14.0
276+
- image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.15.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.14.0
6-
appVersion: 4.14.0
5+
version: 4.15.0
6+
appVersion: 4.15.0

0 commit comments

Comments
 (0)