[patch] remove ibm_entitlement_key from Tekton param flow and source from secrets - #397
Merged
Conversation
jigneshchauhan2001
marked this pull request as draft
June 22, 2026 15:45
whitfiea
requested changes
Jun 23, 2026
jigneshchauhan2001
marked this pull request as ready for review
July 1, 2026 10:31
whitfiea
approved these changes
Jul 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ibm_entitlement_keywas appearing as plaintext in pod environment variables and being passed through MAS install/restore PipelineRuns into pod specs via tekton parameters.This change removes
ibm_entitlement_keyfrom the Tekton parameter flow and updates all affected task pods under /tekton/src/tasks to readIBM_ENTITLEMENT_KEYdirectly from the Kubernetes secretpipeline-additional-configsviasecretKeyRef. It also extends the mas-restore pipeline to carry theshared-additional-configsworkspace so the restore flow has the same secret access as install.It also applies the SLS speific-fix in /cli/tekton/src/tasks/dependencies/sls.yml.j2 so
IBM_ENTITLEMENT_KEYis not injected into the SLS pod for newer SLS channel paths (sls_channel > 3.7.0).Changes
Removed
ibm_entitlement_keyparam from PipelineRuns from templates under src/mas/devops/templates/./src/mas/devops/tekton.py updated to write secret:
prepareInstallSecrets() - updated to writeIBM_ENTITLEMENT_KEY into
pipeline-additional-configssecret when providedprepareRestoreSecrets() - same behaviour as prepareInstallSecrets() for the restore pipeline flow; creates
pipeline-additional-configssecret in the target namespace.Added
shared-additional-configsworkspace binding (backed bypipeline-additional-configs secret) to /src/mas/devops/templates/pipelinerun-aiservice-upgrade.yml.j2.Added
shared-additional-configsworkspace binding to /src/mas/devops/templates/pipelinerun-restore.yml.j2.Validation
Validation details are attached in
MAS-Core-Manage-PFVT-Cluster-Validations.docx for cluster and PFVT validations.
AIService-PFVT-Cluster-Validations.docx for cluster and PFVT validations.
Both files contain OC CLI validations and OpenShift UI validations confirming:
ibm_entitlement_keyas a parameterpipeline-additional-configscontainsIBM_ENTITLEMENT_KEYvalueFrom.secretKeyRef- no plaintext valueibm_entitlement_keyparam nameValidated on Fyre OCP cluster:
fvt-corecompleted successfully.fvt-managecompleted successfully.FVT results:
MASCore: https://dashboard.ibmmas.com/tests/fixsecurity/3291
AIService: https://dashboard.ibmmas.com/tests/fixsecurity/3305