mas-cli 15.5.0__py3-none-any.whl → 15.6.1__py3-none-any.whl

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

@@ -129,7 +129,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -201,7 +201,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -281,7 +281,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:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -495,7 +495,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice_tenant
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -711,7 +711,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -827,7 +827,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -945,7 +945,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -1015,7 +1015,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1081,7 +1081,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1208,7 +1208,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1328,7 +1328,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1445,7 +1445,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1551,7 +1551,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1873,7 +1873,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1983,7 +1983,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -2072,7 +2072,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -2267,7 +2267,7 @@ spec:
         - -c
       name: gitops-aibroker-tenant
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2460,7 +2460,7 @@ spec:
         - -c
       name: gitops-aibroker
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2561,7 +2561,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2643,7 +2643,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2785,6 +2785,9 @@ spec:
     - name: cluster_logging_operator_syslog_forwarder_version
       type: string
       default: "1.8-amd64"
+    - name: cluster_logging_operator_dlc_ca_bundle_file
+      type: string
+      default: ""
 
     - name: instana_agent_operator_install
       type: string
@@ -2903,6 +2906,8 @@ spec:
         value: $(params.cluster_logging_operator_setup_log_forwarding)
       - name: CLUSTER_LOGGING_OPERATOR_SYSLOG_FORWARDER_VERSION
         value: $(params.cluster_logging_operator_syslog_forwarder_version)
+      - name: CLUSTER_LOGGING_OPERATOR_DLC_CA_BUNDLE_FILE
+        value: $(params.cluster_logging_operator_dlc_ca_bundle_file)
 
       - name: INSTANA_AGENT_OPERATOR_INSTALL
         value: $(params.instana_agent_operator_install)
@@ -2978,9 +2983,10 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
+    - name: gitops-cluster-configs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-cos.yaml
 # --------------------------------------------------------------------------------
@@ -3086,7 +3092,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3234,7 +3240,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3363,7 +3369,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3654,7 +3660,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3752,7 +3758,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3879,7 +3885,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3977,7 +3983,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -4069,7 +4075,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4154,7 +4160,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4239,7 +4245,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4358,7 +4364,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4463,7 +4469,7 @@ spec:
         - -c
       name: gitops-deprovision-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4551,10 +4557,95 @@ spec:
         - -c
       name: gitops-deprovision-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-customer-subscription.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-customer-subscription
+spec:
+  params:
+    - name: sls_license_icn
+      type: string
+    - name: sls_license_subscription_id
+      type: string
+    - name: account
+      type: string
+    - name: secrets_path
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: git_commit_msg
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+  stepTemplate:
+    name: gitops-deprovision-customer-subscription
+    env:
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: ICN
+        value: $(params.sls_license_icn)
+      - name: SAAS_SUB_ID
+        value: $(params.sls_license_subscription_id)
+      - 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: GIT_COMMIT_MSG
+        value: $(params.git_commit_msg)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+    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 "mas_automation@email.com"
+        git config --global user.password $GITHUB_PAT
+
+        mkdir -p /tmp/deprovision-customer-subscription
+        mas gitops-deprovision-suite-license-service -a $ACCOUNT -i ${ICN} -s ${SAAS_SUB_ID} \
+        --dir /tmp/deprovision-suite-license-service \
+        --github-push \
+        --github-host $GITHUB_HOST \
+        --github-org  $GITHUB_ORG \
+        --github-repo $GITHUB_REPO \
+        --git-branch $GIT_BRANCH \
+        --secrets-path $SECRET_PATH
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-customer-subscription
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:15.6.1
+  workspaces:
+    - name: shared-entitlement
+# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-db2u-database.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -4644,7 +4735,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -4727,7 +4818,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -4844,7 +4935,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -4954,7 +5045,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5057,7 +5148,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -5114,7 +5205,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5319,7 +5410,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -5417,7 +5508,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5509,7 +5600,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5721,7 +5812,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5814,7 +5905,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5905,7 +5996,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5998,7 +6089,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -6111,7 +6202,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6238,7 +6329,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -6373,7 +6464,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6469,7 +6560,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -6591,7 +6682,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6785,7 +6876,7 @@ spec:
         - -c
       name: gitops-kmodel
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6815,7 +6906,9 @@ spec:
       type: string
     - name: country
       type: string
-    - name: icn
+    - name: sls_license_icn
+      type: string
+    - name: sls_subscription_id
       type: string
   stepTemplate:
     name: gitops-license-generator
@@ -6838,7 +6931,9 @@ spec:
       - name: COUNTRY
         value: $(params.country)
       - name: ICN
-        value: $(params.icn)
+        value: $(params.sls_license_icn)
+      - name: SAAS_SUB_ID
+        value: $(params.sls_subscription_id)
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -6848,13 +6943,24 @@ spec:
   steps:
     - args:
       - |-
-        ansible-playbook ibm.mas_saas.generate_saas_license_file || exit 1
-
-        mas gitops-license \
-          -a $ACCOUNT \
-          -c $CLUSTER_NAME \
-          -m $MAS_INSTANCE_ID \
-          --license-file /tmp/authorized_entitlement_saas.lic
+        if [[ -z "${MAS_INSTANCE_ID}" ]]; then
+          MAS_INSTANCE_ID=${SAAS_SUB_ID}
+          ansible-playbook ibm.mas_saas.generate_saas_license_file || exit 1
+          mas gitops-license \
+            -a ${ACCOUNT} \
+            -i ${ICN} \
+            -s ${SAAS_SUB_ID} \
+            --license-file /tmp/authorized_entitlement_saas.lic
+          exit $?
+        else
+          ansible-playbook ibm.mas_saas.generate_saas_license_file || exit 1
+          mas gitops-license \
+            -a ${ACCOUNT} \
+            -c ${CLUSTER_NAME} \
+            -m ${MAS_INSTANCE_ID} \
+            --license-file /tmp/authorized_entitlement_saas.lic
+          exit $?
+        fi
 
         exit $?
       command:
@@ -6881,6 +6987,11 @@ spec:
       type: string
     - name: avp_aws_secret_region
       type: string
+    
+    - name: sls_license_icn
+      type: string
+    - name: sls_subscription_id
+      type: string
   stepTemplate:
     name: gitops-license
     env:
@@ -6892,6 +7003,10 @@ spec:
         value: $(params.mas_instance_id)
       - name: SM_AWS_REGION
         value: $(params.avp_aws_secret_region)
+      - name: ICN
+        value: $(params.sls_license_icn)
+      - name: SAAS_SUB_ID
+        value: $(params.sls_subscription_id)
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -6902,16 +7017,22 @@ spec:
     - args:
       - |-
 
-        mas gitops-license -a $ACCOUNT -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
-        --license-file /workspace/shared-entitlement/entitlement.lic
+        if [[ -z "${MAS_INSTANCE_ID}" ]]; then
+          mas gitops-license -a $ACCOUNT -i $ICN -s $SAAS_SUB_ID \
+          --license-file /workspace/shared-entitlement/entitlement.lic
+          exit $?
+        else
+          mas gitops-license -a $ACCOUNT -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
+          --license-file /workspace/shared-entitlement/entitlement.lic
+          exit $?
+        fi
 
-        exit $?
       command:
         - /bin/sh
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: shared-entitlement
 
@@ -7635,7 +7756,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8135,7 +8256,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8191,6 +8312,8 @@ spec:
       type: string
     - name: service_port
       type: string
+    - name: csb_ca_certificate_file
+      type: string
 
   stepTemplate:
     name: gitops-mas-provisioner
@@ -8239,6 +8362,8 @@ spec:
         value: $(params.async_poll_interval)
       - name: ASYNC_POLL_MAX
         value: $(params.async_poll_max)
+      - name: CSB_CA_CERTIFICATE_FILE
+        value: $(params.csb_ca_certificate_file)
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -8268,9 +8393,10 @@ spec:
         - -c
       name: gitops-mas-provisioner
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
+    - name: gitops-cluster-configs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-mongo.yaml
 # --------------------------------------------------------------------------------
@@ -8376,7 +8502,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -8502,7 +8628,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8623,7 +8749,7 @@ spec:
         - -c
       name: gitops-odh
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8741,7 +8867,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8797,10 +8923,140 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-sls.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-sls
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_url
+      type: string
+    - name: mas_instance_id
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: sls_license_icn
+      type: string
+    - name: sls_subscription_id
+      type: string
+    - name: sls_install_plan
+      type: string
+    - name: sls_channel
+      type: string
+    - name: ocp_cluster_domain
+      type: string
+    - name: secrets_path
+      type: string
+    - name: mongo_provider
+      type: string
+    - name: icr_cp
+      type: string
+    - name: icr_cp_open
+      type: string
+
+    - name: github_push
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: git_commit_msg
+      type: string
+    - name: github_ssh
+      type: string
+
+  stepTemplate:
+    name: gitops-sls
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: ICN
+        value: $(params.sls_license_icn)
+      - name: SAAS_SUB_ID
+        value: $(params.sls_subscription_id)
+      - name: MONGODB_PROVIDER
+        value: $(params.mongo_provider)
+      - name: SLS_CHANNEL
+        value: $(params.sls_channel)
+      - name: SLS_INSTALL_PLAN
+        value: $(params.sls_install_plan)
+      - name: SLS_DOMAIN
+        value: $(params.ocp_cluster_domain)
+      - name: SECRETS_PATH
+        value: $(params.secrets_path)
+      - name: ICR_CP
+        value: $(params.icr_cp)
+      - name: ICR_CP_OPEN
+        value: $(params.icr_cp_open)
+
+      - name: GITHUB_PUSH
+        value: $(params.github_push)
+      - 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: GIT_SSH
+        value: $(params.github_ssh)
+
+    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
+
+        WORKING_DIR=/tmp
+
+        mas gitops-suite-license-service -d $WORKING_DIR -a $ACCOUNT -c $CLUSTER_NAME --ibm-customer-number ${ICN} --subscription-id ${SAAS_SUB_ID} \
+        --secrets-path "${SECRETS_PATH}" --domain ${SLS_DOMAIN} --sls-channel ${SLS_CHANNEL} --sls-install-plan ${SLS_INSTALL_PLAN}  --cluster-url ${CLUSTER_URL}
+        
+        sleep 3000
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-sls
+      imagePullPolicy: Always
+      image: quay.io/ibmmas/cli:15.6.1
+  workspaces:
+    - name: shared-entitlement
+
+# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-suite-app-config.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -8979,7 +9235,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9137,7 +9393,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9243,7 +9499,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: certificates
@@ -9418,7 +9674,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -9518,7 +9774,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 
@@ -9642,7 +9898,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -9743,7 +9999,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10165,7 +10421,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10285,7 +10541,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10387,7 +10643,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -10725,7 +10981,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10775,7 +11031,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10909,7 +11165,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -11151,7 +11407,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11619,7 +11875,7 @@ spec:
       description: Extracted component names as a JSON array
   steps:
     - name: extract
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       script: |
         #!/bin/sh
         echo "Hello.. Start extraction for $(params.mas_appws_components)"
@@ -11972,7 +12228,7 @@ spec:
           echo "No IBM COS instance to delete"
         fi
         exit 0
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       env:
@@ -12072,7 +12328,7 @@ spec:
           echo "No EventStreams instance to delete"
         fi
         exit 0
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       env:
@@ -12173,7 +12429,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_deprovision
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -12273,7 +12529,7 @@ spec:
       command:
         - python3
         - /opt/app-root/src/finalizer.py
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -13977,7 +14233,7 @@ spec:
       command:
         - python3
         - /opt/app-root/src/mobilever.py
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       onError: continue
 
@@ -14340,7 +14596,7 @@ spec:
 
   steps:
     - name: post-update-verify
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -14396,7 +14652,7 @@ spec:
 
   steps:
     - name: create-offline-upgrade-cron
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -14452,7 +14708,7 @@ spec:
 
   steps:
     - name: create-offline-upgrade-cron
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -14886,7 +15142,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -14946,7 +15202,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -15019,7 +15275,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -15065,7 +15321,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15162,7 +15418,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = just over 4 hours
       command:
@@ -15206,7 +15462,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15359,7 +15615,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -15408,7 +15664,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15458,7 +15714,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15537,7 +15793,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 15 retries at 5 minute intervals = just over 1 hour
       command:
@@ -15582,7 +15838,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15710,7 +15966,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -15754,7 +16010,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15907,7 +16163,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -15954,7 +16210,7 @@ spec:
 
   steps:
     - name: start-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16046,7 +16302,7 @@ spec:
               optional: false
 
     - name: wait-for-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16093,7 +16349,7 @@ spec:
 
   steps:
     - name: start-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16176,7 +16432,7 @@ spec:
               optional: false
 
     - name: wait-for-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16224,7 +16480,7 @@ spec:
 
   steps:
     - name: start-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16304,7 +16560,7 @@ spec:
               optional: false
 
     - name: wait-for-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16330,7 +16586,7 @@ spec:
           value: "True"
 
     - name: start-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16429,7 +16685,7 @@ spec:
               optional: false
 
     - name: wait-for-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16472,7 +16728,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16563,7 +16819,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -16607,7 +16863,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16698,7 +16954,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -16742,7 +16998,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16821,7 +17077,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -16865,7 +17121,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16950,7 +17206,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 15 retries at 5 minute intervals = just over 1 hour
       command:
@@ -16994,7 +17250,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17090,7 +17346,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 10 retries at 5 minute intervals = 50 min
       command:
@@ -17138,7 +17394,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17242,7 +17498,7 @@ spec:
               optional: false
         
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 10 retries at 5 minute intervals = 50 min
       command:
@@ -17286,7 +17542,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17365,7 +17621,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -17409,7 +17665,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17514,7 +17770,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -17642,7 +17898,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - minio
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -17820,7 +18076,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -17863,7 +18119,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -17980,7 +18236,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -18016,7 +18272,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18058,7 +18314,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18100,7 +18356,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18142,7 +18398,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18184,7 +18440,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18310,7 +18566,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -18378,7 +18634,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -18507,7 +18763,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice_odh
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -18683,7 +18939,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -19143,12 +19399,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       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:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -19343,7 +19599,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -19432,7 +19688,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -19495,7 +19751,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -19570,7 +19826,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -19671,7 +19927,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -19814,7 +20070,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -19881,7 +20137,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -20213,7 +20469,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_facilities
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
     
@@ -20285,7 +20541,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -20480,7 +20736,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -20729,7 +20985,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -20817,7 +21073,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -20882,7 +21138,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -20952,7 +21208,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -21014,12 +21270,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       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:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -21142,7 +21398,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -21223,7 +21479,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -21286,7 +21542,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -21372,7 +21628,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -21419,7 +21675,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -21500,7 +21756,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -21560,7 +21816,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:15.5.0
+      image: quay.io/ibmmas/cli:15.6.1
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -24483,6 +24739,73 @@ spec:
           workspace: configs
       
 # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/deprovision-suite-license-service.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-deprovision-suite-license-service
+spec:
+  description: MAS deprovision Suite License Service for customer subscription
+  workspaces:
+    - name: shared-entitlement
+  params:
+
+    - name: sls_license_icn
+      type: string
+    - name: sls_license_subscription_id
+      type: string
+    - 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: github_user
+      type: string
+    - name: git_commit_msg
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+
+  tasks:
+    - name: gitops-deprovision-customer-subscription
+      params:
+        - name: sls_license_icn
+          value: $(params.sls_license_icn)
+        - name: sls_license_subscription_id
+          value: $(params.sls_license_subscription_id)
+        - name: account
+          value: $(params.account)
+        - 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: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-customer-subscription
+      workspaces:
+        - name: shared-entitlement
+          workspace: shared-entitlement
+# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-aibroker-tenant.yaml
 # --------------------------------------------------------------------------------
 apiVersion: tekton.dev/v1beta1
@@ -30190,6 +30513,7 @@ spec:
   description: MAS Cluster scope
   workspaces:
     - name: configs
+    - name: gitops-cluster-configs
   params:
     - name: cluster_name
       type: string
@@ -30371,6 +30695,9 @@ spec:
     - name: cluster_logging_operator_syslog_forwarder_version
       type: string
       default: "1.8-amd64"
+    - name: cluster_logging_operator_dlc_ca_bundle_file
+      type: string
+      default: ""
 
     - name: instana_agent_operator_install
       type: string
@@ -30424,6 +30751,9 @@ spec:
     - name: provisioner_async_poll_max
       type: string
       default: ''
+    - name: provisioner_csb_ca_certificate_file
+      type: string
+      default: ''
 
   tasks:
     - name: gitops-cluster
@@ -30529,6 +30859,8 @@ spec:
           value: $(params.cluster_logging_operator_setup_log_forwarding)
         - name: cluster_logging_operator_syslog_forwarder_version
           value: $(params.cluster_logging_operator_syslog_forwarder_version)
+        - name: cluster_logging_operator_dlc_ca_bundle_file
+          value: $(params.cluster_logging_operator_dlc_ca_bundle_file)
         
         - name: instana_agent_operator_install
           value: $(params.instana_agent_operator_install)
@@ -30547,6 +30879,8 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+        - name: gitops-cluster-configs
+          workspace: gitops-cluster-configs
 
     - name: gitops-dro
       runAfter:
@@ -30725,12 +31059,16 @@ spec:
           value: $(params.provisioner_enable_ocm_alert)
         - name: enable_pd_alert
           value: $(params.provisioner_enable_pd_alert)
+        - name: csb_ca_certificate_file
+          value: $(params.provisioner_csb_ca_certificate_file)
       taskRef:
         kind: Task
         name: gitops-mas-provisioner
       workspaces:
         - name: configs
           workspace: configs
+        - name: gitops-cluster-configs
+          workspace: gitops-cluster-configs
       when:
         - input: "$(params.provisioner_status_repo_url)"
           operator: notin
@@ -32911,6 +33249,243 @@ spec:
           workspace: configs
 
 # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-suite-license-service.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-suite-license-service
+spec:
+  workspaces:
+    - name: shared-entitlement
+  description: MAS provision Suite License Service for customer subscription
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    # 1. Gitops git Parameters
+    # -------------------------------------------------------------------------
+    # Gitops Git Parameters
+    # ------------------------------------------------------------------------- 
+    - name: github_push
+      type: string
+      default: "False"
+      description: Whether to push changes to github or not. True or False
+    - name: git_branch
+      type: string
+      description: The git branch to push too
+      default: ""
+    - name: github_org
+      type: string
+      description: The git org to push too
+      default: ""
+    - name: github_repo
+      type: string
+      description: The git repo to push too
+      default: ""
+    - name: github_host
+      type: string
+      description: The git host to push too
+      default: ""
+    - name: github_pat
+      type: string
+      description: The git personal access token to use on the commit
+      default: ""
+    - name: git_commit_msg
+      type: string
+      description: The git commit message to use in the push
+      default: ""
+    - name: github_url
+      type: string
+    - name: github_ssh
+      type: string
+      default: ""
+
+    - name: mas_instance_id
+      type: string
+      default: ""
+
+    - name: mongo_provider
+      type: string
+      default: aws
+    - name: sls_channel
+      type: string
+
+    - name: sls_install_plan
+      type: string
+      default: "Automatic"
+
+    - name: docdb_user_action
+      type: string
+      default: add
+
+    - name: icr_cp
+      type: string
+    - name: icr_cp_open
+      type: string
+
+    - name: ocp_cluster_domain
+      type: string
+      default: ""
+
+    - name: cluster_url
+      type: string
+      default: ""
+
+    - name: mas_slscfg_pod_template_yaml
+      type: string
+      default: ""
+
+    # gitops-license-generator parameters
+    # ------------------------------------------------------------------------- 
+    - name: sls_license_expiry_date
+      type: string
+    - name: sls_license_app_points
+      type: string
+    - name: sls_license_customer_name
+      type: string
+    - name: sls_license_country
+      type: string
+    - name: sls_license_icn
+      type: string
+      default: ""
+    - name: sls_subscription_id
+      type: string
+      default: ""
+
+  tasks:
+
+    # 1. License Entitlement
+    # -------------------------------------------------------------------------
+    - name: gitops-license
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        
+        - name: sls_license_icn
+          value: $(params.sls_license_icn)
+        - name: sls_subscription_id
+          value: $(params.sls_subscription_id)
+        
+      workspaces:
+        - name: shared-entitlement
+          workspace: shared-entitlement
+      taskRef:
+        kind: Task
+        name: gitops-license
+      when:
+        - input: "$(params.sls_subscription_id)"
+          operator: in
+          values: [""]
+
+    - name: gitops-license-generator
+      runAfter:
+        - gitops-license
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+
+        - name: expiry_date
+          value: $(params.sls_license_expiry_date)
+        - name: app_points
+          value: $(params.sls_license_app_points)
+        - name: customer_name
+          value: $(params.sls_license_customer_name)
+        - name: country
+          value: $(params.sls_license_country)
+        - name: sls_license_icn
+          value: $(params.sls_license_icn)
+        - name: sls_subscription_id
+          value: $(params.sls_subscription_id)
+      taskRef:
+        kind: Task
+        name: gitops-license-generator
+      when:
+        - input: "$(params.sls_subscription_id)"
+          operator: notin
+          values: [""]
+
+    # 2. 
+    # -------------------------------------------------------------------------
+    - name: gitops-sls
+      runAfter:        
+        - gitops-license-generator
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mongo_provider
+          value: $(params.mongo_provider)
+        - name: user_action
+          value: $(params.docdb_user_action)
+
+        - name: github_push
+          value: $(params.github_push)
+        - 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: github_ssh
+          value: $(params.github_ssh)
+
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+
+        - name: sls_channel
+          value: $(params.sls_channel)
+        - name: sls_install_plan
+          value: $(params.sls_install_plan)
+        - name: icr_cp
+          value: $(params.icr_cp)
+        - name: icr_cp_open
+          value: $(params.icr_cp_open)
+
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: ocp_cluster_domain
+          value: $(params.ocp_cluster_domain)
+
+        - name: sls_license_icn
+          value: $(params.sls_license_icn)
+        - name: sls_subscription_id
+          value: $(params.sls_subscription_id)
+
+      taskRef:
+        kind: Task
+        name: gitops-sls
+      workspaces:
+        - name: shared-entitlement
+          workspace: shared-entitlement
+# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/mas-fvt-assist.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -33366,6 +33941,37 @@ spec:
         - input: "$(params.ivt_digest_core)"
           operator: notin
           values: [""]
+    
+    - name: kyverno-dependencies
+      timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-ivt-core
+      workspaces:
+        - name: configs
+          workspace: shared-configs
+      params:
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_workspace_id
+          value: $(params.mas_workspace_id)
+        - name: fvt_image_registry
+          value: $(params.fvt_image_registry)
+        - name: fvt_image_digest
+          value: $(params.ivt_digest_core)
+
+        - name: product_id
+          value: ibm-mas
+        - name: product_channel
+          value: $(params.mas_channel)
+        - name: fvt_test_suite
+          value: kyverno-dependencies
+      when:
+        - input: "$(params.ivt_digest_core)"
+          operator: notin
+          values: [""]
+      runAfter:
+        - kyverno
 
     # Core FVT 1.0 coreidp-auth ~20m - Refresh token and authentication patterns
     # We are running this test first since it happens to set the Suite accessTokenTimeout from the default of 30m to 12h
@@ -33396,7 +34002,7 @@ spec:
         - name: fvt_test_suite
           value: coreidp-auth
       runAfter:
-        - kyverno
+        - kyverno-dependencies
 
     - name: imagescan
       timeout: "0"