fix: Turns globals.jx-* template variables into valid variable names
#6682
Conversation
In jenkins-x#6427 was added template variables to help templating. Unfortunately, template variables names must be valid go variable names to be used. Tags are still snake-cased. `jx promote` and `jx preview` now pass the following variables to helm: - `tags.jx-ns-<namespace>=true` (ex: `tags.jx-ns-jx-production=true`) - `tags.jx-<env-type>=true` (ex: `tags.jx-preview=true`) - `tags.jx-env-<env>=true` (ex: `tags.jx-env-production=true`) - `global.jxNs<namespace>=true` (ex: `global.jxNsJxProduction=true`) - `global.jx<env-type>=true` (ex: `global.jxPreview=true`) - `global.jxEnv<env>=true` (ex: `global.jxEnvProduction=true`) - `global.jxNs=<namespace>` (ex: `global.jxNs=jx-production`) - `global.jxTypeEnv=<env-type>` (ex: `global.jxTypeEnv=preview`) - `global.jxEnv=<env>` (ex: `global.jxEnv=production`) - `global.jxPreviewApp=<preview-app>` (ex: `global.jxPreviewApp=my-app`) - `global.jxPreviewPr=<preview-pr>` (ex: `global.jxPreviewPr=6`) `jx step helm install` and `jx step helm apply` now pass the following variables to helm: - `tags.jx-ns-<namespace>=true` (ex: `tags.jx-ns-jx-production=true`) - `global.jxNs<namespace>=true` (ex: `global.jxNsJxProduction=true`) - `global.jxNs=<namespace>` (ex: `global.jxNs=jx-production`) Signed-off-by: Aurélien Lambert <aure@olli-ai.com>
|
Hi @aure-olli. Thanks for your PR. I'm waiting for a jenkins-x member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/ok-to-test |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abayer The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Complementary to jenkins-x#6427 and jenkins-x#6682 all calls to `helm lint` (including `jx step helm release`) also pass some variables - `tags.jx-lint=true` - `global.jxLint=true` - `global.jxTypeEnv=lint` This avoids having `helm lint` errors when the templates are looking for variables like `.Values.global.jxNs` due to `global` being `nil` Signed-off-by: Aurélien Lambert <aure@olli-ai.com>
Complementary to #6427 and #6682 all calls to `helm lint` (including `jx step helm release`) also pass some variables - `tags.jx-lint=true` - `global.jxLint=true` - `global.jxTypeEnv=lint` This avoids having `helm lint` errors when the templates are looking for variables like `.Values.global.jxNs` due to `global` being `nil` Signed-off-by: Aurélien Lambert <aure@olli-ai.com>
Complementary to jenkins-x#6427 and jenkins-x#6682 all calls to `helm lint` (including `jx step helm release`) also pass some variables - `tags.jx-lint=true` - `global.jxLint=true` - `global.jxTypeEnv=lint` This avoids having `helm lint` errors when the templates are looking for variables like `.Values.global.jxNs` due to `global` being `nil` Signed-off-by: Aurélien Lambert <aure@olli-ai.com>
Submitter checklist
Description
In #6427 was added template variables to help templating. Unfortunately, template variables names must be valid go variable names to be used. Global variables are now camel-cased. Tags are still snake-cased, accordingly to helm example (https://helm.sh/docs/topics/charts/#tags-and-condition-fields-in-dependencies).
jx promoteandjx previewnow pass the following variables to helm:tags.jx-ns-<namespace>=true(ex:tags.jx-ns-jx-production=true)tags.jx-<env-type>=true(ex:tags.jx-preview=true)tags.jx-env-<env>=true(ex:tags.jx-env-production=true)global.jxNs<namespace>=true(ex:global.jxNsJxProduction=true)global.jx<env-type>=true(ex:global.jxPreview=true)global.jxEnv<env>=true(ex:global.jxEnvProduction=true)global.jxNs=<namespace>(ex:global.jxNs=jx-production)global.jxTypeEnv=<env-type>(ex:global.jxTypeEnv=preview)global.jxEnv=<env>(ex:global.jxEnv=production)global.jxPreviewApp=<preview-app>(ex:global.jxPreviewApp=my-app)global.jxPreviewPr=<preview-pr>(ex:global.jxPreviewPr=6)jx step helm installandjx step helm applynow pass the following variables to helm:tags.jx-ns-<namespace>=true(ex:tags.jx-ns-jx-production=true)global.jxNs<namespace>=true(ex:global.jxNsJxProduction=true)global.jxNs=<namespace>(ex:global.jxNs=jx-production)