Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix kustomize_substitutions #3378

Merged

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented Jul 22, 2020

What this PR does / why we need it:
Copy kustomize_substitutions into os.environ before calling kustomize +
envsubst to ensure the values are available to envsubst.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #3375

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 22, 2020
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 22, 2020
Tiltfile Outdated
substitutions = settings.get("kustomize_substitutions", {})
for substitution in substitutions:
value = substitutions[substitution]
yaml = yaml.replace("${" + substitution + "}", value)
os.environ[substitution] = substitutions[substitution]
Copy link
Contributor

Choose a reason for hiding this comment

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

can use os.environ.update(substitutions) to simplify a bit

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I was looking at Tilt's docs on the Starlark syntax and didn't see that. Will make the change.

@alexeldeib
Copy link
Contributor

@vincepri
Copy link
Member

/milestone v0.3.8

@k8s-ci-robot k8s-ci-robot added this to the v0.3.8 milestone Jul 22, 2020
@vincepri
Copy link
Member

/test pull-cluster-api-e2e

Copy kustomize_substitutions into os.environ before calling kustomize +
envsubst to ensure the values are available to envsubst.

Signed-off-by: Andy Goldstein <[email protected]>
@ncdc ncdc force-pushed the fix-tilt-kustomize-substitutions branch from 0f55510 to d040103 Compare July 22, 2020 18:39
@ncdc
Copy link
Contributor Author

ncdc commented Jul 22, 2020

Updated, PTAL!

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2020
@alexeldeib
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit f8cac93 into kubernetes-sigs:master Jul 22, 2020
@ncdc ncdc deleted the fix-tilt-kustomize-substitutions branch October 1, 2020 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kustomize_substitutions in tilt-settings.json is broken
4 participants