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.

Sign up for GitHub

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

Jump to bottom

Update kubectl kustomize to v4.5.4 #108994

Merged
merged 2 commits into from Mar 30, 2022
Merged

Update kubectl kustomize to v4.5.4 #108994

merged 2 commits into from Mar 30, 2022

Conversation

KnVerey
Copy link
Contributor

@KnVerey KnVerey commented Mar 24, 2022 •
edited

What type of PR is this?

/kind feature

What this PR does / why we need it:

Updates Kustomize to v4.5.4, which we released today, so that kubectl v1.24 will include it.

༶ _output/bin/kubectl version  --short --client
Client Version: v1.24.0-alpha.4.154+9c97a94ac509f6
Kustomize Version: v4.5.4

Which issue(s) this PR fixes:

n/a

Special notes for your reviewer:

Updated using the new hack/update-kustomize.sh script!

Does this PR introduce a user-facing change?

Updates `kubectl kustomize` and `kubectl apply -k` to Kustomize v4.5.4

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv4.5.4

/cc @natasha41575

@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/feature Categorizes issue or PR as related to a new feature. size/M Denotes a PR that changes 30-99 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. labels Mar 24, 2022
@k8s-ci-robot
Copy link
Contributor

@KnVerey: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added 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/dependency Issues or PRs related to dependency changes area/kubectl sig/cli Categorizes an issue or PR as relevant to SIG CLI. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 24, 2022
@natasha41575
Copy link
Contributor

The test failure is because we improved an error message in kustomize, I think you just need to update the expected error in TestKustomizeDirectoryBuilder and it should be good to go.

@natasha41575
Copy link
Contributor

/retest

@natasha41575
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 Mar 25, 2022
@natasha41575
Copy link
Contributor

/cc @liggitt

liggitt
liggitt reviewed Mar 25, 2022
View reviewed changes
vendor/modules.txt Outdated
@@ -2549,6 +2550,7 @@ sigs.k8s.io/yaml
# github.com/google/shlex => github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
# github.com/google/uuid => github.com/google/uuid v1.1.2
# github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.1
Copy link
Member

Choose a reason for hiding this comment

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

this was just moved to github.com/google/gnostic in #108644 (specifically the v0.5.7-v3refs revision to avoid tons of transitive dependencies in google/gnostic#317) ... can we avoid reintroducing two names / versions for the same dependency?

Copy link
Member

Choose a reason for hiding this comment

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

cc @Jefftree

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you, and I'm sorry for missing this. We'll make the same change on our side (kubernetes-sigs/kustomize#4538), release again, and update this PR to use the fixed versions.

@liggitt
Copy link
Member

liggitt commented Mar 25, 2022

bump looks good, addition of duplicate gnostic dep is problematic and should be resolved before merge

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2022
@natasha41575 natasha41575 mentioned this pull request Mar 25, 2022
Merged
@liggitt liggitt self-assigned this Mar 26, 2022
@liggitt liggitt added this to the v1.24 milestone Mar 26, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 27, 2022
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 28, 2022
@KnVerey KnVerey changed the title Update kubectl kustomize to v4.5.3 Update kubectl kustomize to v4.5.4 Mar 28, 2022
@liggitt
Copy link
Member

liggitt commented Mar 28, 2022

excellent, check-dependency-stats shows no new deps

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: KnVerey, liggitt

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 Mar 28, 2022
@KnVerey
Copy link
Contributor Author

KnVerey commented Mar 29, 2022

/test pull-kubernetes-e2e-kind

@pacoxu
Copy link
Member

pacoxu commented Mar 29, 2022

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 29, 2022
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 29, 2022
@KnVerey
Copy link
Contributor Author

KnVerey commented Mar 29, 2022

Rebased.

@natasha41575
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 Mar 29, 2022
@k8s-ci-robot k8s-ci-robot merged commit 1ff499a into kubernetes:master Mar 30, 2022
@KnVerey KnVerey deleted the kustomize-453 branch March 30, 2022 02:56
@github-actions github-actions bot mentioned this pull request Apr 5, 2022
Open
This was referenced Jun 3, 2022
Closed
Merged
@mikemorris mikemorris mentioned this pull request Jun 13, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@natasha41575 natasha41575 Awaiting requested review from natasha41575

Assignees

@liggitt liggitt

@natasha41575 natasha41575

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/feature Categorizes issue or PR as related to a new feature. 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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@KnVerey @k8s-ci-robot @natasha41575 @liggitt @pacoxu