mas-cli 13.15.1__py3-none-any.whl → 13.16.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.15.1"  # Python module compatible semver
+__version__ = "13.16.0"  # Python module compatible semver

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "13.15.1"
+        self.version = "13.16.0"
         self.h1count = 0
         self.h2count = 0
 

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

@@ -231,7 +231,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -460,7 +460,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -843,7 +843,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1066,7 +1066,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1498,7 +1498,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1691,7 +1691,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2078,7 +2078,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2186,7 +2186,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2334,7 +2334,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2463,7 +2463,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2754,7 +2754,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2852,7 +2852,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2979,7 +2979,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3077,7 +3077,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -3169,7 +3169,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3254,7 +3254,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3458,7 +3458,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -3634,7 +3634,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -3751,7 +3751,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -3861,7 +3861,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3964,7 +3964,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -4021,7 +4021,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4226,7 +4226,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -4324,7 +4324,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4416,7 +4416,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4628,7 +4628,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4721,7 +4721,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4812,7 +4812,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4905,7 +4905,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -5018,7 +5018,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5145,7 +5145,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -5280,7 +5280,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -5376,7 +5376,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -5498,7 +5498,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5624,7 +5624,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: shared-entitlement
 
@@ -5809,6 +5809,8 @@ spec:
   stepTemplate:
     name: gitops-mas-fvt-preparer
     env:
+      - name: TERM
+        value: xterm
       - name: CLUSTER_NAME
         value: $(params.cluster_name)
       - name: ACCOUNT_ID
@@ -5827,6 +5829,8 @@ spec:
         value: $(params.mas_instance_id)
       - name: MAS_INSTANCE_ID
         value: $(params.mas_instance_id)
+      - name: FVT_ENVIRONMENT
+        value: $(params.mas_instance_id)
       - name: PIPELINE_STORAGE_CLASS
         value: $(params.pipeline_storage_class)
       - name: AWS_REGION
@@ -5949,7 +5953,18 @@ spec:
       - |-
 
         set -o pipefail
-        trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --extra-namespaces selenium' ERR EXIT
+        trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --mas-instance-ids ${MAS_INSTANCE_ID} --extra-namespaces selenium' ERR EXIT
+
+        get_trailing_number() {
+          local input_string="$1"
+          local trailing_number=$(echo $input_string | grep -Eo '[0-9]+$')
+
+          if [[ -n "$trailing_number" ]]; then
+            echo "$trailing_number"
+          else
+            echo ""
+          fi
+        }
 
         export ARTIFACTORY_TOKEN=${FVT_ARTIFACTORY_TOKEN}
         export ARTIFACTORY_UPLOAD_DIR=${ARTIFACTORY_GENERIC_LOGS_URL}/mas-fvt/${MAS_INSTANCE_ID}/${DEVOPS_BUILD_NUMBER}
@@ -6151,8 +6166,18 @@ spec:
         echo "Sleeping for 180 seconds to give postsync job a chance to run before creating sync window"
         sleep 180
 
-        echo "argo:argocd proj windows add mas --kind deny --schedule * * * * * --duration 4h --applications *"  
-        argocd proj windows add mas --kind deny --schedule "* * * * *" --duration 4h --applications "*.$MAS_INSTANCE_ID"
+        # Get the trailing number of the MAS instanceid so we can modify the sync window duration. This is because
+        # you can't have two sync windows with the same schedule and duration even if for different apps
+        RESULT=$(get_trailing_number $MAS_INSTANCE_ID)
+        if [[ -n "$RESULT" ]]; then
+          WINDOW_DURATION=$((4 + RESULT))
+        else
+          #Set to 4 when there is no trailing number
+          WINDOW_DURATION=4
+        fi
+
+        echo "argo:argocd proj windows add mas --kind deny --schedule * * * * * --duration ${WINDOW_DURATION}h --applications *.$CLUSTER_NAME.$MAS_INSTANCE_ID.*,*.$CLUSTER_NAME.$MAS_INSTANCE_ID,$MAS_INSTANCE_ID-*"  
+        argocd proj windows add mas --kind deny --schedule "* * * * *" --duration ${WINDOW_DURATION}h --applications "*.$CLUSTER_NAME.$MAS_INSTANCE_ID.*,*.$CLUSTER_NAME.$MAS_INSTANCE_ID,$MAS_INSTANCE_ID-*" --grpc-web
 
         UNESCAPED_LDAP_CRT=$(</workspace/shared-additional-configs/ldap_masdeps1_cert.pem)
         ESCAPED_LDAP_CRT=${UNESCAPED_LDAP_CRT//\"/\\\"}
@@ -6165,9 +6190,9 @@ spec:
 
         # Remove argocd window
         argocd_login
-        ARGOWINDOW=$(argocd proj windows list mas | grep "*.$MAS_INSTANCE_ID" | cut -c1-1)
+        ARGOWINDOW=$(argocd proj windows list mas | grep "$CLUSTER_NAME.$MAS_INSTANCE_ID\b" | cut -c1-1)
         echo "argo:argocd proj windows delete mas $ARGOWINDOW"
-        argocd proj windows delete mas $ARGOWINDOW
+        argocd proj windows delete mas $ARGOWINDOW --grpc-web
 
         # Set auto_delete: true, to allow ArgoCD to automatically delete resources when the deprovision pipelines run
         if [[ "$LAUNCHER_ID" == "apps" ]]; then
@@ -6175,7 +6200,7 @@ spec:
           CLUSTER_ROOT_APP="cluster.${CLUSTER_NAME}"
           INSTANCE_ROOT_APP="instance.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
 
-          argocd app set ${ACCOUNT_ROOT_APP} --parameter auto_delete=true
+          argocd app set ${ACCOUNT_ROOT_APP} --parameter auto_delete=true --grpc-web
 
           # wait for the root apps to sync to make sure the setting has been applied everywhere
           check_argo_app_synced "${ACCOUNT_ROOT_APP}"
@@ -6188,7 +6213,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6224,6 +6249,9 @@ spec:
       type: string
     - name: source_path
       type: string
+    - name: git_commit_msg
+      type: string
+      default: "gitops-initiator deploy"
     - name: mas_channel
       type: string
     - name: mas_operationalmode
@@ -6330,6 +6358,8 @@ spec:
         value: $(params.source_github_repo)
       - name: SOURCE_PATH
         value: $(params.source_path)
+      - name: GIT_COMMIT_MSG
+        value: $(params.git_commit_msg)
       - name: MAS_CHANNEL
         value: $(params.mas_channel)
       - name: MAS_OPERATIONALMODE
@@ -6398,8 +6428,21 @@ spec:
     - args:
       - |-
 
+        source /mascli/functions/internal/utils
+
         set -e -o pipefail
 
+        process_j2_files() {
+          local source_dir="$1"
+
+          find "$source_dir" -type f -name "*.j2" | while read -r file; do
+              local output_file="${file%.j2}"
+              jinjanate_commmon "$file" > "$output_file"
+              echo "Processed: $file -> $output_file"
+              rm $file
+          done
+        }
+
         git config --global user.name "MAS Automation"
         git config --global user.email "you@example.com"
         git config --global user.password $GITHUB_PAT
@@ -6442,8 +6485,17 @@ spec:
 
         mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
 
+        set +e +o pipefail
         echo "copying $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* to $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME"
-        cp -r $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
+        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/$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/
+
+        # Process any .j2 files
+        process_j2_files "$TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID"
 
         echo "gitops-mas-initiator:: DNS_PROVIDER_CONTROL_IDEN=${DNS_PROVIDER_CONTROL_IDEN} MANUAL_CERTS_CONTROL_FLAG=${MANUAL_CERTS_CONTROL_FLAG}"
         if [[ "${MANUAL_CERTS_CONTROL_FLAG}" == "true" ]]; then
@@ -6466,6 +6518,12 @@ spec:
 
           # Remove manual-certs folder
           rm -rf $TARGET_LOCAL_DIR/manual-certs
+          
+          echo "gitops-mas-initiator: setting dns.cis.proxy enhanced_security and waf to false"
+          yq -i '.dns.cis.proxy = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
+          yq -i '.dns.cis.enhanced_security = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
+          yq -i '.dns.cis.waf = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
+
         fi
 
         cd $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO
@@ -6582,6 +6640,13 @@ spec:
           yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
         fi
 
+        if [[ ! "$GIT_COMMIT_MSG" =~ ^"[skip deploy]" ]]; then
+            # Append a new line to the file to drive the deployment at cluster level
+            echo "" >> gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
+        else
+            echo "Commit message starts with [skip deploy], no changes made."
+        fi
+      
         echo "git: Adding all files in $TARGET_LOCAL_DIR working directory"
         FILES_ADDED_OUTPUT="$(git add -v .)"
         return_code=$?
@@ -6592,10 +6657,9 @@ spec:
         export FILES_ADDED=$(echo "$FILES_ADDED_OUTPUT" | awk NF | wc -l | xargs)
         echo "git: Added ${FILES_ADDED} files"
 
-        export COMMIT_MSG="gitops-initiator deploy for $CLUSTER_NAME"
         if [ "$FILES_ADDED" != "0" ]; then
-          echo "git: Committing files using message $COMMIT_MSG"
-          git commit -m "$COMMIT_MSG" || exit 1
+          echo "git: Committing files using message $GIT_COMMIT_MSG"
+          git commit -m "$GIT_COMMIT_MSG" || exit 1
           retries=5
           interval=30
           index=0
@@ -6635,7 +6699,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6743,7 +6807,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -6869,7 +6933,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6987,7 +7051,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7043,7 +7107,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7230,7 +7294,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7388,7 +7452,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7494,7 +7558,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: certificates
@@ -7664,7 +7728,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7764,7 +7828,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -7888,7 +7952,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7989,7 +8053,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8400,7 +8464,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 
@@ -8520,7 +8584,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8622,7 +8686,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8858,6 +8922,7 @@ spec:
 
       - name: ALLOW_LIST
         value: $(params.allow_list)
+
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -8895,6 +8960,27 @@ spec:
         export CUSTOM_LABELS=$(echo "${CUSTOM_LABELS}" | yq --output-format yaml)
         echo " CUSTOM_LABELS = ${CUSTOM_LABELS}"
 
+        # Tekton interprets false (boolean) values as the string ""
+        # The gitops-suite function defaults the following flags to "true" when their value is ""
+        # We'll fix this here by setting these values to "false" explicitly before we call
+        # (these are all required parameters in the pipeline so we don't have to worry about
+        # any impliciations of changing their defaults in this task)
+        if [[ -z "${CIS_ENHANCED_SECURITY}" ]]; then
+          CIS_ENHANCED_SECURITY="false"
+        fi
+        if [[ -z "${OVERRIDE_EDGE_CERTS}" ]]; then
+          OVERRIDE_EDGE_CERTS="false"
+        fi
+        if [[ -z "${CIS_WAF}" ]]; then
+          CIS_WAF="false"
+        fi
+        if [[ -z "${UPDATE_DNS_ENTRIES}" ]]; then
+          UPDATE_DNS_ENTRIES="false"
+        fi
+        if [[ -z "${DELETE_WILDCARDS}" ]]; then
+          DELETE_WILDCARDS="false"
+        fi
+
         sed -n -e 's/^.*api.fvtsaas.//p' | cut -d: -f1
         mkdir -p /tmp/init-suite
         mas gitops-suite -a $ACCOUNT -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
@@ -8913,7 +8999,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8963,7 +9049,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9097,7 +9183,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9339,7 +9425,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9555,7 +9641,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -9733,7 +9819,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9776,7 +9862,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -9893,7 +9979,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9929,7 +10015,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9971,7 +10057,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10013,7 +10099,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10055,7 +10141,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10097,7 +10183,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10223,7 +10309,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -10291,7 +10377,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10527,7 +10613,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10703,7 +10789,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11098,12 +11184,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.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.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11298,7 +11384,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11387,7 +11473,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -11450,7 +11536,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -11525,7 +11611,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -11626,7 +11712,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -11769,7 +11855,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11836,7 +11922,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11907,7 +11993,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -12097,7 +12183,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -12346,7 +12432,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -12434,7 +12520,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -12499,7 +12585,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -12569,7 +12655,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -12636,12 +12722,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.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.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       script: |
         #!/usr/bin/env bash
@@ -12769,7 +12855,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -12850,7 +12936,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -12913,7 +12999,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -12999,7 +13085,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -13046,7 +13132,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13127,7 +13213,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13187,7 +13273,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:13.15.1
+      image: quay.io/ibmmas/cli:13.16.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -13561,12 +13647,16 @@ spec:
     - name: mongo_provider
       type: string
       default: aws
+    - name: mongodb_action
+      type: string
     - name: aws_docdb_instance_number
       type: string
       default: 3
     - name: kafka_provider
       type: string
       default: aws
+    - name: kafka_action
+      type: string
     - name: mas_instance_id
       type: string
 
@@ -13685,6 +13775,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.mongodb_action)"
+          operator: notin
+          values: [""]
 
     # Deprovision Kafka
     # -------------------------------------------------------------------------
@@ -13718,6 +13812,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.kafka_action)"
+          operator: notin
+          values: [""]
 
     # Deprovision COS
     # -------------------------------------------------------------------------
@@ -13846,12 +13944,16 @@ spec:
     - name: mongo_provider
       type: string
       default: aws
+    - name: mongodb_action
+      type: string
     - name: aws_docdb_instance_number
       type: string
       default: 3
     - name: kafka_provider
       type: string
       default: aws
+    - name: kafka_action
+      type: string
     - name: mas_instance_id
       type: string
 
@@ -13950,6 +14052,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.mongodb_action)"
+          operator: notin
+          values: [""]
 
     # Deprovision Kafka
     # -------------------------------------------------------------------------
@@ -13983,6 +14089,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.kafka_action)"
+          operator: notin
+          values: [""]
 
     # Deprovision COS
     # -------------------------------------------------------------------------
@@ -19915,6 +20025,8 @@ spec:
     - name: aws_docdb_engine_version
       type: string
       default: 4.0.0
+    - name: mongodb_action
+      type: string
 
     - name: kafka_provider
       type: string
@@ -20017,6 +20129,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.mongodb_action)"
+          operator: notin
+          values: [""]
 
     # 2. Kafka
     # -------------------------------------------------------------------------
@@ -20197,6 +20313,8 @@ spec:
     - name: aws_docdb_engine_version
       type: string
       default: 4.0.0
+    - name: mongodb_action
+      type: string
 
     - name: kafka_provider
       type: string
@@ -20279,6 +20397,10 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+      when:
+        - input: "$(params.mongodb_action)"
+          operator: notin
+          values: [""]
 
     # 2. Kafka
     # -------------------------------------------------------------------------
@@ -20774,6 +20896,8 @@ spec:
     - name: source_path
       type: string
       default: ""
+    - name: git_commit_msg
+      type: string
     - name: mas_channel
       type: string
     - name: mas_operationalmode
@@ -20892,6 +21016,8 @@ spec:
           value: $(params.source_github_repo)
         - name: source_path
           value: $(params.source_path)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
         - name: mas_channel
           value: $(params.mas_channel)
         - name: mas_operationalmode
@@ -20976,6 +21102,8 @@ spec:
     - name: source_path
       type: string
       default: ""
+    - name: git_commit_msg
+      type: string
     - name: mas_channel
       type: string
     - name: mas_operationalmode
@@ -21074,6 +21202,8 @@ spec:
           value: $(params.source_github_repo)
         - name: source_path
           value: $(params.source_path)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
         - name: mas_channel
           value: $(params.mas_channel)
         - name: mas_operationalmode

{mas_cli-13.15.1.dist-info → mas_cli-13.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 13.15.1
+Version: 13.16.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-13.15.1.dist-info → mas_cli-13.16.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-mas/cli/__init__.py,sha256=0D-kW00ik1J5ic1kSQStJp-gkryLI779Mh6zjw1I9BM,527
-mas/cli/cli.py,sha256=3mES0Cyi5EKQEZvQuAJHdMNBj3o_KltMEZh4g0bRTMg,18175
+mas/cli/__init__.py,sha256=9g6s4A7Nu9c-_4qU7kt_Zs7VAWqO8w9LPcwKijOesqE,527
+mas/cli/cli.py,sha256=wc6ZAADsbDLwt24lOjeKW-2wzRTWx_4yZag92ohZmfQ,18175
 mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
 mas/cli/gencfg.py,sha256=p38Ss_ooiNHOZTJT8l0YxDaEaPwD4ZXgxEbW-S9YLNY,3311
 mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
@@ -17,7 +17,7 @@ mas/cli/install/settings/kafkaSettings.py,sha256=r1uK-IApqB9IQiSNt_8sP0wa4FPJcXU
 mas/cli/install/settings/manageSettings.py,sha256=whoAT3B-qQjLD6SaS_9OEmmIvbSXbcI9m-wCDyu4alI,17853
 mas/cli/install/settings/mongodbSettings.py,sha256=UVt8vMLNpgyewlcymSystIhICnHsd0uoM9qpgezVjGg,2567
 mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=qQ83e-iN5446FcL36SeDla0p7LxS_DGE8hWPkycdu8U,872265
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=qVMypPiF2hH9ygpZZcRWcrU5wRE7kpZ8Qb3tXC9qZSg,877610
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/suite_mongocfg.yml.j2,sha256=WrgJUfGyvfaRIHjY5VR_zLZ5irTpV5khKNq76ejIxKU,1606
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
@@ -99,8 +99,8 @@ mas/cli/update/argParser.py,sha256=oOIXzB_rsI2p3og_5X5SFt_g7LURyEdLxZeiGCKq1nU,4
 mas/cli/upgrade/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
 mas/cli/upgrade/app.py,sha256=EuEZayc0nw9kA6Hz8M9Mv7uk0hgmspJSZCYhNEfCECk,6428
 mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
-mas_cli-13.15.1.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
-mas_cli-13.15.1.dist-info/METADATA,sha256=z3IbZxz5FYyZO6cFGu4feDd2g9A6-MgvWLJsCEzV2xU,2259
-mas_cli-13.15.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mas_cli-13.15.1.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-13.15.1.dist-info/RECORD,,
+mas_cli-13.16.0.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
+mas_cli-13.16.0.dist-info/METADATA,sha256=yBgVDvDeOg7EoJqFmvKkQ-3pcv9Y4LSHxK2Xxm0C0lc,2259
+mas_cli-13.16.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mas_cli-13.16.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-13.16.0.dist-info/RECORD,,