Bump CS version up to 4.15.0

Makefile

@@ -38,7 +38,7 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                 git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
 RELEASE_VERSION ?= $(shell cat ./version/version.go | grep "Version =" | awk '{ print $$3}' | tr -d '"')
 PREVIOUS_VERSION := 3.23.0
-LATEST_VERSION ?= 4.14.0
+LATEST_VERSION ?= 4.15.0
 
 LOCAL_OS := $(shell uname)
 ifeq ($(LOCAL_OS),Linux)
@@ -83,8 +83,8 @@ BUNDLE_IMAGE_NAME ?= common-service-operator-bundle
 # Current Operator image with registry
 IMG ?= icr.io/cpopen/common-service-operator:$(LATEST_VERSION)
 
-CHANNELS := v4.14
-DEFAULT_CHANNEL := v4.14
+CHANNELS := v4.15
+DEFAULT_CHANNEL := v4.15
 
 # Options for 'bundle-build'
 ifneq ($(origin CHANNELS), undefined)
@@ -248,7 +248,7 @@ bundle-manifests: clis
 
 generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	- make bundle-manifests CHANNELS=v4.14 DEFAULT_CHANNEL=v4.14
+	- make bundle-manifests CHANNELS=v4.15 DEFAULT_CHANNEL=v4.15
 
 ##@ Helm Chart Generation
 

README.md

@@ -20,7 +20,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow
 
 ## Operator versions
 
- - 4.14.0
+ - 4.15.0
 
 ## Prerequisites
 

bundle.Dockerfile

@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ibm-common-service-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=v4.14
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.14
+LABEL operators.operatorframework.io.bundle.channels.v1=v4.15
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.15
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

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

@@ -22,7 +22,7 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     cloudPakThemesVersion: styles4100.css
-    containerImage: icr.io/cpopen/common-service-operator:4.14.0
+    containerImage: icr.io/cpopen/common-service-operator:4.15.0
     createdAt: "2025-05-16T03:15:01Z"
     description: The IBM Cloud Pak foundational services operator is used to deploy IBM foundational services.
     features.operators.openshift.io/disconnected: "true"
@@ -34,9 +34,9 @@ metadata:
     features.operators.openshift.io/token-auth-gcp: "false"
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
-    olm.skipRange: ">=3.3.0 <4.14.0"
-    operatorChannel: v4.14
-    operatorVersion: 4.14.0
+    olm.skipRange: ">=3.3.0 <4.15.0"
+    operatorChannel: v4.15
+    operatorVersion: 4.15.0
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.38.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -47,7 +47,7 @@ metadata:
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: ibm-common-service-operator.v4.14.0
+  name: ibm-common-service-operator.v4.15.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -207,7 +207,7 @@ spec:
 
     ## Operator versions
 
-     - 4.14.0
+     - 4.15.0
 
     ## Prerequisites
 
@@ -385,7 +385,7 @@ spec:
                         value: ibm-common-service-operator
                       - name: CPFS_UTILS_IMAGE
                         value: icr.io/cpopen/cpfs/cpfs-utils:latest
-                    image: icr.io/cpopen/common-service-operator:4.14.0
+                    image: icr.io/cpopen/common-service-operator:4.15.0
                     imagePullPolicy: IfNotPresent
                     livenessProbe:
                       failureThreshold: 10
@@ -642,7 +642,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: IBM
-  version: 4.14.0
+  version: 4.15.0
   webhookdefinitions:
     - admissionReviewVersions:
         - v1
@@ -685,11 +685,11 @@ spec:
       type: ValidatingAdmissionWebhook
       webhookPath: /validate-operator-ibm-com-v3-commonservice
   relatedImages:
-    - image: icr.io/cpopen/common-service-operator:4.14.0
+    - image: icr.io/cpopen/common-service-operator:4.15.0
       name: COMMON_SERVICE_OPERATOR_IMAGE
     - image: icr.io/cpopen/cpfs/cpfs-utils:latest
       name: CPFS_UTILS_IMAGE
     - image: icr.io/cpopen/cpfs/must-gather:latest
       name: MUST_GATHER_IMAGE
-    - image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.14.0
+    - image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.15.0
       name: CPFS_OADP_PLUGINS_IMAGE

bundle/metadata/annotations.yaml

@@ -4,8 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: ibm-common-service-operator
-  operators.operatorframework.io.bundle.channels.v1: v4.14
-  operators.operatorframework.io.bundle.channel.default.v1: v4.14
+  operators.operatorframework.io.bundle.channels.v1: v4.15
+  operators.operatorframework.io.bundle.channel.default.v1: v4.15
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.38.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

common/scripts/multiarch_image.sh

@@ -24,7 +24,7 @@ ALL_PLATFORMS="amd64 ppc64le s390x"
 IMAGE_REPO=${1}
 IMAGE_NAME=${2}
 VERSION=${3-"$(git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)"}
-RELEASE_VERSION=${4:-4.14.0}
+RELEASE_VERSION=${4:-4.15.0}
 MAX_PULLING_RETRY=${MAX_PULLING_RETRY-10}
 RETRY_INTERVAL=${RETRY_INTERVAL-10}
 # support other container tools, e.g. podman

config/ibm-common-service-operator.yaml

@@ -732,7 +732,7 @@ spec:
           value: "false"
         - name: OPERATOR_NAME
           value: ibm-common-service-operator
-        image: icr.io/cpopen/common-service-operator:4.14.0
+        image: icr.io/cpopen/common-service-operator:4.15.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: icr.io/cpopen/common-service-operator
   newName: icr.io/cpopen/common-service-operator
-  newTag: 4.14.0
+  newTag: 4.15.0

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

@@ -5,7 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Seamless Upgrades
     cloudPakThemesVersion: styles4100.css
-    containerImage: icr.io/cpopen/common-service-operator:4.14.0
+    containerImage: icr.io/cpopen/common-service-operator:4.15.0
     createdAt: "2020-10-19T21:38:33Z"
     description: The IBM Cloud Pak foundational services operator is used to deploy
       IBM foundational services.
@@ -19,8 +19,8 @@ metadata:
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
     olm.skipRange: ""
-    operatorChannel: v4.14
-    operatorVersion: 4.14.0
+    operatorChannel: v4.15
+    operatorVersion: 4.15.0
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -195,7 +195,7 @@ spec:
 
     ## Operator versions
 
-     - 4.14.0
+     - 4.15.0
 
     ## Prerequisites
 
@@ -267,12 +267,12 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/cpopen/common-service-operator:4.14.0
+  - image: icr.io/cpopen/common-service-operator:4.15.0
     name: COMMON_SERVICE_OPERATOR_IMAGE
   - image: icr.io/cpopen/cpfs/cpfs-utils:latest
     name: CPFS_UTILS_IMAGE
   - image: icr.io/cpopen/cpfs/must-gather:latest
     name: MUST_GATHER_IMAGE
-  - image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.14.0
+  - image: icr.io/cpopen/cpfs/cpfs-oadp-plugins:4.15.0
     name: CPFS_OADP_PLUGINS_IMAGE
   version: 0.0.0

helm-cluster-scoped/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-common-service-operator-cluster-scoped
 description: A Helm chart for ibm-common-service-operator
 type: application
-version: 4.14.0
-appVersion: 4.14.0
+version: 4.15.0
+appVersion: 4.15.0

helm/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-common-service-operator
 description: A Helm chart for ibm-common-service-operator
 type: application
-version: 4.14.0
-appVersion: 4.14.0
+version: 4.15.0
+appVersion: 4.15.0

helm/templates/operator-deployment.yaml

@@ -73,7 +73,7 @@ spec:
                       - s390x
       containers:         
         - name: ibm-common-service-operator
-          image: {{ .Values.cpfs.imagePullPrefix | default .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator}}/common-service-operator:4.14.0
+          image: {{ .Values.cpfs.imagePullPrefix | default .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator}}/common-service-operator:4.15.0
           command: 
             - /manager
           env:             

internal/controller/constant/odlm.go

@@ -214,6 +214,14 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
     sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
+  - name: ibm-im-operator-v4.14
+    namespace: "{{ .CPFSNs }}"
+    channel: v4.14
+    packageName: ibm-iam-operator
+    scope: public
+    installPlanApproval: {{ .ApprovalMode }}
+    sourceName: {{ .CatalogSourceName }}
+    sourceNamespace: "{{ .CatalogSourceNs }}"
 `
 
 	IdpConfigUIOpReg = `
@@ -318,6 +326,14 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
     sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
+  - name: ibm-idp-config-ui-operator-v4.11
+    namespace: "{{ .CPFSNs }}"
+    channel: v4.11
+    packageName: ibm-commonui-operator-app
+    scope: public
+    installPlanApproval: {{ .ApprovalMode }}
+    sourceName: {{ .CatalogSourceName }}
+    sourceNamespace: "{{ .CatalogSourceNs }}"
 `
 
 	PlatformUIOpReg = `
@@ -646,6 +662,13 @@ spec:
           onPremMultipleDeploy: {{ .OnPremMultiEnable }}
       operandBindInfo: 
         operand: ibm-im-operator
+  - name: ibm-im-operator-v4.14
+    spec:
+      authentication:
+        config:
+          onPremMultipleDeploy: {{ .OnPremMultiEnable }}
+      operandBindInfo: 
+        operand: ibm-im-operator
 `
 
 	UserMgmtOpCon = `
@@ -757,6 +780,11 @@ spec:
       commonWebUI: {}
       switcheritem: {}
       navconfiguration: {}
+  - name: ibm-idp-config-ui-operator-v4.11
+    spec:
+      commonWebUI: {}
+      switcheritem: {}
+      navconfiguration: {}
 `
 
 	PlatformUIOpCon = `
@@ -2431,7 +2459,7 @@ spec:
     sourceNamespace: "{{ .CatalogSourceNs }}"
   - name: ibm-im-operator
     namespace: "{{ .CPFSNs }}"
-    channel: v4.13
+    channel: v4.14
     packageName: ibm-iam-operator
     scope: public
     installPlanApproval: {{ .ApprovalMode }}
@@ -2479,7 +2507,7 @@ spec:
     sourceNamespace: "{{ .CatalogSourceNs }}"
   - name: ibm-idp-config-ui-operator
     namespace: "{{ .CPFSNs }}"
-    channel: v4.10
+    channel: v4.11
     packageName: ibm-commonui-operator-app
     scope: public
     installPlanApproval: {{ .ApprovalMode }}

testdata/deploy/deploy.yaml

@@ -15,8 +15,8 @@ spec:
         name: ibm-common-service-operator
       annotations:
         description: The IBM Common Service Operator is used to deploy IBM Common Services
-        operatorChannel: v4.14
-        operatorVersion: 4.14.0
+        operatorChannel: v4.15
+        operatorVersion: 4.15.0
         cloudPakThemesVersion: styles4100.css
     spec:
       affinity:

version/version.go

@@ -17,5 +17,5 @@
 package version
 
 var (
-	Version = "4.14.0"
+	Version = "4.15.0"
 )