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
Upgrade kustomize-in-kubectl to v4.1.2 #101120
Conversation
/test pull-kubernetes-unit |
/test pull-kubernetes-e2e-kind-ipv6 |
fce4d23
to
b1a9ff8
Compare
/triage accepted |
@@ -39,6 +41,8 @@ type Transformers interface { | |||
// short circuiting on recursive types. | |||
func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) { | |||
overwrite := config.Overwrite | |||
overwriteWithEmptySrc := config.overwriteWithEmptyValue | |||
config.overwriteWithEmptyValue = false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change looks buggy... opened darccio/mergo#187
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rolled back to mergo v0.3.5, so no change in k8s mergo deps for now.
b1a9ff8
to
6ab3cce
Compare
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: liggitt, monopole 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 |
/test pull-kubernetes-e2e-kind-ipv6 |
…120-upstream-release-1.21 Automated cherry pick of #101120: Upgrade kustomize-in-kubectl to v4.1.2
Isn't this breaking changes such that
Also, |
It looks like there is a bad bug in newer versions: - darccio/mergo#187 - kubernetes/kubernetes#101120 (review)
What type of PR is this?
/kind bug
/sig cli
/priority important-soon
What this PR does / why we need it:
This upgrades kustomize to depend on kustomize v4.1.2.
It mitigates a concern that a user might download and use a
maliciously crafted remote configuration.
Special notes for your reviewer:
This is a
go.mod
change to upgrade the kustomizedependency from v4.0.5 to v4.1.2.
Does this PR introduce a user-facing change?
Yes with respect to kubectl v1.21, no with respect to earlier versions
of kubectl. kustomize was last upgraded on 8 March 2021 (#98946).
If a user has a
kustomization.yaml
file with values defined for thehelmChartInflationGenerator
field, and the user runsthe user will be asked to also specify the
--enable-helm
flag toallow processing to continue. Previously the
--enable-helm
flagdid not exist. This is to increase awareness that
helm template...
will be run as a subprocess to inflate a template.
Further, the
helmBin
subfield ofhelmChartInflationGenerator
fieldwill be ignored. If the helm command is anything other than simply
helm
(on the user'sPATH
), then the user must specify it via the--helm-command
flag.The
helmChartInflationGenerator
was not read at all in kubectlversions preceding v1.21.
How was this PR made?