From e9d6f3e9ab19bcc0eda341c6ece1d2d196c82952 Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 07:33:57 -0500 Subject: [PATCH 1/7] [patch] add changes for post sync cpd service --- .../templates/01-cpd-service-post-ops.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 575fce58e..8783d935f 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -234,11 +234,12 @@ spec: CCS_COUCHDB_RES=$(oc get CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -ojsonpath='{.spec.couchdb_resources}') CCS_BLOCKSTORAGE=$(oc get CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -ojsonpath='{.spec.blockStorageClass}') CCS_IMAGEPULLSECRET=$(oc get CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -ojsonpath='{.spec.imagePullSecret}') + CCS_STORAGECLASS=$(oc get CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -ojsonpath='{.spec.storageClass}') if [[ -z $CCS_COUCHDB_RES || -z $CCS_BLOCKSTORAGE || -z $CCS_IMAGEPULLSECRET ]]; then echo "CCS CR needs to be patched" echo "patching CCS Cr..." - oc patch --type='merge' CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -p "{\"spec\":{ \"imagePullSecret\":\"ibm-entitlement-key\",\"blockStorageClass\":\"$CPD_SERVICE_BLOCK_STORAGE_CLASS\",\"fileStorageClass\":\"$CPD_SERVICE_STORAGE_CLASS\",\"couchdb_resources\":{ \"limits\":{ \"cpu\":\"16\",\"memory\":\"16Gi\"},\"requests\":{ \"cpu\":\"3\",\"memory\":\"256Mi\"},\"couchdb_search_resources\":{ \"limits\":{ \"cpu\":\"4\",\"memory\":\"6Gi\"},\"requests\":{ \"cpu\":\"250m\",\"memory\":\"256Mi\"}}}}}" + oc patch --type='merge' CCS ccs-cr -n ${CPD_INSTANCE_NAMESPACE} -p "{\"spec\":{ \"imagePullSecret\":\"ibm-entitlement-key\",\"blockStorageClass\":\"$CPD_SERVICE_BLOCK_STORAGE_CLASS\",\"fileStorageClass\":\"$CPD_SERVICE_STORAGE_CLASS\",\"storageClass\":\"$CCS_STORAGECLASS\",\"couchdb_resources\":{ \"limits\":{ \"cpu\":\"16\",\"memory\":\"16Gi\"},\"requests\":{ \"cpu\":\"3\",\"memory\":\"256Mi\"}}}}" echo "scaling CCS operator down and up to force reconcile when the pod is restarted" oc scale deployment ibm-cpd-ccs-operator -n ${CPD_OPERATORS_NAMESPACE} --replicas=0 oc scale deployment ibm-cpd-ccs-operator -n ${CPD_OPERATORS_NAMESPACE} --replicas=1 @@ -265,8 +266,9 @@ spec: done COMP=$(compare_versions ${CPD_PRODUCT_VERSION} 5.2.0) + echo "Comparing versions = ${COMP}" - if [[ $COMP < 0 ]]; then + if [[ ${COMP}<0 ]]; then echo echo "================================================================================" echo "Wait for Elastic Search to be ready and patch if needed before checking ccsStatus" From e05f8a249fd40a51f695e493ea3eb10c867fb2ea Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 07:50:26 -0500 Subject: [PATCH 2/7] [patch] fix syntax error --- .../templates/01-cpd-service-post-ops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 8783d935f..21fde2a46 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -268,7 +268,7 @@ spec: COMP=$(compare_versions ${CPD_PRODUCT_VERSION} 5.2.0) echo "Comparing versions = ${COMP}" - if [[ ${COMP}<0 ]]; then + if [[ ${COMP} -lt 0 ]]; then echo echo "================================================================================" echo "Wait for Elastic Search to be ready and patch if needed before checking ccsStatus" From f452c9ff01c94c761f23e08baa5b9eb1e0f86a4c Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 08:30:17 -0500 Subject: [PATCH 3/7] [patch] set values based on cpd service --- .../121-ibm-post-sync-job-cp4d-services.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/templates/121-ibm-post-sync-job-cp4d-services.yaml b/root-applications/ibm-mas-instance-root/templates/121-ibm-post-sync-job-cp4d-services.yaml index bc60eb716..590951b49 100644 --- a/root-applications/ibm-mas-instance-root/templates/121-ibm-post-sync-job-cp4d-services.yaml +++ b/root-applications/ibm-mas-instance-root/templates/121-ibm-post-sync-job-cp4d-services.yaml @@ -47,17 +47,23 @@ spec: cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_service_storage_class: "{{ .Values.ibm_cp4d.cpd_service_storage_class }}" - cpd_service_block_storage_class: "{{ .Values.ibm_cp4d.cpd_service_block_storage_class }}" - cpd_service_scale_config: "{{ .Values.ibm_cp4d.cpd_service_scale_config }}" {{- if not (empty .Values.ibm_wsl) }} wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + cpd_service_storage_class: "{{ .Values.ibm_wsl.cpd_service_storage_class }}" + cpd_service_block_storage_class: "{{ .Values.ibm_wsl.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_wsl.cpd_service_scale_config }}" {{- end }} {{- if not (empty .Values.ibm_wml) }} wml_channel: "{{ .Values.ibm_wml.wml_channel }}" + cpd_service_storage_class: "{{ .Values.ibm_wml.cpd_service_storage_class }}" + cpd_service_block_storage_class: "{{ .Values.ibm_wml.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_wml.cpd_service_scale_config }}" {{- end }} {{- if not (empty .Values.ibm_spss) }} spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + cpd_service_storage_class: "{{ .Values.ibm_spss.cpd_service_storage_class }}" + cpd_service_block_storage_class: "{{ .Values.ibm_spss.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_spss.cpd_service_scale_config }}" {{- end }} {{- if .Values.custom_labels }} From 94ce3bd6065e76a44c0e6cf5bd1b43f1d8ec4ef5 Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 13:05:41 -0500 Subject: [PATCH 4/7] [patch] cleanup --- .../templates/01-cpd-service-post-ops.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 21fde2a46..983269922 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -266,7 +266,6 @@ spec: done COMP=$(compare_versions ${CPD_PRODUCT_VERSION} 5.2.0) - echo "Comparing versions = ${COMP}" if [[ ${COMP} -lt 0 ]]; then echo From d150f90e5fd10b488699cc27c1a3209a13103452 Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 22:19:58 -0500 Subject: [PATCH 5/7] [patch] testing without scaling deployment --- .../templates/01-cpd-service-post-ops.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 983269922..a0896343f 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -301,11 +301,11 @@ spec: if [[ -z $ELASTICSEARCH_IMAGEPULLSECRET ]]; then echo "elasticsearch-master needs to be patched" echo "patching elasticsearch-master and forcing reconcile..." - oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=0 + # oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=0 oc delete Job elasticsearch-master-ibm-elasticsearch-create-snapshot-repo-job -n ${CPD_INSTANCE_NAMESPACE} --ignore-not-found oc delete StatefulSet -n ${CPD_INSTANCE_NAMESPACE} --selector="app.kubernetes.io/instance=elasticsearch-master" --ignore-not-found oc patch --type='merge' ElasticsearchCluster elasticsearch-master -n ${CPD_INSTANCE_NAMESPACE} -p "{\"spec\":{ \"imagePullSecret\":\"ibm-entitlement-key\"}}" - oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=1 + # oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=1 fi echo From 5cde25c8bf172594e6a5cee2427ade1eaac833e2 Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Wed, 11 Feb 2026 22:36:09 -0500 Subject: [PATCH 6/7] [patch] use cr to avoid conflict --- .../templates/01-cpd-service-post-ops.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index a0896343f..b549f6d73 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -309,21 +309,26 @@ spec: fi echo - echo "Waiting for ibm-elasticsearch-operator to be ready again..." + echo "Waiting for ElasticsearchCluster elasticsearch-master to be ready again..." wait_period=0 while true; do wait_period=$(($wait_period+60)) if [ $wait_period -gt 1200 ]; then - echo "Elasticsearch operator is not ready after 20 minutes of waiting. exiting..." + echo "ElasticsearchCluster elasticsearch-master is not ready after 20 minutes of waiting. exiting..." exit 1 else sleep 60 fi - ELASTICSEARCH_OPERATOR_LOOKUP=$(oc get deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n $CPD_OPERATORS_NAMESPACE --ignore-not-found -ojsonpath='{.status.availableReplicas}') - if [[ ! -z $ELASTICSEARCH_OPERATOR_LOOKUP ]]; then - echo "Elasticsearch Operator is ready again" + # ELASTICSEARCH_OPERATOR_LOOKUP=$(oc get deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n $CPD_OPERATORS_NAMESPACE --ignore-not-found -ojsonpath='{.status.availableReplicas}') + # if [[ ! -z $ELASTICSEARCH_OPERATOR_LOOKUP ]]; then + # echo "Elasticsearch Operator is ready again" + # break + # fi + ELASTICSEARCH_CLUSTER_LOOKUP=$(oc get ElasticsearchCluster elasticsearch-master -n $CPD_INSTANCE_NAMESPACE --ignore-not-found -ojsonpath='{.status.phase}') + if [[ ! -z ${ELASTICSEARCH_CLUSTER_LOOKUP} && ${ELASTICSEARCH_CLUSTER_LOOKUP} == *"Ready"* ]]; then + echo "ElasticsearchCluster elasticsearch-master elasticsearch-master is ready" break fi done From 4a1dbf401a5e75b49763097a0651365356b98797 Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Thu, 12 Feb 2026 01:34:34 -0500 Subject: [PATCH 7/7] [patch] cleanup --- .../templates/01-cpd-service-post-ops.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index b549f6d73..57bbbc1ea 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml @@ -301,11 +301,9 @@ spec: if [[ -z $ELASTICSEARCH_IMAGEPULLSECRET ]]; then echo "elasticsearch-master needs to be patched" echo "patching elasticsearch-master and forcing reconcile..." - # oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=0 oc delete Job elasticsearch-master-ibm-elasticsearch-create-snapshot-repo-job -n ${CPD_INSTANCE_NAMESPACE} --ignore-not-found oc delete StatefulSet -n ${CPD_INSTANCE_NAMESPACE} --selector="app.kubernetes.io/instance=elasticsearch-master" --ignore-not-found oc patch --type='merge' ElasticsearchCluster elasticsearch-master -n ${CPD_INSTANCE_NAMESPACE} -p "{\"spec\":{ \"imagePullSecret\":\"ibm-entitlement-key\"}}" - # oc scale deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n ${CPD_OPERATORS_NAMESPACE} --replicas=1 fi echo @@ -321,11 +319,6 @@ spec: sleep 60 fi - # ELASTICSEARCH_OPERATOR_LOOKUP=$(oc get deployment ibm-elasticsearch-operator-ibm-es-controller-manager -n $CPD_OPERATORS_NAMESPACE --ignore-not-found -ojsonpath='{.status.availableReplicas}') - # if [[ ! -z $ELASTICSEARCH_OPERATOR_LOOKUP ]]; then - # echo "Elasticsearch Operator is ready again" - # break - # fi ELASTICSEARCH_CLUSTER_LOOKUP=$(oc get ElasticsearchCluster elasticsearch-master -n $CPD_INSTANCE_NAMESPACE --ignore-not-found -ojsonpath='{.status.phase}') if [[ ! -z ${ELASTICSEARCH_CLUSTER_LOOKUP} && ${ELASTICSEARCH_CLUSTER_LOOKUP} == *"Ready"* ]]; then echo "ElasticsearchCluster elasticsearch-master elasticsearch-master is ready"