diff --git a/python/src/mas/cli/aiservice/install/app.py b/python/src/mas/cli/aiservice/install/app.py index ef29e04cb81..39e7adaa538 100644 --- a/python/src/mas/cli/aiservice/install/app.py +++ b/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) diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 188b83593bb..0e222af3a59 100644 --- a/python/src/mas/cli/install/app.py +++ b/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) diff --git a/python/src/mas/cli/restore/app.py b/python/src/mas/cli/restore/app.py index edb131b14b9..2913cc88a87 100644 --- a/python/src/mas/cli/restore/app.py +++ b/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})") diff --git a/tekton/src/params/backup.yml.j2 b/tekton/src/params/backup.yml.j2 index d5b90d80ac9..4b15f75f998 100644 --- a/tekton/src/params/backup.yml.j2 +++ b/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 diff --git a/tekton/src/params/install-common.yml.j2 b/tekton/src/params/install-common.yml.j2 index d2ccee7ac9f..00dac79b8d6 100644 --- a/tekton/src/params/install-common.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/mas-restore.yml.j2 b/tekton/src/pipelines/mas-restore.yml.j2 index ecaddbfecd3..bd58917f6c8 100644 --- a/tekton/src/pipelines/mas-restore.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 index f917d919c5c..78181afefb7 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 index c6169caad50..511fda86246 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 index 90d46a15f86..009cc7ca675 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 index c6e9fac2d7e..d63e90d0845 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 index 6a38654e1ca..eadccadbf0b 100644 --- a/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2 b/tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2 index 8964330f277..895984a02fd 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 index 47eb3510a2c..e74f90615cb 100644 --- a/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2 index 2e6136a3069..d72382fb5e9 100644 --- a/tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2 index dd96da334c9..d98159e9c8f 100644 --- a/tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2 index fe1dba4c5dd..7865b87be1d 100644 --- a/tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2 index 01efd5de77a..6c27b29c07e 100644 --- a/tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2 index 877a8c0a419..7a7157b647c 100644 --- a/tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2 index d8a5885d7e2..5124a9dc39b 100644 --- a/tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 index aa3d82af38a..db89c87def6 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 index 892376db0d9..8eaeb8ac514 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 index a9a820b938b..31b814419cb 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 index eba5e4a16d0..7234e6ae74f 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 index 9a218032a22..7d6e7603cb9 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 index de487a0bb11..f95dab90a15 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 +++ b/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: diff --git a/tekton/src/tasks/aiservice/aiservice.yml.j2 b/tekton/src/tasks/aiservice/aiservice.yml.j2 index e8ec737864c..1b18d2ba9b3 100644 --- a/tekton/src/tasks/aiservice/aiservice.yml.j2 +++ b/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 diff --git a/tekton/src/tasks/aiservice/minio.yml.j2 b/tekton/src/tasks/aiservice/minio.yml.j2 index f3b3154e998..a4db8d8f3ee 100644 --- a/tekton/src/tasks/aiservice/minio.yml.j2 +++ b/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: diff --git a/tekton/src/tasks/aiservice/odh.yml.j2 b/tekton/src/tasks/aiservice/odh.yml.j2 index 64d2ba1c851..2f2aa2b0561 100644 --- a/tekton/src/tasks/aiservice/odh.yml.j2 +++ b/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: diff --git a/tekton/src/tasks/aiservice/rhoai.yml.j2 b/tekton/src/tasks/aiservice/rhoai.yml.j2 index d18bdaffa0d..aa3a98d1ef7 100644 --- a/tekton/src/tasks/aiservice/rhoai.yml.j2 +++ b/tekton/src/tasks/aiservice/rhoai.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_RHOAI_MODEL_DEPLOYMENT_TYPE value: $(params.aiservice_rhoai_model_deployment_type) - workspaces: - - name: configs - optional: true - steps: - name: aiservice-rhoai command: diff --git a/tekton/src/tasks/dependencies/appconnect.yml.j2 b/tekton/src/tasks/dependencies/appconnect.yml.j2 index ce98794b603..ebc3532acb8 100644 --- a/tekton/src/tasks/dependencies/appconnect.yml.j2 +++ b/tekton/src/tasks/dependencies/appconnect.yml.j2 @@ -17,6 +17,10 @@ spec: description: Optional MAS custom labels, comma separated list of key=value pairs default: "" # Entitlement + - name: ibm_entitlement_key + type: string + description: "IBM Entitlement Key" + default: "" # Subscription Channel - name: appconnect_channel type: string @@ -50,10 +54,7 @@ spec: value: $(params.custom_labels) # Entitlement - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) # Channel - name: APPCONNECT_CHANNEL value: $(params.appconnect_channel) diff --git a/tekton/src/tasks/dependencies/arcgis.yml.j2 b/tekton/src/tasks/dependencies/arcgis.yml.j2 index 9606138f917..2d14fda3d20 100644 --- a/tekton/src/tasks/dependencies/arcgis.yml.j2 +++ b/tekton/src/tasks/dependencies/arcgis.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 @@ -54,10 +58,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 diff --git a/tekton/src/tasks/dependencies/cp4d.yml.j2 b/tekton/src/tasks/dependencies/cp4d.yml.j2 index 42ec15a8bd4..adf0f48fddd 100644 --- a/tekton/src/tasks/dependencies/cp4d.yml.j2 +++ b/tekton/src/tasks/dependencies/cp4d.yml.j2 @@ -29,6 +29,8 @@ spec: default: "" # Entitlement + - name: ibm_entitlement_key + type: string - name: skip_entitlement_key_flag type: string default: "" @@ -55,10 +57,7 @@ spec: # Entitlement - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) - name: SKIP_ENTITLEMENT_KEY_FLAG value: $(params.skip_entitlement_key_flag) steps: diff --git a/tekton/src/tasks/dependencies/db2.yml.j2 b/tekton/src/tasks/dependencies/db2.yml.j2 index 277ed927381..47a033a4669 100644 --- a/tekton/src/tasks/dependencies/db2.yml.j2 +++ b/tekton/src/tasks/dependencies/db2.yml.j2 @@ -8,6 +8,9 @@ spec: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} # Entitlement + - name: ibm_entitlement_key + type: string + default: "" - name: db2_license_file type: string description: Db2 activation license file @@ -222,10 +225,7 @@ spec: # Entitlement - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) - name: DB2_LICENSE_FILE value: $(params.db2_license_file) diff --git a/tekton/src/tasks/dependencies/dro.yml.j2 b/tekton/src/tasks/dependencies/dro.yml.j2 index 5f19a650166..b84367203aa 100644 --- a/tekton/src/tasks/dependencies/dro.yml.j2 +++ b/tekton/src/tasks/dependencies/dro.yml.j2 @@ -29,6 +29,9 @@ spec: description: config directory path default: "/workspace/configs" + - name: ibm_entitlement_key + type: string + default: "" - name: dro_namespace type: string default: "redhat-marketplace" @@ -83,10 +86,7 @@ spec: - name: CUSTOM_LABELS value: $(params.custom_labels) - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) - name: DRO_CONTACT_EMAIL value: $(params.dro_contact_email) - name: DRO_CONTACT_FIRSTNAME diff --git a/tekton/src/tasks/dependencies/sls.yml.j2 b/tekton/src/tasks/dependencies/sls.yml.j2 index 13bb27ecc39..bac3b71129f 100644 --- a/tekton/src/tasks/dependencies/sls.yml.j2 +++ b/tekton/src/tasks/dependencies/sls.yml.j2 @@ -48,6 +48,11 @@ spec: type: string default: "" + # Entitlement (only used for artifactory auth since 3.8.0) + - name: ibm_entitlement_key + type: string + default: "" + - name: artifactory_username default: "" type: string @@ -103,13 +108,8 @@ spec: value: $(params.sls_entitlement_file) # Entitlement (only used for artifactory auth since 3.8.0) - {% if sls_channel is defined and sls_channel|string|replace('.', '')|int <= 370 %} - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY - {% endif %} + value: $(params.ibm_entitlement_key) - name: ARTIFACTORY_USERNAME value: $(params.artifactory_username) diff --git a/tekton/src/tasks/suite-app-install.yml.j2 b/tekton/src/tasks/suite-app-install.yml.j2 index 6f0bc390cfb..19f7f05b6a0 100644 --- a/tekton/src/tasks/suite-app-install.yml.j2 +++ b/tekton/src/tasks/suite-app-install.yml.j2 @@ -52,6 +52,10 @@ spec: type: string description: Required to use development MAS builds + # Entitlement + - name: ibm_entitlement_key + type: string + # Application - Operator - name: mas_app_channel type: string @@ -453,10 +457,7 @@ spec: # Entitlement - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) - name: MAS_USE_SERVICE_MESH value: $(params.mas_use_service_mesh) diff --git a/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 b/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 index 3846d017b69..f46a21bd38d 100644 --- a/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 +++ b/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 @@ -7,6 +7,11 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} + # Entitlement + - name: ibm_entitlement_key + type: string + default: "" + - name: db2_action_facilities type: string description: Set to 'install' to set up Db2 instance for Facilities @@ -178,10 +183,7 @@ spec: # Entitlement - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) # Db2u Operator - name: DB2_CHANNEL diff --git a/tekton/src/tasks/suite-install.yml.j2 b/tekton/src/tasks/suite-install.yml.j2 index 8211788bad0..b3aa2f9ddf8 100644 --- a/tekton/src/tasks/suite-install.yml.j2 +++ b/tekton/src/tasks/suite-install.yml.j2 @@ -99,6 +99,9 @@ spec: description: Certificate issuer kind for MAS Suite CR (Issuer or ClusterIssuer) default: "" + - name: ibm_entitlement_key + type: string + - name: artifactory_username default: '' type: string @@ -219,10 +222,7 @@ spec: value: $(params.mas_issuer_kind) - name: IBM_ENTITLEMENT_KEY - valueFrom: - secretKeyRef: - name: pipeline-additional-configs - key: IBM_ENTITLEMENT_KEY + value: $(params.ibm_entitlement_key) - name: MAS_POD_TEMPLATES_DIR value: /workspace/pod-templates