Bump operator version to 4.11.0 (#2324)

* Bump operator version to 4.11.0

Signed-off-by: YuChen <[email protected]>

* bump IM version to 4.10

Signed-off-by: YuChen <[email protected]>

---------

Signed-off-by: YuChen <[email protected]>

Author: YCShen1010

Makefile

@@ -80,8 +80,8 @@ OPERATOR_IMAGE_NAME ?= common-service-operator
 # Current Operator bundle image name
 BUNDLE_IMAGE_NAME ?= common-service-operator-bundle
 
-CHANNELS := v4.10
-DEFAULT_CHANNEL := v4.10
+CHANNELS := v4.11
+DEFAULT_CHANNEL := v4.11
 
 # Options for 'bundle-build'
 ifneq ($(origin CHANNELS), undefined)
@@ -237,7 +237,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.10 DEFAULT_CHANNEL=v4.10
+	- make bundle-manifests CHANNELS=v4.11 DEFAULT_CHANNEL=v4.11
 
 ##@ Test
 

README.md

@@ -20,7 +20,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow
 
 ## Operator versions
 
- - 4.10.0
+ - 4.11.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.10
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.10
+LABEL operators.operatorframework.io.bundle.channels.v1=v4.11
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.11
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

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

@@ -27,9 +27,9 @@ metadata:
     description: The IBM Cloud Pak foundational services operator is used to deploy IBM foundational services.
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
-    olm.skipRange: ">=3.3.0 <4.10.0"
-    operatorChannel: v4.10
-    operatorVersion: 4.10.0
+    olm.skipRange: ">=3.3.0 <4.11.0"
+    operatorChannel: v4.11
+    operatorVersion: 4.11.0
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -40,7 +40,7 @@ metadata:
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: ibm-common-service-operator.v4.10.0
+  name: ibm-common-service-operator.v4.11.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -200,7 +200,7 @@ spec:
 
     ## Operator versions
 
-     - 4.10.0
+     - 4.11.0
 
     ## Prerequisites
 
@@ -637,7 +637,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: IBM
-  version: 4.10.0
+  version: 4.11.0
   webhookdefinitions:
     - admissionReviewVersions:
         - v1
@@ -680,5 +680,5 @@ spec:
       type: ValidatingAdmissionWebhook
       webhookPath: /validate-operator-ibm-com-v3-commonservice
   relatedImages:
-    - image: icr.io/cpopen/common-service-operator:4.10.0
+    - image: icr.io/cpopen/common-service-operator:4.11.0
       name: COMMON_SERVICE_OPERATOR_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.10
-  operators.operatorframework.io.bundle.channel.default.v1: v4.10
+  operators.operatorframework.io.bundle.channels.v1: v4.11
+  operators.operatorframework.io.bundle.channel.default.v1: v4.11
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

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.10.0}
+RELEASE_VERSION=${4:-4.11.0}
 MAX_PULLING_RETRY=${MAX_PULLING_RETRY-10}
 RETRY_INTERVAL=${RETRY_INTERVAL-10}
 # support other container tools, e.g. podman

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

@@ -12,8 +12,8 @@ metadata:
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
     olm.skipRange: ""
-    operatorChannel: v4.10
-    operatorVersion: 4.10.0
+    operatorChannel: v4.11
+    operatorVersion: 4.11.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
@@ -188,7 +188,7 @@ spec:
 
     ## Operator versions
 
-     - 4.10.0
+     - 4.11.0
 
     ## Prerequisites
 
@@ -260,6 +260,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/cpopen/common-service-operator:4.10.0
+  - image: icr.io/cpopen/common-service-operator:4.11.0
     name: COMMON_SERVICE_OPERATOR_IMAGE
   version: 0.0.0

controllers/constant/odlm.go

@@ -144,6 +144,12 @@ spec:
     packageName: ibm-iam-operator
     scope: public
     installPlanApproval: {{ .ApprovalMode }}
+  - name: ibm-im-operator-v4.10
+    namespace: "{{ .CPFSNs }}"
+    channel: v4.9
+    packageName: ibm-iam-operator
+    scope: public
+    installPlanApproval: {{ .ApprovalMode }}
 `
 
 	IdpConfigUIOpReg = `
@@ -464,6 +470,13 @@ spec:
           onPremMultipleDeploy: {{ .OnPremMultiEnable }}
       operandBindInfo: 
         operand: ibm-im-operator
+  - name: ibm-im-operator-v4.10
+    spec:
+      authentication:
+        config:
+          onPremMultipleDeploy: {{ .OnPremMultiEnable }}
+      operandBindInfo: 
+        operand: ibm-im-operator
 `
 
 	UserMgmtOpCon = `
@@ -1790,7 +1803,7 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
   - name: ibm-im-operator
     namespace: "{{ .CPFSNs }}"
-    channel: v4.9
+    channel: v4.10
     packageName: ibm-iam-operator
     scope: public
     installPlanApproval: {{ .ApprovalMode }}

hack/keycloak-themes/README.md

@@ -10,7 +10,7 @@ theme/cloudpak/login/resources/css/styles470.css
 theme/cloudpak/login/theme.properies styles=css/styles470.css
 NOTE: this would likely apply to any of the files - images, fonts, etc.  If updated, they must be renamed.
 
-### Style version for release 4.10.0
+### Style version for release 4.11.0
 theme/cloudpak/login/resources/css/styles4100.css
 theme/cloudpak/login/theme.properies styles=css/styles4100.css
 

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.10
-        operatorVersion: 4.10.0
+        operatorChannel: v4.11
+        operatorVersion: 4.11.0
         cloudPakThemesVersion: styles4100.css
     spec:
       affinity:

version/version.go

@@ -17,5 +17,5 @@
 package version
 
 var (
-	Version = "4.10.0"
+	Version = "4.11.0"
 )