Skip to content

[patch] remove ibm_entitlement_key from Tekton param flow and source from secrets#2405

Draft
jigneshchauhan2001 wants to merge 4 commits into
masterfrom
fix-secrets
Draft

[patch] remove ibm_entitlement_key from Tekton param flow and source from secrets#2405
jigneshchauhan2001 wants to merge 4 commits into
masterfrom
fix-secrets

Conversation

@jigneshchauhan2001

@jigneshchauhan2001 jigneshchauhan2001 commented Jun 19, 2026

Copy link
Copy Markdown

Summary

ibm_entitlement_key was appearing as plaintext in pod environment variables and was being passed through the MAS install PipelineRun into pod specs.
This change removes ibm_entitlement_key from the Tekton parameter flow under /cli/tekton/src and updates affected task pods to read IBM_ENTITLEMENT_KEY from Kubernetes secret pipeline-additional-configs.
It also applies the SLS speific-fix in /cli/tekton/src/tasks/dependencies/sls.yml.j2 so IBM_ENTITLEMENT_KEY is not injected into the SLS pod for newer SLS channel paths (sls_channel > 3.7.0).

Changes

ibm_entitlement_key moved to Secrets

  • replaced task pod env usage of $(params.ibm_entitlement_key) with valueFrom.secretKeyRef in affected task templates under:
  • removed ibm_entitlement_key Tekton param wiring from affected pipeline/taskdef templates under:
  • removed shared param definitions where no longer needed under:

SLS fix:

This change ensures:

  • the entitlement key is no longer exposed through Tekton params
  • affected pods read the key from Kubernetes Secret
  • SLS no longer receives the entitlement env in the newer channel path

Validation

Validation details are attached in
Validations.docx

Which contains UI and CLI validation confirmed:

  • PipelineRuns do not contain ibm_entitlement_key
  • secret pipeline-additional-configs contains IBM_ENTITLEMENT_KEY
  • non-SLS install pods use valueFrom.secretKeyRef
  • SLS pod does not contain IBM_ENTITLEMENT_KEY in the validated newer-channel path
  • non-SLS pod YAML does not contain ibm_entitlement_key

Validated on Fyre OCP cluster:

  • install completed successfully
  • fvt-core completed successfully
  • fvt-sls completed successfully
  • fvt-manage completed successfully

FVT dashboard link:

@whitfiea whitfiea left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes update all the references to the entitlement key but i don't think it is updating all the pipelines to use this workspace that contains it i.e. i don't think aiservice or backup/restore pipelines use pipeline-additional-configs workspace so those need updating.
Also the backup/restore needs the secret set like it does in the app.py for install.

The secretKeyRef is also set as optional: true, when it shouldn't really be optional.

Comment thread python/src/mas/cli/restore/app.py Outdated
dynClient=self.dynamicClient,
namespace=pipelinesNamespace,
restoreConfigs=self.configSecret,
ibm_entitlement_key=self.getParam("ibm_entitlement_key") if self.getParam("include_dro") == "true" else None,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is there an if condition on include_dro?

@jigneshchauhan2001 jigneshchauhan2001 Jun 23, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed if condition on incldue_dro in ibm_entitlement_key initialisation.

Comment on lines -107 to +105
workspace: shared-configs
workspace: shared-additional-configs

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't change the existing workspace, we should just add the workspace

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have restored the existing workspace.

Comment thread tekton/src/tasks/aiservice/minio.yml.j2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants