[patch] Revert "remove ibm_entitlement_key from Tekton param flow and…

python/src/mas/cli/aiservice/install/app.py

@@ -547,7 +547,6 @@ def install(self, argv):
                     aiserviceConfig=self.aiserviceConfigSecret,
                     slack_token=self.getParam("slack_token"),
                     slack_channel=self.getParam("slack_channel"),
-                    ibm_entitlement_key=self.getParam("ibm_entitlement_key"),
                 )
 
                 self.setupApprovals(pipelinesNamespace)

python/src/mas/cli/install/app.py

@@ -2867,7 +2867,6 @@ def install(self, argv):
                     aiserviceConfig=self.aiserviceConfigSecret,
                     slack_token=self.getParam("slack_token"),
                     slack_channel=self.getParam("slack_channel"),
-                    ibm_entitlement_key=self.getParam("ibm_entitlement_key"),
                 )
 
                 self.setupApprovals(pipelinesNamespace)

python/src/mas/cli/restore/app.py

@@ -332,12 +332,7 @@ def restore(self, argv):
                 )
 
                 # Apply config file secrets to the namespace
-                prepareRestoreSecrets(
-                    dynClient=self.dynamicClient,
-                    namespace=pipelinesNamespace,
-                    restoreConfigs=self.configSecret,
-                    ibm_entitlement_key=self.getParam("ibm_entitlement_key"),
-                )
+                prepareRestoreSecrets(dynClient=self.dynamicClient, namespace=pipelinesNamespace, restoreConfigs=self.configSecret)
 
                 h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})")
 

tekton/src/params/backup.yml.j2

@@ -194,6 +194,11 @@
   default: ""
   description: Required for DRO installation during restore
 
+- name: ibm_entitlement_key
+  type: string
+  default: ""
+  description: Required for DRO installation during restore
+
 # Restore-specific Configuration
 # -----------------------------------------------------------------------------
 - name: mas_domain_on_restore

tekton/src/params/install-common.yml.j2

@@ -9,6 +9,12 @@
   default: ""
   description: ReadWriteMany storage class
 
+# Entitlement
+# -----------------------------------------------------------------------------
+- name: ibm_entitlement_key
+  type: string
+  description: IBM Entitlement Key
+
 # Pipeline config
 # -----------------------------------------------------------------------------
 - name: skip_pre_check

tekton/src/pipelines/mas-restore.yml.j2

@@ -9,8 +9,6 @@ spec:
     - name: shared-backups
     # Configs to restore like slscfg and drocfg
     - name: restore-configurations
-    # Any pre-generated configs that contain IBM_ENTITLEMENT_KEY
-    - name: shared-additional-configs
 
   params:
     # 1. Common Parameters
@@ -299,10 +297,6 @@ spec:
       workspaces:
         - name: backups
           workspace: shared-backups
-        - name: additional-configs
-          workspace: shared-additional-configs
-        - name: configs
-          workspace: restore-configurations
       runAfter:
         - mongodb
 
@@ -331,6 +325,8 @@ spec:
           value: "$(params.dro_contact_firstname)"
         - name: dro_contact_lastname
           value: "$(params.dro_contact_lastname)"
+        - name: ibm_entitlement_key
+          value: $(params.ibm_entitlement_key)
         - name: dro_namespace
           value: $(params.dro_namespace)
         - name: dro_storage_class

tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2

@@ -10,6 +10,8 @@
     - name: artifactory_token
       value: $(params.artifactory_token)
 
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
 
     - name: custom_labels
       value: $(params.custom_labels)
@@ -103,7 +105,5 @@
   workspaces:
     - name: configs
       workspace: shared-configs
-    - name: additional-configs
-      workspace: shared-additional-configs
     - name: aiservice
       workspace: shared-aiservice-config

tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2

@@ -14,6 +14,8 @@
       value: $(params.artifactory_token)
     - name: mas_app_channel
       value: "$(params.aiservice_channel)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: minio_root_user
       value: $(params.minio_root_user)
     - name: minio_root_password
@@ -22,9 +24,6 @@
   taskRef:
     name: mas-devops-minio
     kind: Task
-  workspaces:
-    - name: configs
-      workspace: shared-additional-configs
   when:
     - input: "$(params.minio_root_user)"
       operator: notin

tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2

@@ -16,6 +16,8 @@
       value: $(params.artifactory_token)
     - name: aiservice_channel
       value: "$(params.aiservice_channel)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: aiservice_odh_model_deployment_type
@@ -26,9 +28,6 @@
   taskRef:
     name: mas-devops-aiservice-odh
     kind: Task
-  workspaces:
-    - name: configs
-      workspace: shared-additional-configs
   when:
     - input: "$(params.aiservice_channel)"
       operator: notin

tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2

@@ -16,6 +16,8 @@
       value: $(params.artifactory_token)
     - name: aiservice_channel
       value: "$(params.aiservice_channel)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: aiservice_rhoai_model_deployment_type
@@ -26,9 +28,6 @@
   taskRef:
     name: mas-devops-aiservice-rhoai
     kind: Task
-  workspaces:
-    - name: configs
-      workspace: shared-additional-configs
   when:
     - input: "$(params.aiservice_channel)"
       operator: notin

tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2

@@ -13,6 +13,8 @@
       value: $(params.artifactory_token)
     - name: mas_app_channel
       value: "$(params.mas_app_channel_assist)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2

@@ -11,6 +11,8 @@
       value: "mas-$(params.mas_instance_id)-$(params.mas_workspace_id)-facilities"
 
     # Entitlement
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
 
     # Operator Subscription
     - name: db2_channel

tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2

@@ -16,6 +16,8 @@
       value: facilities
     - name: mas_app_channel
       value: "$(params.mas_app_channel_facilities)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2

@@ -15,6 +15,8 @@
       value: iot
     - name: mas_app_channel
       value: "$(params.mas_app_channel_iot)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2

@@ -23,6 +23,8 @@
       value: $(params.artifactory_token)
     - name: mas_app_channel
       value: "$(params.mas_app_channel_manage)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2

@@ -15,6 +15,8 @@
       value: monitor
     - name: mas_app_channel
       value: "$(params.mas_app_channel_monitor)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2

@@ -17,6 +17,8 @@
       value: "$(params.mas_app_channel_optimizer)"
     - name: mas_app_plan
       value: "$(params.mas_app_plan_optimizer)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2

@@ -15,6 +15,8 @@
       value: $(params.artifactory_token)
     - name: mas_app_channel
       value: "$(params.mas_app_channel_predict)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2

@@ -17,6 +17,8 @@
       value: "$(params.mas_app_channel_visualinspection)"
     - name: mas_app_settings_visualinspection_storage_class
       value: $(params.storage_class_rwx)
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_use_service_mesh

tekton/src/pipelines/taskdefs/core/suite-install.yml.j2

@@ -36,6 +36,8 @@
       value: $(params.mas_icr_cp)
     - name: mas_icr_cpopen
       value: $(params.mas_icr_cpopen)
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: idle_timeout
       value: $(params.idle_timeout)
     - name: idp_session_timeout

tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2

@@ -5,6 +5,8 @@
     - name: devops_suite_name
       value: setup-cp4d
 
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: cpd_product_version
       value: $(params.cpd_product_version)
     - name: cpd_primary_storage_class

tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2

@@ -17,6 +17,8 @@
       value: "$(params.mas_app_channel_manage)"
     - name: mas_app_channel_facilities
       value: "$(params.mas_app_channel_facilities)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
     - name: mas_arcgis_channel

tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2

@@ -13,6 +13,8 @@
 {% endif %}
 
     # Entitlement
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
 
     # Operator Subscription
     - name: db2_channel

tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2

@@ -22,6 +22,8 @@
       value: "$(params.dro_contact_firstname)"
     - name: dro_contact_lastname
       value: "$(params.dro_contact_lastname)"
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: dro_namespace
       value: $(params.dro_namespace)
     - name: dro_storage_class

tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2

@@ -33,6 +33,8 @@
     - name: sls_entitlement_file
       value: $(params.sls_entitlement_file)
 
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
   taskRef:

tekton/src/tasks/aiservice/aiservice.yml.j2

@@ -17,6 +17,10 @@ spec:
       type: string
       description: Required to use development MAS builds
 
+    # Entitlement
+    - name: ibm_entitlement_key
+      type: string
+
     # AI Service Details
     - name: aiservice_instance_id
       type: string
@@ -162,10 +166,7 @@ spec:
 
       # Entitlement
       - name: IBM_ENTITLEMENT_KEY
-        valueFrom:
-          secretKeyRef:
-            name: pipeline-additional-configs
-            key: IBM_ENTITLEMENT_KEY
+        value: $(params.ibm_entitlement_key)
 
       # AI Service Details
       - name: AISERVICE_INSTANCE_ID
@@ -310,7 +311,5 @@ spec:
   workspaces:
     - name: configs
       optional: true
-    - name: additional-configs
-      optional: true
     - name: aiservice
       optional: true

tekton/src/tasks/aiservice/minio.yml.j2

@@ -17,6 +17,10 @@ spec:
       type: string
       description: Required to use development MAS builds
 
+    # Entitlement
+    - name: ibm_entitlement_key
+      type: string
+
     # MAS Details
     - name: mas_instance_id
       type: string
@@ -42,10 +46,7 @@ spec:
 
       # Entitlement
       - name: IBM_ENTITLEMENT_KEY
-        valueFrom:
-          secretKeyRef:
-            name: pipeline-additional-configs
-            key: IBM_ENTITLEMENT_KEY
+        value: $(params.ibm_entitlement_key)
 
       # MAS Details
       - name: MAS_INSTANCE_ID
@@ -63,10 +64,6 @@ spec:
       - name: MINIO_ROOT_PASSWORD
         value: $(params.minio_root_password)
 
-  workspaces:
-    - name: configs
-      optional: true
-
   steps:
     - name: minio
       command:

tekton/src/tasks/aiservice/odh.yml.j2

@@ -17,6 +17,10 @@ spec:
       type: string
       description: Required to use development MAS builds
 
+    # Entitlement
+    - name: ibm_entitlement_key
+      type: string
+
     # MAS Details
     - name: mas_instance_id
       type: string
@@ -60,10 +64,7 @@ spec:
 
       # Entitlement
       - name: IBM_ENTITLEMENT_KEY
-        valueFrom:
-          secretKeyRef:
-            name: pipeline-additional-configs
-            key: IBM_ENTITLEMENT_KEY
+        value: $(params.ibm_entitlement_key)
 
       # MAS Details
       - name: MAS_INSTANCE_ID
@@ -81,10 +82,6 @@ spec:
       - name: AISERVICE_ODH_MODEL_DEPLOYMENT_TYPE
         value: $(params.aiservice_odh_model_deployment_type)
 
-  workspaces:
-    - name: configs
-      optional: true
-
   steps:
     - name: aiservice-odh
       command: