Merge pull request #675 from IBM/cp4ba-2024-03-27

CP4BA 23.0.2.3 + IPM 1.14.4
IBM · Mar 29, 2024 · c636d2c · c636d2c
2 parents 9619ee6 + f9fd093
commit c636d2c
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 30 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/config/tasks/internal-variables.yml b/automation-roles/50-install-cloud-pak/cp4ba/config/tasks/internal-variables.yml
@@ -206,4 +206,6 @@ pm_project_name: "{{ main_project_name }}"
 pm_postgresql_project: "{{ postgresql_project_name }}"
 pm_postgresql_hostname: "{{ postgresql_hostname }}"
 pm_postgresql_password: "{{ postgresql_universal_password }}"
+pm_mongodb_project: "{{ mongodb_project_name }}"
 pm_mongodb_hostname: "{{ mongodb_hostname }}"
+pm_mongodb_admin_user: "{{ mongodb_admin_user }}"
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-cluster/tasks/install.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-cluster/tasks/install.yml
@@ -107,7 +107,7 @@
 #     name: rpa
 #   when: _current_cp4ba_cluster.rpa.enabled
 
-# - name: Install PM
-#   ansible.builtin.include_role:
-#     name: pm
-#   when: _current_cp4ba_cluster.pm.enabled
+- name: Install PM
+  ansible.builtin.include_role:
+    name: pm
+  when: _current_cp4ba_cluster.pm.enabled
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/defaults/main.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/defaults/main.yml
@@ -8,7 +8,7 @@ cp4ba_operator_channel: v23.2
 ## Should not be changed in particular guide version.
 ## Version of Cloud Pak CASE archive as found on
 ## https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-automation e.g. 3.0.1
-cp4ba_case_version: 5.1.2
+cp4ba_case_version: 5.1.3
 ## Should not be changed in particular guide version.
 ## Version of cert-kubernetes folder from Cloud Pak CASE archive e.g. 21.0.1
 cp4ba_case_cert_k8s_version: 23.0.2

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/templates/catalogsource.yaml.j2 b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/templates/catalogsource.yaml.j2
@@ -16,7 +16,7 @@
 # disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 #
 ###############################################################################
-# CP4BA 23.0.2-IF002 catalog
+# CP4BA 23.0.2-IF003 catalog
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -26,7 +26,7 @@ spec:
   displayName: ibm-cp4a-operator
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-cp-automation-catalog@sha256:beed894a47ae8e3414e50638221e6cf03ae3ac121fe2e78ec0e0705cda77a82c
+  image: icr.io/cpopen/ibm-cp-automation-catalog@sha256:916ca9cc9f2a08071274480ee76a5a0886b136aeaf22bf5ba77ccabaaf03f39a
   updateStrategy:
     registryPoll:
       interval: 45m
@@ -61,7 +61,7 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 45m
-  priority: 100 
+  priority: 100
 ---
 # IBM Cloud Foundational Services 4.4.0
 apiVersion: operators.coreos.com/v1alpha1
@@ -79,7 +79,7 @@ spec:
   updateStrategy:
     registryPoll:
       interval: 45m
-  priority: 100     
+  priority: 100    
 ---
 # IBM Business Teams Service version 3.32.0
 apiVersion: operators.coreos.com/v1alpha1
@@ -126,7 +126,7 @@ spec:
   displayName: ibm-fncm-operator
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-fncm-catalog@sha256:0ecc62f5e9eec5d1e0e58fd510fbb7110a1a175aa834ade2059c170792393863
+  image: icr.io/cpopen/ibm-fncm-catalog@sha256:c8ca90434c2d9b7846097daab2eeb99168e16fcd9382873af31399119b1ced9f
   updateStrategy:
     registryPoll:
       interval: 45m
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/pm/defaults/main.yml b/automation-roles/50-install-cloud-pak/cp4ba/pm/defaults/main.yml
@@ -3,11 +3,13 @@ pm_base_dir: "{{ generic_directory }}"
 pm_dir_name: pm
 pm_project_name: ""
 pm_operator_channel: v3.0
-pm_version: 1.14.3
+pm_version: 1.14.4
 pm_storage_class_name: ""
 pm_universal_password: ""
 pm_postgresql_project: ""
 pm_postgresql_hostname: ""
 pm_postgresql_password: ""
+pm_mongodb_project: ""
 pm_mongodb_hostname: ""
+pm_mongodb_admin_user: ""
 pm_output_namespace: "cloud-pak-deployer"
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/pm/tasks/install.yml b/automation-roles/50-install-cloud-pak/cp4ba/pm/tasks/install.yml
@@ -29,21 +29,22 @@
   kubernetes.core.k8s_info:
     api_version: v1
     kind: Pod
-    namespace: mongodb
+    namespace: "{{ pm_mongodb_project }}"
     label_selectors:
-      - app.kubernetes.io/component=mongodb
+      - app=mongodb
   register: mongodb_pod
 
 - name: Create PM Mongo DB
   kubernetes.core.k8s_exec:
-    namespace: mongodb
+    namespace: "{{ pm_mongodb_project }}"
     pod: "{{ mongodb_pod.resources[0].metadata.name }}"
     command: |
-      mongo --username root --password {{ pm_universal_password }} --authenticationDatabase admin
-      --eval 'db.createUser({user: "root", pwd: "{{ pm_universal_password }}", roles: [ { role: "readWrite", db: "processmining" } ]})'
+      mongo --username {{ pm_mongodb_admin_user }} --password {{ pm_universal_password }} --authenticationDatabase admin
+      --eval 'db.createUser({user: "{{ pm_mongodb_admin_user }}", pwd: "{{ pm_universal_password }}", roles: [ { role: "readWrite", db: "processmining" } ]})'
       mongodb://localhost:27017/processmining
   register: command_status
-  failed_when: command_status.rc != 0 and command_status.stdout is not search('.*User \"root@processmining\" already exists.*')
+  failed_when: command_status.rc != 0 and
+    command_status.stdout is not search('.*User \"' + pm_mongodb_admin_user + '@processmining\" already exists.*')
 
 - name: Prepare yaml file for CatalogSource
   ansible.builtin.template:

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/pm/tasks/remove.yml b/automation-roles/50-install-cloud-pak/cp4ba/pm/tasks/remove.yml
@@ -77,21 +77,21 @@
   kubernetes.core.k8s_info:
     api_version: v1
     kind: Pod
-    namespace: mongodb
+    namespace: "{{ pm_mongodb_project }}"
     label_selectors:
-      - app.kubernetes.io/component=mongodb
+      - app=mongodb
   register: mongodb_pod
 
 - name: Delete PM Mongo DB
   kubernetes.core.k8s_exec:
-    namespace: mongodb
+    namespace: "{{ pm_mongodb_project }}"
     pod: "{{ mongodb_pod.resources[0].metadata.name }}"
     command: >
-      mongo --username root --password {{ pm_universal_password }} --authenticationDatabase admin
+      mongo --username {{ pm_mongodb_admin_user }} --password {{ pm_universal_password }} --authenticationDatabase admin
       --eval '{{ item }}' mongodb://localhost:27017/processmining
   register: command_status
   with_items:
-    - db.dropUser("root")
+    - db.dropUser("{{ pm_mongodb_admin_user }}")
     - db.dropDatabase()
   when: mongodb_pod.resources | length != 0
 

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/pm/templates/catalogsource.yaml.j2 b/automation-roles/50-install-cloud-pak/cp4ba/pm/templates/catalogsource.yaml.j2
@@ -8,7 +8,7 @@ spec:
   displayName: IBM ProcessMining Operators
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/processmining-operator-catalog@sha256:99edbaa0c1d468f07d662c78453c95ecf00acd5ac04c621aa29f687769b05ffe
+  image: icr.io/cpopen/processmining-operator-catalog@sha256:f5cfcb8c13cade29deb5235c3e8bfdceb03255a5c78621b4a3cd76ebc7f146d3
   updateStrategy:
     registryPoll:
       interval: 45m
@@ -36,7 +36,7 @@ metadata:
   namespace: "{{ pm_project_name }}"
 spec:
   displayName: IBM Db2U Catalog
-  image: icr.io/cpopen/ibm-db2uoperator-catalog@sha256:986c54823f2d536e2dd35fa60d8e875786ef7bc0d9e8f87b39e90a7730fc6d70
+  image: icr.io/cpopen/ibm-db2uoperator-catalog@sha256:278fa6bbaa834faa4a0ec522cd85a301a088e610d8f5a74d7981f172d30cd5d4
   imagePullPolicy: Always
   publisher: IBM
   sourceType: grpc

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/pm/templates/processmining.yaml.j2 b/automation-roles/50-install-cloud-pak/cp4ba/pm/templates/processmining.yaml.j2
@@ -22,10 +22,10 @@ spec:
       database:
         external:
           connectionstring: ""
-          host: "{{ pm_mongodb_hostname }}"        
+          host: "{{ pm_mongodb_hostname }}"
           port: 27017
           database: processmining
-          user: root
+          user: "{{ pm_mongodb_admin_user }}"
           credential: 
             secretname: pm-dbs
             passwordkey: mongodbPassword

diff --git a/docs/src/30-reference/configuration/cp4ba.md b/docs/src/30-reference/configuration/cp4ba.md
@@ -1,9 +1,9 @@
 # Cloud Pak for Business Automation<!-- omit in toc -->
 
-Contains CP4BA version 23.0.2 iFix 2.  
+Contains CP4BA version 23.0.2 iFix 3.  
 RPA and Process Mining are currently not deployed due to discrepancy in Cloud Pak Foundational Services version.  
-~~Contains IPM version 1.14.3.~~
-~~Contains RPA version 23.0.14.~~
+Contains IPM version 1.14.4.
+~~Contains RPA version 23.0.15.~~
 
 - [Disclaimer ✋](#disclaimer-)
 - [Documentation base 📝](#documentation-base-)
@@ -126,7 +126,7 @@ Contains prerequisites for the whole platform.
 
 ## Environments used for installation 💻
 
-With proper sizing of the cluster and provided RWX File and RWO Block Storage Class, CP4BA deployed with Deployer should be working on any OpenShift 4.12 with Worker Nodes which in total have (60 CPU, 128GB Memory).
+With proper sizing of the cluster and provided RWX File and RWO Block Storage Class, CP4BA deployed with Deployer should be working on any OpenShift 4.14 with Worker Nodes which in total have free 60 CPU, 128GB Memory for requests.
 
 ## Automated post-deployment tasks ✅