mas-cli 13.27.1__py3-none-any.whl → 13.28.0__py3-none-any.whl

mas/cli/templates/ibm-mas-tekton.yaml

@@ -74,7 +74,7 @@ spec:
    
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -497,7 +497,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker_tenant
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -889,7 +889,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1005,7 +1005,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1123,7 +1123,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -1193,7 +1193,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1259,7 +1259,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1386,7 +1386,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1506,7 +1506,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1623,7 +1623,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1729,7 +1729,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -2051,7 +2051,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -2161,7 +2161,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -2250,7 +2250,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -2354,7 +2354,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2436,7 +2436,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2528,6 +2528,9 @@ spec:
     - name: ingress
       type: string
       default: "false"
+    - name: cluster_nonshared
+      type: string
+      default: "false"
 
     - name: redhat_cert_manager_install_plan
       type: string
@@ -2658,6 +2661,8 @@ spec:
         value: $(params.ocp_cluster_domain)
       - name: INGRESS
         value: $(params.ingress)
+      - name: NONSHARED
+        value: $(params.cluster_nonshared)
 
       - name: REDHAT_CERT_MANAGER_INSTALL_PLAN
         value: $(params.redhat_cert_manager_install_plan)
@@ -2766,7 +2771,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2874,7 +2879,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3022,7 +3027,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3151,7 +3156,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3442,7 +3447,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3540,7 +3545,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3667,7 +3672,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3765,7 +3770,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -3857,7 +3862,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3942,7 +3947,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4027,7 +4032,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4146,7 +4151,200 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
+  workspaces:
+    - name: configs
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-cp4d-service.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-cp4d-service
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: account
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: mas_instance_id
+      type: string
+    - name: cpd_service_name
+      type: string
+    - name: cp4d_wsl_action
+      type: string
+    - name: cp4d_watson_machine_learning_action
+      type: string
+    - name: cp4d_spss_modeler_action
+      type: string
+  stepTemplate:
+    name: gitops-deprovision-cp4d-service
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: OCP_SERVER
+        value: $(params.cluster_url)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
+      - name: CPD_SERVICE_NAME
+        value: $(params.cpd_service_name)
+      - name: CP4D_WSL_ACTION
+        value: $(params.cp4d_wsl_action)
+      - name: CP4D_WATSON_MACHINE_LEARNING_ACTION
+        value: $(params.cp4d_watson_machine_learning_action)
+      - name: CP4D_SPSS_MODELER_ACTION
+        value: $(params.cp4d_spss_modeler_action)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+
+        mkdir -p /tmp/deprovision-cp4d-service
+        
+        mas gitops-deprovision-cp4d-service -a $ACCOUNT -c $CLUSTER_NAME \
+        --dir /tmp/deprovision-cp4d-service \
+        --secrets-path $SECRET_PATH \
+        --github-push \
+        --github-host $GITHUB_HOST \
+        --github-org $GITHUB_ORG \
+        --github-repo $GITHUB_REPO \
+        --git-branch $GIT_BRANCH
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-cp4d-service
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:13.28.0
+  workspaces:
+    - name: configs
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-cp4d.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-cp4d
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: account
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: mas_instance_id
+      type: string
+  stepTemplate:
+    name: gitops-deprovision-cp4d
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: OCP_SERVER
+        value: $(params.cluster_url)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+        
+        mkdir -p /tmp/deprovision-cp4d
+        mas gitops-deprovision-cp4d -a $ACCOUNT -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
+        --dir /tmp/deprovision-cp4d \
+        --secrets-path $SECRET_PATH \
+        --github-push \
+        --github-host $GITHUB_HOST \
+        --github-org $GITHUB_ORG \
+        --github-repo $GITHUB_REPO \
+        --git-branch $GIT_BRANCH
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-cp4d
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4239,7 +4437,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -4322,7 +4520,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -4439,7 +4637,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -4549,7 +4747,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4652,7 +4850,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -4709,7 +4907,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4914,7 +5112,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -5012,7 +5210,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5104,7 +5302,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5316,7 +5514,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5409,7 +5607,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5500,7 +5698,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5593,7 +5791,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -5706,7 +5904,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5833,7 +6031,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -5968,7 +6166,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6064,7 +6262,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -6186,7 +6384,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6312,7 +6510,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: shared-entitlement
 
@@ -7031,7 +7229,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7312,6 +7510,10 @@ spec:
         cp --no-clobber $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
         set -e -o pipefail
 
+        mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/order-status
+        echo "copy $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/order-status/* to $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/order-status"
+        cp -r $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/order-status/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/order-status
+
         mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID
         echo "copying $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/* to $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID"
         cp -r $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/
@@ -7368,6 +7570,9 @@ spec:
         yq -i '.cluster.url = env(OCP_SERVER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
         yq -i '.cluster.domain = env(APPSDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
 
+        # Update the provisioner_domain in cluster-params.yaml.
+        yq -i '(. | select(has("mas_provisioner")) |  .mas_provisioner.provisioner_domain) = env(APPSDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
+
         # Update the channel in the mas-instance-params.yaml. 
         yq -i '.mas_instance.channel = env(MAS_CHANNEL)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
 
@@ -7524,7 +7729,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7657,7 +7862,7 @@ spec:
         - -c
       name: gitops-mas-provisioner
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7765,7 +7970,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -7891,7 +8096,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8009,7 +8214,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8065,7 +8270,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8252,7 +8457,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8410,7 +8615,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8516,7 +8721,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: certificates
@@ -8691,7 +8896,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8791,7 +8996,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 
@@ -8915,7 +9120,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -9016,7 +9221,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9438,7 +9643,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9558,7 +9763,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9660,7 +9865,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -10003,7 +10208,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10053,7 +10258,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10187,7 +10392,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -10429,7 +10634,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10664,7 +10869,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mariadb.yaml
@@ -10785,7 +10990,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mariadb
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/minio.yaml
@@ -10891,7 +11096,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - minio
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -11069,7 +11274,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11112,7 +11317,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -11229,7 +11434,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11265,7 +11470,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11307,7 +11512,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11349,7 +11554,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11391,7 +11596,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11433,7 +11638,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11559,7 +11764,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -11627,7 +11832,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11863,7 +12068,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -12039,7 +12244,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -12499,12 +12704,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -12699,7 +12904,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -12788,7 +12993,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -12851,7 +13056,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -12926,7 +13131,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -13027,7 +13232,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -13170,7 +13375,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -13237,7 +13442,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -13569,7 +13774,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_facilities
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
     
@@ -13641,7 +13846,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -13831,7 +14036,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -14080,7 +14285,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -14168,7 +14373,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -14233,7 +14438,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -14303,7 +14508,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -14365,12 +14570,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -14493,7 +14698,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -14574,7 +14779,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -14637,7 +14842,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -14723,7 +14928,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -14770,7 +14975,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -14851,7 +15056,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -14911,7 +15116,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:13.27.1
+      image: quay.io/ibmmas/cli:13.28.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -21188,6 +21393,307 @@ spec:
         - input: "$(params.mas_edition)"
           operator: in
           values: ["essentials-lease-management", "essentials-space-management", "essentials-capital-planning", "standard", "premium"]
+
+    # 12. CP4D Services Deprovision
+    # -------------------------------------------------------------------------
+    # 12.1 Deprovision cp4d service for all
+    - name: gitops-deprovision-cp4d-all
+      runAfter:
+        - gitops-deprovision-db2u-replica-database-facilities
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cpd_service_name
+          value: 'all'
+        - name: cp4d_wsl_action
+          value: $(params.cp4d_wsl_action)
+        - name: cp4d_watson_machine_learning_action
+          value: $(params.cp4d_watson_machine_learning_action)
+        - name: cp4d_spss_modeler_action
+          value: $(params.cp4d_spss_modeler_action)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d-service
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.mas_app_channel_predict)"
+          operator: in
+          values: [""]
+
+    # 12.2 Deprovision cp4d service for wsl
+    - name: gitops-deprovision-cp4d-wsl
+      runAfter:
+        - gitops-deprovision-cp4d-all
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cpd_service_name
+          value: 'wsl'
+        - name: cp4d_wsl_action
+          value: $(params.cp4d_wsl_action)
+        - name: cp4d_watson_machine_learning_action
+          value: $(params.cp4d_watson_machine_learning_action)
+        - name: cp4d_spss_modeler_action
+          value: $(params.cp4d_spss_modeler_action)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d-service
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.cp4d_wsl_action)"
+          operator: in
+          values: ["uninstall"]
+
+
+    # 12.3 Deprovision cp4d service for wml
+    - name: gitops-deprovision-cp4d-wml
+      runAfter:
+        - gitops-deprovision-cp4d-wsl
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cpd_service_name
+          value: 'wml'
+        - name: cp4d_wsl_action
+          value: $(params.cp4d_wsl_action)
+        - name: cp4d_watson_machine_learning_action
+          value: $(params.cp4d_watson_machine_learning_action)
+        - name: cp4d_spss_modeler_action
+          value: $(params.cp4d_spss_modeler_action)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d-service
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.cp4d_watson_machine_learning_action)"
+          operator: in
+          values: ["uninstall"]
+
+    # 12.4 Deprovision cp4d service for spark
+    - name: gitops-deprovision-cp4d-spark
+      runAfter:
+        - gitops-deprovision-cp4d-wml
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cpd_service_name
+          value: 'spark'
+        - name: cp4d_wsl_action
+          value: $(params.cp4d_wsl_action)
+        - name: cp4d_watson_machine_learning_action
+          value: $(params.cp4d_watson_machine_learning_action)
+        - name: cp4d_spss_modeler_action
+          value: $(params.cp4d_spss_modeler_action)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d-service
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.cp4d_analytics_engine_action)"
+          operator: in
+          values: ["uninstall"]
+
+    # 12.5 Deprovision cp4d service for spss
+    - name: gitops-deprovision-cp4d-spss
+      runAfter:
+        - gitops-deprovision-cp4d-spark
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cpd_service_name
+          value: 'spss'
+        - name: cp4d_wsl_action
+          value: $(params.cp4d_wsl_action)
+        - name: cp4d_watson_machine_learning_action
+          value: $(params.cp4d_watson_machine_learning_action)
+        - name: cp4d_spss_modeler_action
+          value: $(params.cp4d_spss_modeler_action)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d-service
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.cp4d_spss_modeler_action)"
+          operator: in
+          values: ["uninstall"]
+
+    # 13. CP4D Deprovision
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-cp4d
+      runAfter:
+        - gitops-deprovision-cp4d-spss
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: region
+          value: $(params.region)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-cp4d
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.cp4d_action)"
+          operator: in
+          values: ["uninstall"]
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-cluster.yaml
 # --------------------------------------------------------------------------------
@@ -21335,6 +21841,9 @@ spec:
     - name: ingress
       type: string
       default: "false"
+    - name: cluster_nonshared
+      type: string
+      default: "false"
 
     - name: group_sync_operator_cron_schedule
       type: string
@@ -21504,6 +22013,8 @@ spec:
           value: $(params.dns_provider)
         - name: ingress
           value: $(params.ingress)
+        - name: cluster_nonshared
+          value: $(params.cluster_nonshared)
 
         - name: group_sync_operator_cron_schedule
           value: $(params.group_sync_operator_cron_schedule)