Bump version to 4.4.0

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.3
-DEFAULT_CHANNEL := v4.3
+CHANNELS := v4.4
+DEFAULT_CHANNEL := v4.4
 
 # Options for 'bundle-build'
 ifneq ($(origin CHANNELS), undefined)
@@ -239,7 +239,7 @@ bundle-manifests: clis
 
 generate-all: yq kustomize operator-sdk generate manifests ## Generate bundle manifests, metadata and package manifests
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	- make bundle-manifests CHANNELS=v4.3 DEFAULT_CHANNEL=v4.3
+	- make bundle-manifests CHANNELS=v4.4 DEFAULT_CHANNEL=v4.4
 
 ##@ Test
 

README.md

@@ -21,7 +21,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow
 
 ## Operator versions
 
- - 4.3.1
+ - 4.4.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.3
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.3
+LABEL operators.operatorframework.io.bundle.channels.v1=v4.4
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.4
 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

@@ -26,9 +26,9 @@ metadata:
     description: The IBM Common Service Operator is used to deploy IBM Common Services
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
-    olm.skipRange: ">=3.3.0 <4.3.1"
-    operatorChannel: v4.3
-    operatorVersion: 4.3.1
+    olm.skipRange: ">=3.3.0 <4.4.0"
+    operatorChannel: v4.4
+    operatorVersion: 4.4.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
@@ -39,7 +39,7 @@ metadata:
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: ibm-common-service-operator.v4.3.1
+  name: ibm-common-service-operator.v4.4.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -124,7 +124,7 @@ spec:
 
     ## Operator versions
 
-     - 4.3.1
+     - 4.4.0
 
     ## Prerequisites
 
@@ -482,7 +482,7 @@ spec:
       version: v1
   provider:
     name: IBM
-  version: 4.3.1
+  version: 4.4.0
   webhookdefinitions:
     - admissionReviewVersions:
         - v1
@@ -525,7 +525,7 @@ spec:
       type: ValidatingAdmissionWebhook
       webhookPath: /validate-operator-ibm-com-v3-commonservice
   relatedImages:
-    - image: icr.io/cpopen/common-service-operator:4.3.1
+    - image: icr.io/cpopen/common-service-operator:4.4.0
       name: COMMON_SERVICE_OPERATOR_IMAGE
     - image: icr.io/cpopen/cpfs/cpfs-utils:latest
       name: CPFS_UTILS_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.3
-  operators.operatorframework.io.bundle.channel.default.v1: v4.3
+  operators.operatorframework.io.bundle.channels.v1: v4.4
+  operators.operatorframework.io.bundle.channel.default.v1: v4.4
   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.3.1}
+RELEASE_VERSION=${4:-4.4.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

@@ -10,8 +10,8 @@ metadata:
     nss.operator.ibm.com/managed-operators: ibm-common-service-operator
     nss.operator.ibm.com/managed-webhooks: ""
     olm.skipRange: ""
-    operatorChannel: v4.3
-    operatorVersion: 4.3.1
+    operatorChannel: v4.4
+    operatorVersion: 4.4.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
@@ -110,7 +110,7 @@ spec:
 
     ## Operator versions
 
-     - 4.3.1
+     - 4.4.0
 
     ## Prerequisites
 
@@ -186,7 +186,7 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/cpopen/common-service-operator:4.3.1
+  - image: icr.io/cpopen/common-service-operator:4.4.0
     name: COMMON_SERVICE_OPERATOR_IMAGE
   - image: icr.io/cpopen/cpfs/cpfs-utils:latest
     name: CPFS_UTILS_IMAGE

controllers/constant/odlm.go

@@ -115,6 +115,14 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
     sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
+  - name: ibm-im-operator-v4.4
+    namespace: "{{ .CPFSNs }}"
+    channel: v4.4
+    packageName: ibm-iam-operator
+    scope: public
+    installPlanApproval: {{ .ApprovalMode }}
+    sourceName: {{ .CatalogSourceName }}
+    sourceNamespace: "{{ .CatalogSourceNs }}"
 `
 
 	IdpConfigUIOpReg = `
@@ -209,6 +217,14 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
     sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
+  - name: ibm-platformui-operator-v4.4
+    namespace: "{{ .CPFSNs }}"
+    channel: v4.4
+    packageName: ibm-zen-operator
+    scope: public
+    installPlanApproval: {{ .ApprovalMode }}
+    sourceName: {{ .CatalogSourceName }}
+    sourceNamespace: "{{ .CatalogSourceNs }}"
 `
 )
 
@@ -332,6 +348,19 @@ spec:
               - name: ibm-im-mongodb-operator-v4.2
               - name: ibm-idp-config-ui-operator-v4.3
             registry: common-service
+  - name: ibm-im-operator-v4.4
+    spec:
+      authentication:
+        config:
+          onPremMultipleDeploy: {{ .OnPremMultiEnable }}
+      operandBindInfo: 
+        operand: ibm-im-operator
+      operandRequest:
+        requests:
+          - operands:
+              - name: ibm-im-mongodb-operator-v4.2
+              - name: ibm-idp-config-ui-operator-v4.3
+            registry: common-service
 `
 
 	IdpConfigUIOpCon = `
@@ -392,6 +421,9 @@ spec:
   - name: ibm-platformui-operator-v4.3
     spec:
       operandBindInfo: {}
+  - name: ibm-platformui-operator-v4.4
+    spec:
+      operandBindInfo: {}
 `
 )
 
@@ -972,7 +1004,7 @@ spec:
     sourceNamespace: "{{ .CatalogSourceNs }}"
   - name: ibm-idp-config-ui-operator
     namespace: "{{ .CPFSNs }}"
-    channel: {{ .Channel }}
+    channel: v4.3
     packageName: ibm-commonui-operator-app
     scope: public
     installPlanApproval: {{ .ApprovalMode }}

controllers/constant/serviceLabel.go

@@ -18,12 +18,22 @@ package constant
 
 // still need flink and elastic
 const ServiceLabelTemplate = `
-- name: ibm-iam-operator
+- name: ibm-im-mongodb-operator
   spec:
-    authentication:
+    mongoDB:
       labels:
         placeholder1: placeholder2
-- name: ibm-im-mongodb-operator
+- name: ibm-im-mongodb-operator-v4.0
+  spec:
+    mongoDB:
+      labels:
+        placeholder1: placeholder2
+- name: ibm-im-mongodb-operator-v4.1
+  spec:
+    mongoDB:
+      labels:
+        placeholder1: placeholder2
+- name: ibm-im-mongodb-operator-v4.2
   spec:
     mongoDB:
       labels:
@@ -53,6 +63,11 @@ const ServiceLabelTemplate = `
     authentication:
       labels:
         placeholder1: placeholder2
+- name: ibm-im-operator-v4.4
+  spec:
+    authentication:
+      labels:
+        placeholder1: placeholder2
 - name: ibm-idp-config-ui-operator-v4.0
   spec:
     commonWebUI: 

controllers/rules/rules.go

@@ -599,6 +599,62 @@ const ConfigurationRules = `
             cpu: LARGEST_VALUE
             ephemeral-storage: LARGEST_VALUE
             memory: LARGEST_VALUE
+- name: ibm-im-operator-v4.4
+  spec:
+    authentication:
+      config:
+        fipsEnabled: LARGEST_VALUE
+      replicas: LARGEST_VALUE
+      authService:
+        resources:
+          limits:
+            cpu: LARGEST_VALUE
+            memory: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+          requests:
+            cpu: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+            memory: LARGEST_VALUE
+      clientRegistration:
+        resources:
+          limits:
+            cpu: LARGEST_VALUE
+            memory: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+          requests:
+            cpu: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+            memory: LARGEST_VALUE
+      identityManager:
+        resources:
+          limits:
+            cpu: LARGEST_VALUE
+            memory: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+          requests:
+            cpu: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+            memory: LARGEST_VALUE
+      identityProvider:
+        resources:
+          limits:
+            cpu: LARGEST_VALUE
+            memory: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+          requests:
+            cpu: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+            memory: LARGEST_VALUE
+      initMongodb:
+        resources:
+          limits:
+            cpu: LARGEST_VALUE
+            memory: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+          requests:
+            cpu: LARGEST_VALUE
+            ephemeral-storage: LARGEST_VALUE
+            memory: LARGEST_VALUE
 - name: ibm-management-ingress-operator
   spec:
     managementIngress:

controllers/size/large_amd64.go

@@ -489,6 +489,46 @@ const Large = `
             ephemeral-storage: 256Mi
             cpu: 570m
             memory: 250Mi
+- name: ibm-im-operator-v4.4
+  spec:
+    authentication:
+      replicas: 3
+      authService:
+        resources:
+          limits:
+            cpu: 2000m
+            memory: 1090Mi
+          requests:
+            ephemeral-storage: 256Mi
+            cpu: 600m
+            memory: 540Mi
+      clientRegistration:
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 50Mi
+          requests:
+            ephemeral-storage: 256Mi
+            cpu: 20m
+            memory: 50Mi
+      identityManager:
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 1270Mi
+          requests:
+            ephemeral-storage: 256Mi
+            cpu: 260m
+            memory: 240Mi
+      identityProvider:
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 920Mi
+          requests:
+            ephemeral-storage: 256Mi
+            cpu: 570m
+            memory: 250Mi
 - name: ibm-management-ingress-operator
   spec:
     managementIngress: