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

Upgrade kustomize-in-kubectl to v4.0.5 #98946

Merged
merged 3 commits into from Mar 9, 2021

Conversation

monopole
Copy link
Contributor

@monopole monopole commented Feb 10, 2021

What type of PR is this?

/kind bug
/kind cleanup
/sig cli
/priority important-soon

What this PR does / why we need it:

Fixes kubernetes-sigs/kustomize#1500
Fixes kubernetes/kubectl#818

Special notes for your reviewer:

This PR has these commits:

  1. Deletion of staging/src/k8s.io/cli-runtime/pkg/kustomize/k8sdeps.
  2. Manual edits to these five files under staging/src/k8s.io/:
    • cli-runtime/pkg/resource/builder.go
    • cli-runtime/pkg/resource/kustomizevisitor.go
    • cli-runtime/pkg/resource/kustomizevisitor_test.go
    • cli-runtime/pkg/resource/visitor.go
    • kubectl/pkg/cmd/kustomize/kustomize.go
  3. Runs of update-vendor, lint-dependencies, pin-dependency, update-internal-modules (till linter succeeded).

Only the second commit has manual code edits. The change in kustomizevisitor_test.go is due to a bug fix (kubernetes-sigs/kustomize#1899).

Deletion of the old code results in many dependency upgrades, and associated vendor updates.

Does this PR introduce a user-facing change?:

Updates the commands 
 * kubectl kustomize {arg}
 * kubectl apply -k {arg}
to use same code as kustomize CLI v4.0.5
 - [v4.0.5]: https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv4.0.5

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 10, 2021
@monopole monopole changed the title Upgrade kustomize Upgrade kustomize-in-kubectl to use kustomize/api@v0.8.0 Feb 10, 2021
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

  1. these files should not be checked in and are left behind by buggy unit tests: unit tests leaving behind xtables.lock #98947
  • pkg/util/iptables/xtables-103516112.lock
  • pkg/util/iptables/xtables-103657263.lock
  • pkg/util/iptables/xtables-104036897.lock
  1. This is a pretty huge diff 😬
  2. Some of the dependencies appear to be under licenses that are not approved by the CNCF

Does this totally resolve the k8sdeps thing?

staging/src/k8s.io/mount-utils/go.mod Outdated Show resolved Hide resolved
LICENSES/vendor/github.com/hashicorp/errwrap/LICENSE Outdated Show resolved Hide resolved
LICENSES/vendor/github.com/yujunz/go-getter/LICENSE Outdated Show resolved Hide resolved
@monopole monopole changed the title Upgrade kustomize-in-kubectl to use kustomize/api@v0.8.0 Upgrade kustomize-in-kubectl to kustomize@v3.10.0 Feb 10, 2021
@ehashman
Copy link
Member

/remove-sig instrumentation
/remove-sig node
/assign @dims

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@monopole
Copy link
Contributor Author

monopole commented Mar 9, 2021

@dims, thanks. Just pushed a fresh rebase.

@liggitt
Copy link
Member

liggitt commented Mar 9, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@monopole
Copy link
Contributor Author

monopole commented Mar 9, 2021

/test pull-kubernetes-integration

@liggitt liggitt removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 9, 2021
@liggitt
Copy link
Member

liggitt commented Mar 9, 2021

/skip

@kubernetes kubernetes deleted a comment from k8s-ci-robot Mar 9, 2021
@liggitt liggitt added this to the v1.21 milestone Mar 9, 2021
@k8s-ci-robot k8s-ci-robot merged commit ff3ccc5 into kubernetes:master Mar 9, 2021
@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 9, 2021
cedarkuo added a commit to cedarkuo/kustomize that referenced this pull request Sep 27, 2021
…ple.

Kubernetes v1.21 upgrade kustomize-in-kubectl to v4.0.5. kubernetes/kubernetes#98946
So I think this example could update back to use resources instead of bases?
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. area/apiserver area/cloudprovider area/code-generation area/conformance Issues or PRs related to kubernetes conformance tests area/dependency Issues or PRs related to dependency changes area/kubectl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Development

Successfully merging this pull request may close these issues.

Update kustomize in kubectl Update kustomize version that's shipped in kubectl?