diff --git a/python/src/mas/cli/aiservice/install/app.py b/python/src/mas/cli/aiservice/install/app.py index 3d119ae902a..42e4711b3b7 100644 --- a/python/src/mas/cli/aiservice/install/app.py +++ b/python/src/mas/cli/aiservice/install/app.py @@ -607,6 +607,9 @@ 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"), + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), ) self.setupApprovals(pipelinesNamespace) diff --git a/python/src/mas/cli/backup/app.py b/python/src/mas/cli/backup/app.py index ec3d94baa1c..f5d748984e4 100644 --- a/python/src/mas/cli/backup/app.py +++ b/python/src/mas/cli/backup/app.py @@ -22,7 +22,7 @@ from .argParser import backupArgParser from mas.devops.ocp import createNamespace, getConsoleURL, getStorageClasses from mas.devops.mas import listMasInstances, getDefaultStorageClasses, getWorkspaceId -from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchBackupPipeline +from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchBackupPipeline, prepareBackupSecrets logger = logging.getLogger(__name__) @@ -249,6 +249,12 @@ def backup(self, argv): createBackupPVC=True, backupStorageSize=backupStorageSize, ) + prepareBackupSecrets( + dynClient=self.dynamicClient, + namespace=pipelinesNamespace, + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), + ) h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})") with Halo(text=f"Installing latest Tekton definitions (v{self.version})", spinner=self.spinner) as h: diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index d003459ce5c..77e43fb4a54 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -3165,6 +3165,9 @@ 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"), + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), ) self.setupApprovals(pipelinesNamespace) diff --git a/python/src/mas/cli/restore/app.py b/python/src/mas/cli/restore/app.py index 2913cc88a87..fe9cf7a69f9 100644 --- a/python/src/mas/cli/restore/app.py +++ b/python/src/mas/cli/restore/app.py @@ -332,7 +332,14 @@ def restore(self, argv): ) # Apply config file secrets to the namespace - prepareRestoreSecrets(dynClient=self.dynamicClient, namespace=pipelinesNamespace, restoreConfigs=self.configSecret) + prepareRestoreSecrets( + dynClient=self.dynamicClient, + namespace=pipelinesNamespace, + restoreConfigs=self.configSecret, + ibm_entitlement_key=self.getParam("ibm_entitlement_key"), + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), + ) h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})") diff --git a/python/src/mas/cli/update/app.py b/python/src/mas/cli/update/app.py index 5356b5fad34..ecfb1ad15b6 100644 --- a/python/src/mas/cli/update/app.py +++ b/python/src/mas/cli/update/app.py @@ -378,6 +378,8 @@ def update(self, argv): slack_token=self.getParam("slack_token"), slack_channel=self.getParam("slack_channel"), db2LicenseFile=self.db2LicenseFileSecret, + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), ) with Halo(text=f"Installing latest Tekton definitions (v{self.version})", spinner=self.spinner) as h: diff --git a/python/src/mas/cli/upgrade/app.py b/python/src/mas/cli/upgrade/app.py index 5417bfb17fa..40f01e4b266 100644 --- a/python/src/mas/cli/upgrade/app.py +++ b/python/src/mas/cli/upgrade/app.py @@ -34,7 +34,14 @@ getInstalledApps, ) from mas.devops.utils import isVersionEqualOrAfter -from mas.devops.tekton import preparePipelinesNamespace, installOpenShiftPipelines, updateTektonDefinitions, launchUpgradePipeline, lookupPipelineStorageClass +from mas.devops.tekton import ( + preparePipelinesNamespace, + installOpenShiftPipelines, + updateTektonDefinitions, + launchUpgradePipeline, + lookupPipelineStorageClass, + prepareUpgradeSecrets, +) from mas.devops.pre_install import applyPreInstallMASRBAC from ..rbac_utils import evaluatePreinstallRBACAccess @@ -594,6 +601,13 @@ def channelOrder(ch): storageClass=self.pipelineStorageClass, accessMode=self.pipelineStorageAccessMode, ) + prepareUpgradeSecrets( + dynClient=self.dynamicClient, + namespace=pipelinesNamespace, + ibm_entitlement_key=self.getParam("ibm_entitlement_key"), + artifactory_token=self.getParam("artifactory_token"), + artifactory_username=self.getParam("artifactory_username"), + ) h.stop_and_persist(symbol=self.successIcon, text=f"Namespace is ready ({pipelinesNamespace})") with Halo(text=f"Installing latest Tekton definitions (v{self.version})", spinner=self.spinner) as h: diff --git a/tekton/src/params/backup.yml.j2 b/tekton/src/params/backup.yml.j2 index 4b15f75f998..d5b90d80ac9 100644 --- a/tekton/src/params/backup.yml.j2 +++ b/tekton/src/params/backup.yml.j2 @@ -194,11 +194,6 @@ 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/common.yml.j2 b/tekton/src/params/common.yml.j2 index 8e72ad6a402..266b7e7a2a2 100644 --- a/tekton/src/params/common.yml.j2 +++ b/tekton/src/params/common.yml.j2 @@ -6,15 +6,13 @@ default: IfNotPresent description: Pull policy for pipeline container images -# Development Build Support -- name: artifactory_username - default: "" - type: string - description: Required to install development MAS catalogs -- name: artifactory_token - default: "" +# Registry Credentials Secret +# "mas-secrets" as default avoids empty-string secretKeyRef.name which Kubernetes rejects at pod scheduling +# even with optional: true. Taskdefs with registry-secret-param.yml.j2 always override this except FVTs tasks. +- name: pipeline_registry_secret_name type: string - description: Required to install development MAS catalogs + default: "mas-secrets" + description: Name of the per-pipeline Kubernetes Secret holding registry credentials (IBM_ENTITLEMENT_KEY, ARTIFACTORY_TOKEN, ARTIFACTORY_USERNAME) # Custom Labels - name: custom_labels diff --git a/tekton/src/params/install-common.yml.j2 b/tekton/src/params/install-common.yml.j2 index 00dac79b8d6..d2ccee7ac9f 100644 --- a/tekton/src/params/install-common.yml.j2 +++ b/tekton/src/params/install-common.yml.j2 @@ -9,12 +9,6 @@ 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/aiservice-upgrade.yml.j2 b/tekton/src/pipelines/aiservice-upgrade.yml.j2 index c39dde48fc6..097217a4512 100644 --- a/tekton/src/pipelines/aiservice-upgrade.yml.j2 +++ b/tekton/src/pipelines/aiservice-upgrade.yml.j2 @@ -73,6 +73,7 @@ spec: - name: aiservice-upgrade timeout: "0" params: + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: aiservice_instance_id value: $(params.aiservice_instance_id) - name: aiservice_channel diff --git a/tekton/src/pipelines/mas-backup.yml.j2 b/tekton/src/pipelines/mas-backup.yml.j2 index 2f0cd69a3ad..784b710c947 100644 --- a/tekton/src/pipelines/mas-backup.yml.j2 +++ b/tekton/src/pipelines/mas-backup.yml.j2 @@ -78,6 +78,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: backup-ibm-catalogs @@ -87,11 +88,6 @@ spec: - name: ibm_catalogs_action value: backup - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - taskRef: kind: Task name: mas-devops-ibm-catalogs @@ -107,6 +103,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: backup-cert-manager @@ -134,6 +131,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: backup-mongodb @@ -173,6 +171,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -208,6 +207,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -240,6 +240,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -288,6 +289,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -322,6 +324,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -370,6 +373,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -404,6 +408,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: backup_version value: $(params.backup_version) @@ -423,10 +428,6 @@ spec: value: $(params.s3_endpoint_url) # Artifactory parameters - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: artifactory_url value: $(params.artifactory_url) - name: artifactory_repository diff --git a/tekton/src/pipelines/mas-restore.yml.j2 b/tekton/src/pipelines/mas-restore.yml.j2 index ad853141c42..b5af1c0b0a9 100644 --- a/tekton/src/pipelines/mas-restore.yml.j2 +++ b/tekton/src/pipelines/mas-restore.yml.j2 @@ -84,6 +84,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -121,10 +122,6 @@ spec: value: $(params.s3_endpoint_url) # Artifactory parameters - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: artifactory_url value: $(params.artifactory_url) - name: artifactory_repository @@ -150,6 +147,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -177,6 +175,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -204,6 +203,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -230,6 +230,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -272,6 +273,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -310,6 +312,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -329,8 +332,6 @@ 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 @@ -356,6 +357,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/backup-restore/restore-params.yml.j2') | indent(8) }} @@ -418,6 +420,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: db2_action value: restore @@ -457,6 +460,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) @@ -497,6 +501,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: db2_action value: restore @@ -536,6 +541,7 @@ spec: values: ["true", "True"] params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) diff --git a/tekton/src/pipelines/mas-uninstall.yml.j2 b/tekton/src/pipelines/mas-uninstall.yml.j2 index 24f743a8c49..f32db550bd7 100644 --- a/tekton/src/pipelines/mas-uninstall.yml.j2 +++ b/tekton/src/pipelines/mas-uninstall.yml.j2 @@ -10,6 +10,19 @@ spec: default: IfNotPresent description: Tekton Pipeline image pull policy (for ibmmas/cli images) + # Registry Credentials Secret + # ------------------------------------------------------------------------- + # Uninstall tasks do not use IBM_ENTITLEMENT_KEY or ARTIFACTORY_TOKEN at + # runtime, but the shared cli-env.yml.j2 template injects those env vars via + # secretKeyRef into every CLI container. Kubernetes validates secretKeyRef.name + # at pod-creation time and rejects an empty string even when optional: true — + # so a valid (non-empty) secret name must always be provided. The secret itself + # does not need to exist; optional: true handles missing keys gracefully. + - name: pipeline_registry_secret_name + type: string + default: "mas-uninstall-secrets" + description: Secret name passed to tasks as task_registry_secret_name. Secret does not need to exist; only the name must be a valid RFC 1123 subdomain. + # MAS Config # ------------------------------------------------------------------------- - name: mas_instance_id @@ -123,6 +136,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -140,6 +154,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -157,6 +172,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -174,6 +190,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -191,6 +208,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -208,6 +226,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -225,6 +244,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -242,6 +262,7 @@ spec: name: mas-devops-suite-app-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -266,6 +287,7 @@ spec: name: mas-devops-suite-uninstall params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_wipe_mongo_data @@ -280,6 +302,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: sls_action value: $(params.sls_action) - name: devops_suite_name @@ -301,6 +324,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mongodb_action value: $(params.mongodb_action) - name: devops_suite_name @@ -322,6 +346,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: dro_action value: $(params.dro_action) - name: dro_namespace @@ -345,6 +370,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: cert_manager_action value: $(params.cert_manager_action) - name: cert_manager_provider @@ -368,6 +394,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: ibm_catalogs_action value: $(params.ibm_catalogs_action) - name: devops_suite_name @@ -389,6 +416,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: grafana_action value: $(params.grafana_action) - name: devops_suite_name diff --git a/tekton/src/pipelines/mas-update.yml.j2 b/tekton/src/pipelines/mas-update.yml.j2 index 5581d6e53bd..1dd7cf9649d 100644 --- a/tekton/src/pipelines/mas-update.yml.j2 +++ b/tekton/src/pipelines/mas-update.yml.j2 @@ -18,21 +18,17 @@ spec: type: string default: "" - # Catalog Version + # Registry Credentials Secret # ------------------------------------------------------------------------- - - name: mas_catalog_version + - name: pipeline_registry_secret_name type: string + default: "mas-update-secrets" + description: Name of the per-pipeline Kubernetes Secret holding registry credentials - # Development Build Support + # Catalog Version # ------------------------------------------------------------------------- - - name: artifactory_username - default: "" - type: string - description: Required to install development MAS catalogs - - name: artifactory_token - default: "" + - name: mas_catalog_version type: string - description: Required to install development MAS catalogs # ocs/odf storage action # ------------------------------------------------------------------------- @@ -235,18 +231,12 @@ spec: - pre-update-check params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: update-catalog - name: mas_catalog_version value: $(params.mas_catalog_version) - # Development catalog support - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - - # 3. Verify health of the cluster before we consider the update complete # ------------------------------------------------------------------------- {{ lookup('template', 'taskdefs/cluster-setup/ocp-verify-all.yml.j2', template_vars={ @@ -268,6 +258,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: update-ocs - name: ocs_action @@ -286,6 +277,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: grafana_action value: update - name: devops_suite_name @@ -304,6 +296,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: dependencies-rhoai-migration @@ -316,6 +309,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: update-db2 - name: db2_action @@ -341,6 +335,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: update-mongodb - name: mongodb_action @@ -369,6 +364,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: devops_suite_name value: update-kafka - name: kafka_action @@ -418,6 +414,7 @@ spec: - post-update-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: aiservice_instance_ids value: $(params.aiservice_instance_ids) diff --git a/tekton/src/pipelines/mas-upgrade.yml.j2 b/tekton/src/pipelines/mas-upgrade.yml.j2 index 49ef21895ab..19d1d84e260 100644 --- a/tekton/src/pipelines/mas-upgrade.yml.j2 +++ b/tekton/src/pipelines/mas-upgrade.yml.j2 @@ -90,6 +90,7 @@ spec: - pre-upgrade-check params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_channel @@ -103,6 +104,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_channel @@ -201,6 +203,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -227,6 +230,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -253,6 +257,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -279,6 +284,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -305,6 +311,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -328,6 +335,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -351,6 +359,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -373,6 +382,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -399,6 +409,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -423,6 +434,7 @@ spec: timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(8) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id diff --git a/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 index ef0c89ecd73..5005b3af5b4 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 +++ b/tekton/src/pipelines/taskdefs/aiservice/aiservice.yml.j2 @@ -2,17 +2,10 @@ timeout: "0" params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: aiservice - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - - - name: ibm_entitlement_key - value: $(params.ibm_entitlement_key) - - name: custom_labels value: $(params.custom_labels) diff --git a/tekton/src/pipelines/taskdefs/aiservice/gencfg-aiservice.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/gencfg-aiservice.yml.j2 index eb13e2278f6..d835604f7fa 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/gencfg-aiservice.yml.j2 +++ b/tekton/src/pipelines/taskdefs/aiservice/gencfg-aiservice.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: gencfg-aiservice diff --git a/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 index 511fda86246..6f6e7e1773e 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 +++ b/tekton/src/pipelines/taskdefs/aiservice/minio.yml.j2 @@ -2,20 +2,15 @@ timeout: "0" params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-minio - name: mas_instance_id value: $(params.aiservice_instance_id) - name: mas_app_id value: aibroker - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 index 009cc7ca675..19930316e80 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 +++ b/tekton/src/pipelines/taskdefs/aiservice/odh.yml.j2 @@ -1,6 +1,7 @@ - name: aiservice-odh params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: aiservice-odh @@ -10,14 +11,8 @@ {% else %} value: $(params.mas_instance_id) {% endif %} - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 diff --git a/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 b/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 index d63e90d0845..caa27a9ba08 100644 --- a/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 +++ b/tekton/src/pipelines/taskdefs/aiservice/rhoai.yml.j2 @@ -1,6 +1,7 @@ - name: aiservice-rhoai params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: aiservice-rhoai @@ -10,14 +11,8 @@ {% else %} value: $(params.mas_instance_id) {% endif %} - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 diff --git a/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 index eadccadbf0b..2ee1cdccf68 100644 --- a/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2 @@ -2,19 +2,14 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id value: assist - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 895984a02fd..07633d8312d 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/db2-setup-facilities.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-db2-setup-facilities @@ -10,10 +11,6 @@ - name: db2_instance_name 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 value: $(params.db2_channel) diff --git a/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 b/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 index 0ae9c8d440a..c86f096e4b1 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-db2-setup-manage diff --git a/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 b/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 index f9d4cc411f3..26d451d4af0 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-db2-setup-system diff --git a/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 b/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 index e74f90615cb..b211e92235b 100644 --- a/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2 @@ -5,19 +5,13 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id 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 d72382fb5e9..9da2579377b 100644 --- a/tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2 @@ -4,19 +4,13 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id 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 d98159e9c8f..eae307153d8 100644 --- a/tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2 @@ -5,6 +5,7 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id @@ -17,14 +18,8 @@ value: $(params.manage_bind_aiservice_instance_id) - name: manage_bind_aiservice_tenant_id value: $(params.manage_bind_aiservice_tenant_id) - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 7865b87be1d..2286857d802 100644 --- a/tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2 @@ -4,19 +4,13 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id 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 6c27b29c07e..f331ca8ecdf 100644 --- a/tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2 @@ -5,20 +5,15 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id value: optimizer - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: mas_app_channel 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 7a7157b647c..354be495df5 100644 --- a/tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2 @@ -5,18 +5,13 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id value: predict - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - 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 5124a9dc39b..f3e2dded7fb 100644 --- a/tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/visualinspection-app.yml.j2 @@ -5,20 +5,15 @@ kind: Task params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: mas_instance_id value: $(params.mas_instance_id) - name: mas_app_id value: visualinspection - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: mas_app_channel 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/cluster-setup/cert-manager.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/cert-manager.yml.j2 index a5af5844f4e..b615d2ddf4f 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/cert-manager.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/cert-manager.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-cert-manager - name: cert_manager_provider diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/eck.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/eck.yml.j2 index abeb9669367..ec25b54c4fa 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/eck.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/eck.yml.j2 @@ -5,6 +5,7 @@ name: mas-devops-eck params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-eck diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/grafana.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/grafana.yml.j2 index 6a4667f5a81..acdbe840e46 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/grafana.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/grafana.yml.j2 @@ -5,6 +5,7 @@ name: mas-devops-grafana params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-grafana diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/ibm-catalogs.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/ibm-catalogs.yml.j2 index d602b1e78f3..6585a01bc12 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/ibm-catalogs.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/ibm-catalogs.yml.j2 @@ -2,16 +2,13 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-ibm-catalogs - name: mas_catalog_version value: $(params.mas_catalog_version) - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: mas_catalog_digest value: $(params.mas_catalog_digest) taskRef: diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify-all.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify-all.yml.j2 index 5016d37cc62..68af205c90f 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify-all.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify-all.yml.j2 @@ -5,6 +5,7 @@ name: mas-devops-ocp-verify-all params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Pipeline Config - name: skip_pre_check value: $(params.skip_pre_check) diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify.yml.j2 index 21764213477..fa67ef44f2b 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/ocp-verify.yml.j2 @@ -5,6 +5,7 @@ name: mas-devops-ocp-verify params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Pipeline Config - name: skip_pre_check value: $(params.skip_pre_check) diff --git a/tekton/src/pipelines/taskdefs/cluster-setup/turbonomic.yml.j2 b/tekton/src/pipelines/taskdefs/cluster-setup/turbonomic.yml.j2 index db978d84823..9eab54bf764 100644 --- a/tekton/src/pipelines/taskdefs/cluster-setup/turbonomic.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cluster-setup/turbonomic.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-turbonomic diff --git a/tekton/src/pipelines/taskdefs/common/registry-secret-param.yml.j2 b/tekton/src/pipelines/taskdefs/common/registry-secret-param.yml.j2 new file mode 100644 index 00000000000..5baafe2f078 --- /dev/null +++ b/tekton/src/pipelines/taskdefs/common/registry-secret-param.yml.j2 @@ -0,0 +1,3 @@ +# Name of the OCP Secret holding registry credentials (ibm_entitlement_key, artifactory_token, artifactory_username) +- name: task_registry_secret_name + value: $(params.pipeline_registry_secret_name) diff --git a/tekton/src/pipelines/taskdefs/core/gencfg-workspace.yml.j2 b/tekton/src/pipelines/taskdefs/core/gencfg-workspace.yml.j2 index 0599d69266e..a1a2071b057 100644 --- a/tekton/src/pipelines/taskdefs/core/gencfg-workspace.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/gencfg-workspace.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: gencfg-workspace diff --git a/tekton/src/pipelines/taskdefs/core/suite-certs.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-certs.yml.j2 index 29a7e74cc9f..eff0d8f40dc 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-certs.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-certs.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-certs diff --git a/tekton/src/pipelines/taskdefs/core/suite-config-cos.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config-cos.yml.j2 index f2ac03ebdbe..29d67c88c95 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config-cos.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-config-cos.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: cfg-suite-cos diff --git a/tekton/src/pipelines/taskdefs/core/suite-config-db2.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config-db2.yml.j2 index c6212d02980..31912839c9a 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config-db2.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-config-db2.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-config-db2 diff --git a/tekton/src/pipelines/taskdefs/core/suite-config-kafka.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config-kafka.yml.j2 index 1abffa78029..8d95c1de098 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config-kafka.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-config-kafka.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: cfg-suite-kafka diff --git a/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 index 76b1f44d468..c42a9864e9a 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: cfg-suite-watson-studio diff --git a/tekton/src/pipelines/taskdefs/core/suite-config.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config.yml.j2 index 24f0a70c29a..c22cdeecc6a 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-config.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-config diff --git a/tekton/src/pipelines/taskdefs/core/suite-dns.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-dns.yml.j2 index f27e13f5f9e..b82351a5cc4 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-dns.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-dns.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-dns diff --git a/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 index db89c87def6..19c53ea9d9a 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-install.yml.j2 @@ -2,17 +2,13 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-install - name: mas_instance_id value: $(params.mas_instance_id) - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - - name: mas_annotations value: $(params.mas_annotations) - name: mas_domain @@ -36,8 +32,6 @@ 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/core/suite-verify.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-verify.yml.j2 index 63efcaed6bd..c874c6a7a31 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-verify.yml.j2 +++ b/tekton/src/pipelines/taskdefs/core/suite-verify.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: suite-verify diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos-update.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos-update.yml.j2 index 0e62023594c..9206aac2174 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos-update.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos-update.yml.j2 @@ -1,6 +1,7 @@ - name: update-cognos timeout: "0" params: + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Controls the image pull policy for the ibmmas/cli image - name: image_pull_policy value: $(params.image_pull_policy) diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos.yml.j2 index c3fadfa7fe4..a9f6633d79b 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-cognos.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-cp4d-cognos diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform-update.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform-update.yml.j2 index 5104824f75a..e121a844dc8 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform-update.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform-update.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: update-cp4d @@ -16,8 +17,6 @@ # # TODO: The role should be smart enough to know that it's doing an update # and thus does not need this explicit flag - - name: ibm_entitlement_key - value: "" - name: skip_entitlement_key_flag value: "true" diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 index 8eaeb8ac514..84e302b610f 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 @@ -2,11 +2,10 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - 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/cp4d/cp4d-spark-update.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark-update.yml.j2 index 8c69d06775f..1aa81b0fc23 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark-update.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark-update.yml.j2 @@ -1,6 +1,7 @@ - name: update-analytics-engine timeout: "0" params: + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Controls the image pull policy for the ibmmas/cli image - name: image_pull_policy value: $(params.image_pull_policy) diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark.yml.j2 index a93cecf5dec..69401ede908 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-spark.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-cp4d-spark diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml-update.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml-update.yml.j2 index 5c729d7c246..2dfb68589db 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml-update.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml-update.yml.j2 @@ -1,6 +1,7 @@ - name: update-watson-machine-learning timeout: "0" params: + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Controls the image pull policy for the ibmmas/cli image - name: image_pull_policy value: $(params.image_pull_policy) diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml.yml.j2 index 5ed75763445..5adae91be55 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wml.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-cp4d-wml diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl-update.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl-update.yml.j2 index a88bbff265e..4a9d4cbb596 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl-update.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl-update.yml.j2 @@ -1,6 +1,7 @@ - name: update-watson-studio timeout: "0" params: + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} # Controls the image pull policy for the ibmmas/cli image - name: image_pull_policy value: $(params.image_pull_policy) diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 index 59823631fd5..7c41bbbc357 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 +++ b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: setup-cp4d-wsl diff --git a/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 index 31b814419cb..6d66bf996b3 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/arcgis.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: arcgis @@ -9,16 +10,10 @@ value: $(params.mas_instance_id) - name: mas_app_id value: arcgis - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - name: mas_app_channel 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/cos.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2 index dfc18bb5609..64919f8b109 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-cos diff --git a/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 index 7234e6ae74f..92df8b62290 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/db2.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-db2-{{ suffix }} @@ -12,10 +13,6 @@ value: $(params.mas_instance_id) {% endif %} - # Entitlement - - name: ibm_entitlement_key - value: $(params.ibm_entitlement_key) - # Operator Subscription - name: db2_channel value: $(params.db2_channel) diff --git a/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 index 7d6e7603cb9..544c558cd07 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: dro_action value: "$(params.dro_action)" @@ -22,8 +23,6 @@ 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/kafka.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/kafka.yml.j2 index b75dd3ee3bc..0ef1127abf4 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/kafka.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/kafka.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-kafka diff --git a/tekton/src/pipelines/taskdefs/dependencies/mongo.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/mongo.yml.j2 index dae0d5fc2f3..85529b689cf 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/mongo.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/mongo.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-mongodb diff --git a/tekton/src/pipelines/taskdefs/dependencies/nvidia.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/nvidia.yml.j2 index 92c2fea062b..82b34615902 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/nvidia.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/nvidia.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-nvidia-gpu diff --git a/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 index f95dab90a15..91e817af69e 100644 --- a/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 +++ b/tekton/src/pipelines/taskdefs/dependencies/sls.yml.j2 @@ -2,6 +2,7 @@ timeout: "0" params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/cli-params.yml.j2') | indent(4) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/common/registry-secret-param.yml.j2') | indent(4) }} - name: devops_suite_name value: dependencies-sls @@ -11,11 +12,6 @@ - name: aiservice_instance_id value: $(params.aiservice_instance_id) - - name: artifactory_username - value: $(params.artifactory_username) - - name: artifactory_token - value: $(params.artifactory_token) - - name: sls_namespace value: $(params.sls_namespace) - name: sls_mongodb_cfg_file @@ -33,8 +29,6 @@ - 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 d23900f26ab..6724f0318fb 100644 --- a/tekton/src/tasks/aiservice/aiservice.yml.j2 +++ b/tekton/src/tasks/aiservice/aiservice.yml.j2 @@ -7,20 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - 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 @@ -188,16 +174,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # AI Service Details - name: AISERVICE_INSTANCE_ID value: $(params.aiservice_instance_id) diff --git a/tekton/src/tasks/aiservice/minio.yml.j2 b/tekton/src/tasks/aiservice/minio.yml.j2 index a4db8d8f3ee..1ef2477d27f 100644 --- a/tekton/src/tasks/aiservice/minio.yml.j2 +++ b/tekton/src/tasks/aiservice/minio.yml.j2 @@ -7,20 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - type: string - description: Required to use development MAS builds - - # Entitlement - - name: ibm_entitlement_key - type: string - # MAS Details - name: mas_instance_id type: string @@ -38,16 +24,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # MAS Details - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) diff --git a/tekton/src/tasks/aiservice/odh.yml.j2 b/tekton/src/tasks/aiservice/odh.yml.j2 index 2f2aa2b0561..49c0a9b3391 100644 --- a/tekton/src/tasks/aiservice/odh.yml.j2 +++ b/tekton/src/tasks/aiservice/odh.yml.j2 @@ -7,20 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - type: string - description: Required to use development MAS builds - - # Entitlement - - name: ibm_entitlement_key - type: string - # MAS Details - name: mas_instance_id type: string @@ -56,16 +42,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # MAS Details - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) diff --git a/tekton/src/tasks/aiservice/rhoai.yml.j2 b/tekton/src/tasks/aiservice/rhoai.yml.j2 index 53ff8348b17..5c3eaa3e7f9 100644 --- a/tekton/src/tasks/aiservice/rhoai.yml.j2 +++ b/tekton/src/tasks/aiservice/rhoai.yml.j2 @@ -7,20 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - type: string - description: Required to use development MAS builds - - # Entitlement - - name: ibm_entitlement_key - type: string - # MAS Details - name: mas_instance_id type: string @@ -56,16 +42,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # MAS Details - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) diff --git a/tekton/src/tasks/common/cli-env-nosuitename.yml.j2 b/tekton/src/tasks/common/cli-env-nosuitename.yml.j2 index eefda463bd8..07f17d95b14 100644 --- a/tekton/src/tasks/common/cli-env-nosuitename.yml.j2 +++ b/tekton/src/tasks/common/cli-env-nosuitename.yml.j2 @@ -28,6 +28,24 @@ name: mas-devops-slack key: SLACK_CHANNEL optional: true +- name: IBM_ENTITLEMENT_KEY + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: IBM_ENTITLEMENT_KEY + optional: true +- name: ARTIFACTORY_TOKEN + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: ARTIFACTORY_TOKEN + optional: true +- name: ARTIFACTORY_USERNAME + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: ARTIFACTORY_USERNAME + optional: true - name: PIPELINE_NAMESPACE value: $(params.pipelinerun_namespace) - name: PIPELINERUN_NAME diff --git a/tekton/src/tasks/common/cli-env.yml.j2 b/tekton/src/tasks/common/cli-env.yml.j2 index 06c70a28327..c4257cec8f6 100644 --- a/tekton/src/tasks/common/cli-env.yml.j2 +++ b/tekton/src/tasks/common/cli-env.yml.j2 @@ -30,6 +30,24 @@ name: mas-devops-slack key: SLACK_CHANNEL optional: true +- name: IBM_ENTITLEMENT_KEY + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: IBM_ENTITLEMENT_KEY + optional: true +- name: ARTIFACTORY_TOKEN + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: ARTIFACTORY_TOKEN + optional: true +- name: ARTIFACTORY_USERNAME + valueFrom: + secretKeyRef: + name: $(params.task_registry_secret_name) + key: ARTIFACTORY_USERNAME + optional: true - name: PIPELINE_NAMESPACE value: $(params.pipelinerun_namespace) - name: PIPELINERUN_NAME diff --git a/tekton/src/tasks/common/cli-params.yml.j2 b/tekton/src/tasks/common/cli-params.yml.j2 index 81a3bca2c12..8b0dddc38d4 100644 --- a/tekton/src/tasks/common/cli-params.yml.j2 +++ b/tekton/src/tasks/common/cli-params.yml.j2 @@ -22,6 +22,13 @@ type: string description: Name of the Pipeline default: "" + +# "mas-secrets" as default avoids empty-string secretKeyRef.name which Kubernetes rejects at pod scheduling +# even with optional: true. Taskdefs with registry-secret-param.yml.j2 always override this except FVTs tasks. +- name: task_registry_secret_name + type: string + description: Name of the Kubernetes Secret holding pipeline credentials (IBM_ENTITLEMENT_KEY, ARTIFACTORY_TOKEN, ARTIFACTORY_USERNAME) + default: "mas-secrets" - name: mas_use_service_mesh type: string description: Optional string parameter, either true or false (defaults to false), defines whether the suite will be configured to use redhat service mesh for networking diff --git a/tekton/src/tasks/dependencies/appconnect.yml.j2 b/tekton/src/tasks/dependencies/appconnect.yml.j2 index ebc3532acb8..0984406cf36 100644 --- a/tekton/src/tasks/dependencies/appconnect.yml.j2 +++ b/tekton/src/tasks/dependencies/appconnect.yml.j2 @@ -16,11 +16,6 @@ spec: type: string 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 @@ -52,9 +47,6 @@ spec: value: $(params.mas_instance_id) - name: CUSTOM_LABELS value: $(params.custom_labels) - # Entitlement - - name: 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 2d14fda3d20..bdc902a4b4e 100644 --- a/tekton/src/tasks/dependencies/arcgis.yml.j2 +++ b/tekton/src/tasks/dependencies/arcgis.yml.j2 @@ -7,20 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - type: string - description: Required to use development MAS builds - - # Entitlement - - name: ibm_entitlement_key - type: string - # MAS Details - name: mas_instance_id type: string @@ -50,16 +36,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # MAS Details - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) diff --git a/tekton/src/tasks/dependencies/cp4d.yml.j2 b/tekton/src/tasks/dependencies/cp4d.yml.j2 index adf0f48fddd..d6914466e28 100644 --- a/tekton/src/tasks/dependencies/cp4d.yml.j2 +++ b/tekton/src/tasks/dependencies/cp4d.yml.j2 @@ -28,9 +28,6 @@ spec: type: string default: "" - # Entitlement - - name: ibm_entitlement_key - type: string - name: skip_entitlement_key_flag type: string default: "" @@ -55,9 +52,6 @@ spec: - name: CPD_METADATA_STORAGE_CLASS value: $(params.cpd_metadata_storage_class) - # Entitlement - - name: 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 47a033a4669..bb1499a60f2 100644 --- a/tekton/src/tasks/dependencies/db2.yml.j2 +++ b/tekton/src/tasks/dependencies/db2.yml.j2 @@ -7,10 +7,6 @@ spec: params: {{ 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 @@ -223,9 +219,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Entitlement - - name: 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 b84367203aa..8c1ef67ea81 100644 --- a/tekton/src/tasks/dependencies/dro.yml.j2 +++ b/tekton/src/tasks/dependencies/dro.yml.j2 @@ -29,9 +29,6 @@ spec: description: config directory path default: "/workspace/configs" - - name: ibm_entitlement_key - type: string - default: "" - name: dro_namespace type: string default: "redhat-marketplace" @@ -85,8 +82,6 @@ spec: value: /workspace/pod-templates - name: CUSTOM_LABELS value: $(params.custom_labels) - - name: 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/ibm-catalogs.yml.j2 b/tekton/src/tasks/dependencies/ibm-catalogs.yml.j2 index 2a512e96ea8..fe2bb474172 100644 --- a/tekton/src/tasks/dependencies/ibm-catalogs.yml.j2 +++ b/tekton/src/tasks/dependencies/ibm-catalogs.yml.j2 @@ -7,14 +7,6 @@ spec: params: {{ lookup('template', task_src_dir ~ '/common/cli-params.yml.j2') | indent(4) }} - - name: artifactory_username - default: "" - type: string - description: Required to install development MAS catalogs - - name: artifactory_token - default: "" - type: string - description: Required to install development MAS catalogs - name: mas_catalog_version type: string description: Optional version of the IBM Maximo Operator Catalog to install @@ -41,11 +33,6 @@ spec: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} # General - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - name: MAS_CATALOG_VERSION value: $(params.mas_catalog_version) - name: MAS_CATALOG_DIGEST diff --git a/tekton/src/tasks/dependencies/sls.yml.j2 b/tekton/src/tasks/dependencies/sls.yml.j2 index bac3b71129f..1953a097c5c 100644 --- a/tekton/src/tasks/dependencies/sls.yml.j2 +++ b/tekton/src/tasks/dependencies/sls.yml.j2 @@ -48,20 +48,6 @@ 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 - description: Required to use development MAS builds - - name: artifactory_token - default: "" - type: string - description: Required to use development MAS builds - # Optional parameter to uninstall SLS - name: sls_action type: string @@ -107,15 +93,6 @@ spec: - name: SLS_ENTITLEMENT_FILE value: $(params.sls_entitlement_file) - # Entitlement (only used for artifactory auth since 3.8.0) - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - # Optional parameter to uninstall SLS - name: SLS_ACTION value: $(params.sls_action) diff --git a/tekton/src/tasks/download-backup-archive.yml.j2 b/tekton/src/tasks/download-backup-archive.yml.j2 index 3e08e0dcded..d2813775749 100644 --- a/tekton/src/tasks/download-backup-archive.yml.j2 +++ b/tekton/src/tasks/download-backup-archive.yml.j2 @@ -69,14 +69,6 @@ spec: default: "" # Artifactory download parameters - - name: artifactory_username - type: string - description: Artifactory username for backup download - default: "" - - name: artifactory_token - type: string - description: Artifactory token for backup download - default: "" - name: artifactory_url type: string description: Artifactory URL for backup download @@ -127,10 +119,6 @@ spec: value: $(params.s3_endpoint_url) # Artifactory credentials - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - name: ARTIFACTORY_URL value: $(params.artifactory_url) - name: ARTIFACTORY_REPOSITORY diff --git a/tekton/src/tasks/suite-app-install.yml.j2 b/tekton/src/tasks/suite-app-install.yml.j2 index 19f7f05b6a0..fa8cc6dc0c1 100644 --- a/tekton/src/tasks/suite-app-install.yml.j2 +++ b/tekton/src/tasks/suite-app-install.yml.j2 @@ -42,20 +42,6 @@ spec: # Install Step # ------------------------------------------------------------------------- - # Pre-Release Support - - name: artifactory_username - default: '' - type: string - description: Required to use development MAS builds - - name: artifactory_token - default: '' - type: string - description: Required to use development MAS builds - - # Entitlement - - name: ibm_entitlement_key - type: string - # Application - Operator - name: mas_app_channel type: string @@ -449,16 +435,6 @@ spec: - name: DEVOPS_SUITE_NAME value: app-$(params.mas_app_id)-install - # Pre-Release Support - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - # Entitlement - - name: 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 f46a21bd38d..081f8099fe6 100644 --- a/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 +++ b/tekton/src/tasks/suite-db2-setup-for-facilities.yml.j2 @@ -7,11 +7,6 @@ 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 @@ -181,10 +176,6 @@ spec: env: {{ lookup('template', task_src_dir ~ '/common/cli-env.yml.j2') | indent(6) }} - # Entitlement - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - # Db2u Operator - name: DB2_CHANNEL value: $(params.db2_channel) diff --git a/tekton/src/tasks/suite-install.yml.j2 b/tekton/src/tasks/suite-install.yml.j2 index b3aa2f9ddf8..bea47846734 100644 --- a/tekton/src/tasks/suite-install.yml.j2 +++ b/tekton/src/tasks/suite-install.yml.j2 @@ -99,18 +99,6 @@ 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 - description: Required to install development MAS catalogs - - name: artifactory_token - default: '' - type: string - description: Required to install development MAS catalogs - # Special characters configuration - name: mas_special_characters type: string @@ -202,11 +190,6 @@ spec: - name: MAS_SUPERUSER_PASSWORD value: $(params.mas_superuser_password) - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - - name: MAS_ICR_CP value: $(params.mas_icr_cp) - name: MAS_ICR_CPOPEN @@ -221,9 +204,6 @@ spec: - name: MAS_ISSUER_KIND value: $(params.mas_issuer_kind) - - name: IBM_ENTITLEMENT_KEY - value: $(params.ibm_entitlement_key) - - name: MAS_POD_TEMPLATES_DIR value: /workspace/pod-templates diff --git a/tekton/src/tasks/upload-backup-archive.yml.j2 b/tekton/src/tasks/upload-backup-archive.yml.j2 index 3ed1198561c..ca1986e7569 100644 --- a/tekton/src/tasks/upload-backup-archive.yml.j2 +++ b/tekton/src/tasks/upload-backup-archive.yml.j2 @@ -39,14 +39,6 @@ spec: default: "" # Artifactory Upload parameters - - name: artifactory_username - type: string - description: Artifactory username for backup upload - default: "" - - name: artifactory_token - type: string - description: Artifactory token for backup upload - default: "" - name: artifactory_url type: string description: Artifactory URL for backup upload @@ -81,10 +73,6 @@ spec: value: $(params.s3_endpoint_url) # Artifactory credentials - - name: ARTIFACTORY_USERNAME - value: $(params.artifactory_username) - - name: ARTIFACTORY_TOKEN - value: $(params.artifactory_token) - name: ARTIFACTORY_URL value: $(params.artifactory_url) - name: ARTIFACTORY_REPOSITORY