mas-cli 11.4.0__py3-none-any.whl → 11.5.0__py3-none-any.whl

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

@@ -108,7 +108,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -226,7 +226,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -296,7 +296,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -362,7 +362,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -483,7 +483,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -603,7 +603,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -720,7 +720,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -826,7 +826,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1148,7 +1148,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1258,7 +1258,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1347,7 +1347,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1451,7 +1451,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1533,7 +1533,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1730,7 +1730,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1825,7 +1825,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1973,7 +1973,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2102,7 +2102,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2354,7 +2354,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2452,7 +2452,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2579,7 +2579,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2677,7 +2677,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -2769,7 +2769,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2854,7 +2854,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2939,7 +2939,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3050,7 +3050,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3138,7 +3138,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -3221,7 +3221,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -3297,7 +3297,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -3367,10 +3367,11 @@ spec:
         aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
         aws configure set default.region $(params.avp_aws_secret_region)
 
-        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.[].Value')
+        # Note the - after cluster name. this is to distinguish between different similar named clusters
+        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
         if [ -z "$vpc_name" ]; then
           # Needed if there is only one cluster in account
-          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
+          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
         fi
         export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
         
@@ -3406,7 +3407,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3467,10 +3468,11 @@ spec:
         aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
         aws configure set default.region $(params.avp_aws_secret_region)
 
-        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.[].Value')
+        # Note the - after cluster name. this is to distinguish between different similar named clusters
+        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
         if [ -z "$vpc_name" ]; then
           # Needed if there is only one cluster in account
-          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
+          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
         fi
         export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
         
@@ -3508,7 +3510,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -3565,7 +3567,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3770,7 +3772,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -3868,7 +3870,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3960,7 +3962,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4052,7 +4054,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4145,7 +4147,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4236,7 +4238,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4329,7 +4331,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -4442,7 +4444,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4524,7 +4526,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -4659,7 +4661,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -4755,7 +4757,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -4837,10 +4839,11 @@ spec:
         aws configure set aws_secret_access_key $(params.avp_aws_secret_key)
         aws configure set default.region $(params.avp_aws_secret_region)
 
-        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.[].Value')
+        # Note the - after cluster name. this is to distinguish between different similar named clusters
+        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
         if [ -z "$vpc_name" ]; then
           # Needed if there is only one cluster in account
-          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
+          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
         fi
         export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
         
@@ -4876,7 +4879,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4927,7 +4930,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: shared-entitlement
 
@@ -4971,6 +4974,8 @@ spec:
       type: string
     - name: fvt_version_ctf
       type: string
+    - name: fvt_version_predict
+      type: string
     - name: fvt_version_assist
       type: string
     - name: fvt_version_iot
@@ -5148,6 +5153,8 @@ spec:
         value: $(params.ivt_version_core)
       - name: FVT_VERSION_CTF
         value: $(params.fvt_version_ctf)
+      - name: FVT_VERSION_PREDICT
+        value: $(params.fvt_version_predict)
       - name: FVT_VERSION_ASSIST
         value: $(params.fvt_version_assist)
       - name: FVT_VERSION_IOT
@@ -5426,7 +5433,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -5466,6 +5473,8 @@ spec:
       type: string
     - name: mas_operationalmode
       type: string
+    - name: mas_instance_id
+      type: string
     - name: mas_app_channel_assist
       type: string
     - name: mas_app_install_plan_assist
@@ -5567,6 +5576,8 @@ spec:
         value: $(params.mas_channel)
       - name: MAS_OPERATIONALMODE
         value: $(params.mas_operationalmode)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
       - name: MAS_APP_CHANNEL_ASSIST
         value: $(params.mas_app_channel_assist)
       - name: MAS_APP_INSTALL_PLAN_ASSIST
@@ -5682,17 +5693,16 @@ spec:
 
           git clone https://git:$GITHUB_PAT@$GITHUB_HOST/$SOURCE_GITHUB_ORG/devops-configs.git -b master || exit
 
-          # Assume fvtsaas mas_instance here
-          mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/manual-certs
+          mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
 
-          # Copy manual certs of fvtsaas mas_instance 
-          cp -r $TARGET_LOCAL_DIR/manual-certs/devops-configs/certs/fvtsaas/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/manual-certs
+          # Copy manual certs of mas_instance 
+          cp -r $TARGET_LOCAL_DIR/manual-certs/devops-configs/certs/$MAS_INSTANCE_ID/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
 
           # Invoke create-aggregate-manual-certs.sh to generate combined_manual_certs.yaml
 
           chmod +x $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh
 
-          $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh  $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/manual-certs
+          $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh  $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
 
           # Remove manual-certs folder
           rm -rf $TARGET_LOCAL_DIR/manual-certs
@@ -5701,40 +5711,40 @@ spec:
         cd $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO
 
         if [[ "${MANUAL_CERTS_CONTROL_FLAG}" != "true" ]]; then
-          yq -i 'del(.dns.manual_certs)' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+          yq -i 'del(.dns.manual_certs)' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
           echo "gitops-mas-initiator: removed .dns.manual_certs node"
         fi
 
-        # Update the domain name in the mas-instance-params.yaml. Assume fvtsaas here
+        # Update the domain name in the mas-instance-params.yaml.
         export ROSA_CONFIG=/workspace/configs/tmp-rosa/rosa-$(params.cluster_name)-details.yaml
         export OCP_SERVER=$(cat $ROSA_CONFIG | yq '.data.api_url')
         export DOMAIN=$(echo -n $OCP_SERVER | sed -n -e 's/^.*api.//p' | cut -d: -f1)
-        export MASDOMAIN=fvtsaas.apps.$DOMAIN
+        export MASDOMAIN=$MAS_INSTANCE_ID.apps.$DOMAIN
         export APPSDOMAIN=apps.$DOMAIN
 
-        yq -i '.mas_instance.domain = env(MASDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+        yq -i '.mas_instance.domain = env(MASDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
 
-        # Update the ocp server url & ingress domain url in the cluster-params.yaml. Assume fvtsaas here
+        # Update the ocp server url & ingress domain url in the cluster-params.yaml.
         yq -i '.cluster.url = env(OCP_SERVER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
         yq -i '.cluster.domain = env(APPSDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
 
-        # Update the channel in the mas-instance-params.yaml. Assume fvtsaas here
-        yq -i '.mas_instance.channel = env(MAS_CHANNEL)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+        # Update the channel in the mas-instance-params.yaml. 
+        yq -i '.mas_instance.channel = env(MAS_CHANNEL)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
 
-        # Update the operationalmode in the mas-instance-params.yaml. Assume fvtsaas here
-        yq -i '.mas_instance.annotations."mas.ibm.com/operationalMode" = env(MAS_OPERATIONALMODE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+        # Update the operationalmode in the mas-instance-params.yaml.
+        yq -i '.mas_instance.annotations."mas.ibm.com/operationalMode" = env(MAS_OPERATIONALMODE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
 
         # Remove dns node when DNS_PROVIDER_CONTROL_IDEN is not set
         if [ "${DNS_PROVIDER_CONTROL_IDEN}" == "" ]; then
-          yq -i 'del(.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+          yq -i 'del(.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
           yq -i 'del(.cluster.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
-          echo "gitops-mas-initiator: removed .dns / .cluster.dns node from gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml & gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml"
+          echo "gitops-mas-initiator: removed .dns / .cluster.dns node from gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml & gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml"
         fi
 
         # Deploy fvtsaas with CIS as DNS provider and Manual_certs=True on Mon, Tue, Wed, Thu, Fri
         # Deploy fvtsaas with CIS as DNS provider and Manual_certs=False on Sun
 
-        yq -i '.mas_instance.manual_cert_mgmt = env(MANUAL_CERTS_CONTROL_FLAG)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-instance-params.yaml
+        yq -i '.mas_instance.manual_cert_mgmt = env(MANUAL_CERTS_CONTROL_FLAG)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
         echo "gitops-mas-initiator: .mas_instance.manual_cert_mgmt set to $MANUAL_CERTS_CONTROL_FLAG"
 
         if [[ "${DNS_PROVIDER_CONTROL_IDEN}" == "cis" ]]; then
@@ -5743,13 +5753,13 @@ spec:
         fi
 
         #customizationList customizationArchive credentials
-        if [ -f "gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/appws_spec_manage.yaml" ]; then
+        if [ -f "gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/appws_spec_manage.yaml" ]; then
 
-          MAS_APPWS_SPEC_YAML=gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/appws_spec_manage.yaml
+          MAS_APPWS_SPEC_YAML=gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/appws_spec_manage.yaml
           secret_names=$(yq eval '.mas_appws_spec.settings.customizationList | to_entries | .[].value.customizationArchiveCredentials.secretName' ${MAS_APPWS_SPEC_YAML})
           for customization_archive_secret_name in ${secret_names[@]}; do
 
-            export CUSTOMIZATION_ARCHIVE_SECRET=${ACCOUNT}${SECRETS_KEY_SEPERATOR}${CLUSTER_NAME}${SECRETS_KEY_SEPERATOR}fvtsaas${SECRETS_KEY_SEPERATOR}
+            export CUSTOMIZATION_ARCHIVE_SECRET=${ACCOUNT}${SECRETS_KEY_SEPERATOR}${CLUSTER_NAME}${SECRETS_KEY_SEPERATOR}$MAS_INSTANCE_ID${SECRETS_KEY_SEPERATOR}
             export CUSTOMIZATION_ARCHIVE_SECRET_NAME=${CUSTOMIZATION_ARCHIVE_SECRET}${customization_archive_secret_name}
             echo "gitops-mas-initiator: creating AWS SM with name :: ${CUSTOMIZATION_ARCHIVE_SECRET_NAME}"
 
@@ -5776,40 +5786,40 @@ spec:
           done
 
         fi
-        # Update the app channels in the mas-apps-params.yaml. Assume fvtsaas here
+        # Update the app channels in the mas-apps-params.yaml.
         if [ -n $MAS_APP_CHANNEL_ASSIST ]; then
-          yq -i '(. | select(has("assist")) |  .assist.app_channel) = env(MAS_APP_CHANNEL_ASSIST)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("assist")) |  .assist.app_channel) = env(MAS_APP_CHANNEL_ASSIST)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
           # Assist not supported in v8 due to no CP4D WD support
           if [[ "$MAS_APP_CHANNEL_ASSIST" =~ ^8\. ]]; then
-            yq -i 'del(.assist)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+            yq -i 'del(.assist)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
             echo "gitops-mas-initiator: removed .assist node"
-            yq -i '.launchfvt.assist = false' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-fvt-params.yaml
+            yq -i '.launchfvt.assist = false' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
             echo "gitops-mas-initiator: set .launchfvt.assist to false"
           fi
         fi
         if [ -n $MAS_APP_CHANNEL_IOT ]; then
-          yq -i '(. | select(has("iot")) |  .iot.app_channel) = env(MAS_APP_CHANNEL_IOT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("iot")) |  .iot.app_channel) = env(MAS_APP_CHANNEL_IOT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
         if [ -n $MAS_APP_CHANNEL_MANAGE ]; then
-          yq -i '(. | select(has("manage")) |  .manage.app_channel) = env(MAS_APP_CHANNEL_MANAGE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("manage")) |  .manage.app_channel) = env(MAS_APP_CHANNEL_MANAGE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
         if [ -n $MAS_APP_CHANNEL_MONITOR ]; then
-          yq -i '(. | select(has("monitor")) |  .monitor.app_channel) = env(MAS_APP_CHANNEL_MONITOR)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("monitor")) |  .monitor.app_channel) = env(MAS_APP_CHANNEL_MONITOR)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
         if [ -n $MAS_APP_CHANNEL_OPTIMIZER ]; then
-          yq -i '(. | select(has("optimizer")) |  .optimizer.app_channel) = env(MAS_APP_CHANNEL_OPTIMIZER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("optimizer")) |  .optimizer.app_channel) = env(MAS_APP_CHANNEL_OPTIMIZER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
         if [ -n $MAS_APP_CHANNEL_PREDICT ]; then
-          yq -i '(. | select(has("predict")) |  .predict.app_channel) = env(MAS_APP_CHANNEL_PREDICT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("predict")) |  .predict.app_channel) = env(MAS_APP_CHANNEL_PREDICT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
         if [ -n $MAS_APP_CHANNEL_VISUALINSPECTION ]; then
-          yq -i '(. | select(has("visualinspection")) |  .visualinspection.app_channel) = env(MAS_APP_CHANNEL_VISUALINSPECTION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-apps-params.yaml
+          yq -i '(. | select(has("visualinspection")) |  .visualinspection.app_channel) = env(MAS_APP_CHANNEL_VISUALINSPECTION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
 
         # Update the cli_version and ansible_fvt ansible version if mas_fvt_params exists
-        if [ -f gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-fvt-params.yaml ]; then
-          yq -i '.fvt.cli_version = env(CLI_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-fvt-params.yaml
-          yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/mas-fvt-params.yaml
+        if [ -f gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml ]; then
+          yq -i '.fvt.cli_version = env(CLI_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
+          yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
         fi
 
         echo "git: Adding all files in $TARGET_LOCAL_DIR working directory"
@@ -5865,7 +5875,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5931,10 +5941,11 @@ spec:
         aws configure set aws_secret_access_key $(params.avp_aws_secret_key)
         aws configure set default.region $(params.avp_aws_secret_region)
 
-        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.[].Value')
+        # Note the - after cluster name. this is to distinguish between different similar named clusters
+        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
         if [ -z "$vpc_name" ]; then
           # Needed if there is only one cluster in account
-          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
+          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
         fi
         export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
         
@@ -5972,7 +5983,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -6094,7 +6105,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6167,10 +6178,11 @@ spec:
         aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
         aws configure set default.region $(params.avp_aws_secret_region)
 
-        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.[].Value')
+        # Note the - after cluster name. this is to distinguish between different similar named clusters
+        vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
         if [ -z "$vpc_name" ]; then
           # Needed if there is only one cluster in account
-          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
+          vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
         fi
         export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
 
@@ -6211,7 +6223,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6267,7 +6279,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6449,7 +6461,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6607,7 +6619,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6713,7 +6725,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: certificates
@@ -6873,7 +6885,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6973,7 +6985,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -7097,7 +7109,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7198,7 +7210,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7325,15 +7337,7 @@ spec:
         --config-action upsert \
         --mas-config-scope system \
         --mas-config-type smtp \
-        --dir /tmp/init-suite-smtp-config \
-        --smtp-host "$SMTP_HOST" \
-        --smtp-port "$SMTP_PORT" \
-        --smtp-security "$SMTP_SECURITY" \
-        --smtp-authentication "$SMTP_AUTHENTICATION" \
-        --smtp-default-sender-email "$SMTP_DEFAULT_SENDER_EMAIL" \
-        --smtp-default-sender-name "$SMTP_DEFAULT_SENDER_NAME" \
-        --smtp-default-recipient-email "$SMTP_DEFAULT_RECIPIENT_EMAIL" \
-        --smtp-default-should-email-passwords "$SMTP_DEFAULT_SHOULD_EMAIL_PASSWORDS"
+        --dir /tmp/init-suite-smtp-config
 
         exit $?
         
@@ -7342,7 +7346,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 
@@ -7451,7 +7455,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7548,7 +7552,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7828,7 +7832,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7878,7 +7882,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8012,7 +8016,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8254,7 +8258,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8437,7 +8441,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8480,7 +8484,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -8597,7 +8601,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8633,7 +8637,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8675,7 +8679,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8717,7 +8721,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8759,7 +8763,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8801,7 +8805,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8927,7 +8931,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8995,7 +8999,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9176,7 +9180,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9551,12 +9555,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -9757,7 +9761,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -9846,7 +9850,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -9909,7 +9913,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -9984,7 +9988,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -10085,7 +10089,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -10228,7 +10232,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -10295,7 +10299,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10366,7 +10370,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -10556,7 +10560,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -10805,7 +10809,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10893,7 +10897,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -10958,7 +10962,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -11028,7 +11032,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -11090,12 +11094,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11224,7 +11228,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -11305,7 +11309,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11368,7 +11372,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11454,7 +11458,7 @@ spec:
 
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -11516,7 +11520,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -11580,7 +11584,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:11.4.0
+      image: quay.io/ibmmas/cli:11.5.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -17061,6 +17065,249 @@ spec:
           operator: in
           values: ["provision"]
 # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-deps.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-mas-deps
+spec:
+  description: MAS Cluster off-cluster dependencies
+  workspaces:
+    - name: configs
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: mas_instance_id
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: avp_aws_secret_key
+      type: string
+    - name: avp_aws_access_key
+      type: string
+    - name: github_pat
+      type: string
+
+    - name: vpc_ipv4_cidr
+      type: string
+    - name: mongo_provider
+      type: string
+      default: aws
+    - name: aws_docdb_instance_number
+      type: string
+      default: 3
+    - name: aws_docdb_engine_version
+      type: string
+      default: 4.0.0
+
+    - name: kafka_provider
+      type: string
+      default: aws
+    - name: kafka_version
+      type: string
+      default: 3.3.1
+    - name: kafka_action
+      type: string
+    - name: kafkacfg_file_name
+      type: string
+      default: ""
+    - name: aws_msk_instance_type
+      type: string
+      default: ""
+
+    - name: efs_action
+      type: string
+      description: efs action to be performed (provision or deprovision)
+      default: ""
+    - name: cloud_provider
+      type: string
+      default: aws
+      
+    - name: cos_type
+      type: string
+      description: COS Provider (ibm or ocs)
+      default: ""
+    - name: ibmcloud_resourcegroup
+      type: string
+      description: Name of an existing COS Resource Group in IBM Cloud account
+      default: ""
+    - name: cos_action
+      type: string
+      description: COS action to be performed (provision or deprovision)
+      default: ""
+    - name: cos_use_hmac
+      type: string
+      description: Optional boolean variable weather hmac is enabled or not
+      default: ""
+
+    - name: ibmcloud_apikey
+      type: string
+      default: ""
+
+  tasks:
+    - name: gitops-mongo
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: vpc_ipv4_cidr
+          value: $(params.vpc_ipv4_cidr)
+        - name: mongo_provider
+          value: $(params.mongo_provider)
+        - name: aws_docdb_instance_number
+          value: $(params.aws_docdb_instance_number)
+        - name: aws_docdb_engine_version
+          value: $(params.aws_docdb_engine_version)
+      taskRef:
+        kind: Task
+        name: gitops-mongo
+      workspaces:
+        - name: configs
+          workspace: configs
+
+    # 2. Kafka
+    # -------------------------------------------------------------------------
+    - name: gitops-kafka
+      params:
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+
+        - 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_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+
+        - name: kafka_provider
+          value: $(params.kafka_provider)
+        - name: kafka_version
+          value: $(params.kafka_version)
+        - name: vpc_ipv4_cidr
+          value: $(params.vpc_ipv4_cidr)
+        - name: kafkacfg_file_name
+          value: $(params.kafkacfg_file_name)
+        - name: aws_msk_instance_type
+          value: $(params.aws_msk_instance_type)
+
+      workspaces:
+        - name: configs
+          workspace: configs
+      taskRef:
+        kind: Task
+        name: gitops-kafka
+      when:
+        - input: "$(params.kafka_action)"
+          operator: notin
+          values: [""]
+
+    # Install Cloud Object Storage (COS)
+    - name: gitops-cos
+      params:
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        
+        - name: github_pat
+          value: $(params.github_pat)
+
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+
+        - name: cos_action
+          value: $(params.cos_action)
+        - name: cos_type
+          value: $(params.cos_type)
+        - name: ibmcloud_resourcegroup
+          value: $(params.ibmcloud_resourcegroup)
+        - name: ibmcloud_apikey
+          value: $(params.ibmcloud_apikey)
+        - name: cos_use_hmac
+          value: $(params.cos_use_hmac)
+
+      workspaces:
+        - name: configs
+          workspace: configs
+
+      taskRef:
+        kind: Task
+        name: gitops-cos
+      when:
+        - input: "$(params.cos_action)"
+          operator: notin
+          values: [""]
+        - input: "$(params.cos_action)"
+          operator: in
+          values: ["provision"]
+
+    # Install AWS Elastic File Service (EFS)
+    - name: gitops-efs
+      params:
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: cloud_provider
+          value: $(params.cloud_provider)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: efs_action
+          value: $(params.efs_action)
+
+      workspaces:
+        - name: configs
+          workspace: configs
+
+      taskRef:
+        kind: Task
+        name: gitops-efs
+      when:
+        - input: "$(params.efs_action)"
+          operator: notin
+          values: [""]
+        - input: "$(params.efs_action)"
+          operator: in
+          values: ["provision"]
+# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-fvt-preparer-pipeline.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -17114,6 +17361,8 @@ spec:
       type: string
     - name: fvt_version_ctf
       type: string
+    - name: fvt_version_predict
+      type: string
     - name: fvt_version_assist
       type: string
     - name: fvt_version_iot
@@ -17266,6 +17515,8 @@ spec:
           value: $(params.ivt_version_core)
         - name: fvt_version_ctf
           value: $(params.fvt_version_ctf)
+        - name: fvt_version_predict
+          value: $(params.fvt_version_predict)
         - name: fvt_version_assist
           value: $(params.fvt_version_assist)
         - name: fvt_version_iot
@@ -17410,6 +17661,8 @@ spec:
     - name: mas_operationalmode
       type: string
       default: ""
+    - name: mas_instance_id
+      type: string
     - name: mas_app_channel_assist
       type: string
       default: ""
@@ -17525,6 +17778,190 @@ spec:
           value: $(params.mas_channel)
         - name: mas_operationalmode
           value: $(params.mas_operationalmode)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_channel_assist
+          value: $(params.mas_app_channel_assist)
+        - name: mas_app_channel_iot
+          value: $(params.mas_app_channel_iot)
+        - name: mas_app_channel_manage
+          value: $(params.mas_app_channel_manage)
+        - name: mas_app_channel_monitor
+          value: $(params.mas_app_channel_monitor)
+        - name: mas_app_channel_optimizer
+          value: $(params.mas_app_channel_optimizer)
+        - name: mas_app_channel_predict
+          value: $(params.mas_app_channel_predict)
+        - name: mas_app_channel_visualinspection
+          value: $(params.mas_app_channel_visualinspection)
+        - name: github_pat
+          value: $(params.github_pat)
+        - name: manual_certs_control_flag
+          value: $(params.manual_certs_control_flag)
+        - name: dns_provider_control_iden
+          value: $(params.dns_provider_control_iden)
+        - name: cli_version
+          value: $(params.cli_version)
+        - name: fvt_ansible_version
+          value: $(params.fvt_ansible_version)
+        - name: artifactory_username
+          value: $(params.artifactory_username)
+        - name: artifactory_token
+          value: $(params.artifactory_token)
+      taskRef:
+        kind: Task
+        name: gitops-mas-initiator
+      workspaces:
+        - name: configs
+          workspace: configs
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-initiator.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-mas-initiator
+spec:
+  description: Initials the gitops deployment of MAS
+  workspaces:
+    - name: configs
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: avp_aws_secret_key
+      type: string
+    - name: avp_aws_access_key
+      type: string
+    - name: region
+      type: string
+    - name: github_host
+      type: string
+    - name: target_git_branch
+      type: string
+    - name: target_github_org
+      type: string
+    - name: target_github_repo
+      type: string
+    - name: source_git_branch
+      type: string
+    - name: source_github_org
+      type: string
+    - name: source_github_repo
+      type: string
+    - name: source_path
+      type: string
+      default: ""
+    - name: mas_channel
+      type: string
+    - name: mas_operationalmode
+      type: string
+      default: ""
+    - name: mas_instance_id
+      type: string
+    - name: mas_app_channel_assist
+      type: string
+      default: ""
+    - name: mas_app_channel_iot
+      type: string
+      default: ""
+    - name: mas_app_channel_manage
+      type: string
+      default: ""
+    - name: mas_app_channel_monitor
+      type: string
+      default: ""
+    - name: mas_app_channel_optimizer
+      type: string
+      default: ""
+    - name: mas_app_channel_predict
+      type: string
+      default: ""
+    - name: mas_app_channel_visualinspection
+      type: string
+      default: ""
+    - name: github_pat
+      type: string
+    - name: ibmcloud_apikey
+      type: string
+      default: ""
+    - name: avp_type
+      type: string
+      default: "aws"
+    - name: secrets_key_seperator
+      type: string
+      default: "/"
+
+    - name: manual_certs_control_flag
+      type: string
+      default: ""
+    - name: dns_provider_control_iden
+      type: string
+      default: ""
+
+    - name: cli_version
+      type: string
+      default: ""
+    - name: fvt_ansible_version
+      type: string
+      default: ""
+    - name: artifactory_username
+      type: string
+      default: ""
+    - name: artifactory_token
+      type: string
+      default: ""
+  tasks:
+    - name: gitops-mas-initiator
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: region
+          value: $(params.region)
+        - name: github_host
+          value: $(params.github_host)
+        - name: target_git_branch
+          value: $(params.target_git_branch)
+        - name: target_github_org
+          value: $(params.target_github_org)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: ibmcloud_apikey
+          value: $(params.ibmcloud_apikey)
+        - name: avp_type
+          value: $(params.avp_type)
+        - name: secrets_key_seperator
+          value: $(params.secrets_key_seperator)
+        - name: target_github_repo
+          value: $(params.target_github_repo)
+        - name: source_git_branch
+          value: $(params.source_git_branch)
+        - name: source_github_org
+          value: $(params.source_github_org)
+        - name: source_github_repo
+          value: $(params.source_github_repo)
+        - name: source_path
+          value: $(params.source_path)
+        - name: mas_channel
+          value: $(params.mas_channel)
+        - name: mas_operationalmode
+          value: $(params.mas_operationalmode)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
         - name: mas_app_channel_assist
           value: $(params.mas_app_channel_assist)
         - name: mas_app_channel_iot