Merge pull request #803 from IBM/cp4ba20241007

CP4BA 24.0.0 IFIX2, IPM 1.15.0 IFIX2
IBM · Oct 8, 2024 · 7ba39ad · 7ba39ad
2 parents d5c5140 + b59a70e
commit 7ba39ad
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 38 deletions.
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
@@ -7,14 +7,16 @@ cp4ba_dir_name: cp4ba
 cp4ba_operator_channel: v24.0
 ## Should not be changed in particular guide version.
 ## Version of cert-kubernetes folder from Cloud Pak CASE archive e.g. 21.0.1
-cp4ba_cert_k8s_branch: 24.0.0-IF001
+cp4ba_cert_k8s_branch: 24.0.0-IF002
 cp4ba_storage_class_name: ""
 cp4ba_block_storage_class_name: ""
 ## Should not be changed in particular guide version.
 ## Version of Cloud Pak e.g. 20.0.2.1, 20.0.3
 cp4ba_version: 24.0.0
 ## Version in CPFS catalog CatalogSource
-cpfs_cs_version: v4-6-4
+cpfs_cs_version: v4-6-5
+## Version in BTS catalog CatalogSource
+cpfs_bts_version: v3-34-0
 ## Name of the CP4BA instance in cr.yaml at path metadata.name
 cp4ba_cr_meta_name: icp4adeploy
 ## Name of OCP CP4BA project

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/predeploy.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/predeploy.yml
@@ -35,7 +35,7 @@
     - ibm-opencontent-flink
     - ibm-cs-opensearch-catalog
     - ibm-cs-install-catalog-{{ cpfs_cs_version }}
-    - bts-operator
+    - bts-operator-{{ cpfs_bts_version }}
     - ibm-iam-operator-catalog
     - ibm-zen-operator-catalog
     - ibm-events-operator-catalog

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/remove.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/remove.yml
@@ -108,7 +108,7 @@
     - ibm-opencontent-flink
     - ibm-cs-opensearch-catalog
     - ibm-cs-install-catalog-{{ cpfs_cs_version }}
-    - bts-operator
+    - bts-operator-{{ cpfs_bts_version }}
     - ibm-iam-operator-catalog
     - ibm-zen-operator-catalog
     - ibm-events-operator-catalog

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 24.0.0-IF001 catalog
+# CP4BA 24.0.0-IF002 catalog
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -26,12 +26,12 @@ spec:
   displayName: ibm-cp4a-operator
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-cp-automation-catalog@sha256:8b838c40d6acdcade0452e06b769d64f881440a8739b5d34f8756600b3da0ec3
+  image: icr.io/cpopen/ibm-cp-automation-catalog@sha256:990fc0915a570ef165074015aae4483ed458600f373840a3e7efe751faa9ac13
   updateStrategy:
     registryPoll:
       interval: 45m
 ---
-# IBM CS Flink Operator Catalog 1.18.2 (2.0.2)
+# IBM CS Flink Operator Catalog 1.18.3 (2.0.3)
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -42,7 +42,7 @@ spec:
   publisher: IBM
   sourceType: grpc
   image: >-
-    icr.io/cpopen/ibm-opencontent-flink-operator-catalog@sha256:5424ad1252456bf2399c353703626faaaf739fedf6aad17e5485203671fbf245
+    icr.io/cpopen/ibm-opencontent-flink-operator-catalog@sha256:05b9d6b24d142bc2e9cde8bed4c8db45233cb7eaa5b37fec0daa25906c16daa3
   updateStrategy:
     registryPoll:
       interval: 45m
@@ -64,42 +64,42 @@ spec:
       interval: 45m
   priority: 100
 ---
-# IBM Cloud Foundational Services 4.6.4
+# IBM Cloud Foundational Services 4.6.5
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: ibm-cs-install-catalog-v4-6-4
+  name: ibm-cs-install-catalog-v4-6-5
   namespace: "{{ cp4ba_project_name }}"
   annotations:
     bedrock_catalogsource_priority: '1'
 spec:
   displayName: IBM CS Install Operators
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-cs-install-catalog@sha256:962de7ca63e3cd8fab9f37a1c830cbe0db91f9d799bbded4911f6af011eeef6f
+  image: icr.io/cpopen/ibm-cs-install-catalog@sha256:e57569666cae5035f188d72665366759609e4d8b17bb3bad011b299bd17353ce
   updateStrategy:
     registryPoll:
       interval: 45m
-  priority: 100
+  priority: 100    
 ---
-# IBM Business Teams Service version 3.33.1
+# IBM Business Teams Service version 3.34.0
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: bts-operator
+  name: bts-operator-v3-34-0
   namespace: "{{ cp4ba_project_name }}"
   annotations:
     bedrock_catalogsource_priority: '1'
 spec:
   displayName: BTS Operator
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-bts-operator-catalog@sha256:866f0212eab7bc70cc7fcf7ebdbb4dfac561991f6d25900bd52f33cd90846adf
+  image: icr.io/cpopen/ibm-bts-operator-catalog@sha256:437a91f9e0cc224c32fb3d574dbe56efe5d1211f2338746e8a7e192034beae8f
   updateStrategy:
     registryPoll:
       interval: 45m
 ---
-# IBM CS IM Operator Catalog 4.5.3
+# IBM CS IM Operator Catalog 4.5.4
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -111,13 +111,13 @@ spec:
   displayName: IBM IAM Operator Catalog
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-iam-operator-catalog@sha256:74b3d678c8c3b20cd38d3adbad033f48061f09d84b2cf192c26aa278e9515d77
+  image: icr.io/cpopen/ibm-iam-operator-catalog@sha256:f7e9ac318d31a64c7d2921e8702c2e444532c733e0eae31343514802f5d1ebf5
   updateStrategy:
     registryPoll:
       interval: 45m
   priority: 100
 ---
-# IBM Zen Operator Catalog 5.1.6
+# IBM Zen Operator Catalog 5.1.7
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -129,7 +129,7 @@ spec:
   displayName: IBM Zen Operator Catalog
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-zen-operator-catalog@sha256:62f99d0f1e2f45873659f184842d7c0311703d12a0c55d6c6fd7756dc6f77fdd
+  image: icr.io/cpopen/ibm-zen-operator-catalog@sha256:c4d8a4af7a16e3d10d90ea8298249d9880c7042384fcea373531cd1bf9616e7d
   updateStrategy:
     registryPoll:
       interval: 45m
@@ -181,7 +181,7 @@ spec:
   displayName: ibm-fncm-operator
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-fncm-catalog@sha256:9dd34128b6b0d961b01d89260b276830452f0d1c8180855e8f9d42cca9bd5cf8
+  image: icr.io/cpopen/ibm-fncm-catalog@sha256:8305209803f534779d1df2666a6b953272d6f4cbd65821839b2ba2311f303ea6
   updateStrategy:
     registryPoll:
-      interval: 45m
+      interval: 45m
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cpfs/templates/catalogsource.yaml.j2 b/automation-roles/50-install-cloud-pak/cp4ba/cpfs/templates/catalogsource.yaml.j2
@@ -4,31 +4,31 @@
 # IBM License Service Reporter https://github.com/IBM/cloud-pak/tree/afa5f33d3728fd03b87a5481fc223d5c50cf9015/repo/case/ibm-license-service-reporter-bundle
 
 ---
-# IBM Certificate Manager 4.2.6
+# IBM Certificate Manager 4.2.7
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
   name: ibm-cert-manager-catalog
   namespace: ibm-cert-manager
 spec:
-  displayName: ibm-cert-manager-4.2.6
+  displayName: ibm-cert-manager-4.2.7
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-cert-manager-operator-catalog@sha256:462d76a7cf8b427d3d135e1a6bea68a1d2b2350e978e44d516787817b5d3f511
+  image: icr.io/cpopen/ibm-cert-manager-operator-catalog@sha256:4dcf4ace4b5f166f83b31063f7e6404dbf78d8e98a9d4fcf52fedf576a55ca6c
   updateStrategy:
     registryPoll:
       interval: 45m
 ---
-# IBM License Manager 4.2.6
+# IBM License Manager 4.2.7
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
   name: ibm-licensing-catalog
   namespace: ibm-licensing
 spec:
-  displayName: ibm-licensing-4.2.6
+  displayName: ibm-licensing-4.2.7
   publisher: IBM
-  image: icr.io/cpopen/ibm-licensing-catalog@sha256:1879e043a7ea901c4e0568f73d3c840ed72e5ed403c82910446ed156777cd48e
+  image: icr.io/cpopen/ibm-licensing-catalog@sha256:e14ef29968ffd911602f2e5be776480d1bbf0fa09de22415a3bedbabcf58860c
   sourceType: grpc
   updateStrategy:
     registryPoll:

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,7 +3,7 @@ pm_base_dir: "{{ generic_directory }}"
 pm_dir_name: pm
 pm_project_name: ""
 pm_operator_channel: v3.0
-pm_version: 1.15.0
+pm_version: 1.15.0_IF002
 pm_storage_class_name: ""
 pm_universal_password: ""
 pm_postgresql_project: ""

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
@@ -1,4 +1,4 @@
-# case 3.3.2 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-process-mining
+# case 3.3.3 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-process-mining
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -8,7 +8,7 @@ spec:
   displayName: IBM ProcessMining Operators
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/processmining-operator-catalog@sha256:c3aed6df435633b1579190921b07f90934b4e0a84750baa79da11bcb182091d2
+  image: icr.io/cpopen/processmining-operator-catalog@sha256:2931c457bbb1f5232557a24d2d8e759000921a97785ee28dbbbd6e2560fc558e
   updateStrategy:
     registryPoll:
       interval: 45m

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/rpa/defaults/main.yml b/automation-roles/50-install-cloud-pak/cp4ba/rpa/defaults/main.yml
@@ -1,9 +1,9 @@
 rpa_action: install
 rpa_base_dir: "{{ generic_directory }}"
 rpa_dir_name: rpa
-rpa_operator_channel: v2.0
+rpa_operator_channel: v2.1
 rpa_mq_operator_channel: v3.2-sc2
-rpa_version: 2.0.0
+rpa_version: 2.1.0
 rpa_project_name: cp4ba
 rpa_storage_class_name: ""
 rpa_universal_password: ""

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/rpa/templates/catalogsource.yaml.j2 b/automation-roles/50-install-cloud-pak/cp4ba/rpa/templates/catalogsource.yaml.j2
@@ -1,4 +1,4 @@
-# case 2.0.0 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-robotic-process-automation
+# case 2.1.0 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-robotic-process-automation
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -8,12 +8,12 @@ spec:
   displayName: IBM Robotic Process Automation Catalog
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-rpa-operator-catalog@sha256:5a794a83ed8e8ccf2d10fc3495fa684279b1b89e80b82fab2d137f9748d8df2a
+  image: icr.io/cpopen/ibm-rpa-operator-catalog@sha256:b138bdd6219e377a7aa0b52525605dbb04a9a854b28e444ebf65c1640da15673
   updateStrategy:
     registryPoll:
       interval: 45m
 ---
-# case 1.1.9 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-redis-cp
+# case 1.2.1 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-redis-cp
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -23,12 +23,12 @@ spec:
   displayName: IBM Redis CP Catalog
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-redis-cp-operator-catalog@sha256:516a1206c82e79985095233ba520700e746c0eb79a9efea28d35c3f8d3147c3f
+  image: icr.io/cpopen/ibm-redis-cp-operator-catalog@sha256:6c0471ce54d5111e88c68395ab2a1b68c5304890523ecb76b297180f7697ce40
 updateStrategy:
   registryPoll:
     interval: 45m
 ---
-# case 3.2.3 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-mq
+# case 3.2.5 / https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-mq
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -38,7 +38,7 @@ spec:
   displayName: IBM MQ
   publisher: IBM
   sourceType: grpc
-  image: icr.io/cpopen/ibm-mq-operator-catalog@sha256:f17b7b956674ed48d89f6f2ee9f0d7f5249b35842fc3ab59c5175fef4914e4a7
+  image: icr.io/cpopen/ibm-mq-operator-catalog@sha256:9be58e171b7dec6012cc4a8f9d65793bd6eb02e01a58486817d740d932879892
   updateStrategy:
     registryPoll:
       interval: 45m