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 “dev-env” Makefile target to work with kubectl 1.28+ #10350

Merged
merged 1 commit into from
Aug 26, 2023

Conversation

marcelocyreno
Copy link
Contributor

@marcelocyreno marcelocyreno commented Aug 25, 2023

What this PR does / why we need it:

With the introduction of PR #116720, the --short flag was set to be the default behavior of the kubectl version and later removed as an explicit option. This led to errors when executing the kubectl version --client --short. This PR amends the "dev-env" Makefile target to make it compatible with both the new and the older variants of the kubectl version.

Related: kubernetes/kubernetes#116720

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

Issue (when using kubectl >= 1.28.0):

~ kubectl version --client --short
error: unknown flag: --short
See 'kubectl version --help' for usage.

Usage on build/dev-env.sh:

KUBE_CLIENT_VERSION=$(kubectl version --client --short 2>/dev/null | grep Client | awk '{print $3}' | cut -d. -f2) || true
if [[ ${KUBE_CLIENT_VERSION} -lt 24 ]]; then
  echo "Please update kubectl to 1.24.2 or higher"
  exit 1
fi

How Has This Been Tested?

Manually

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 25, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If Ingress contributors 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 25, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @marcelocyreno. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Aug 25, 2023
@netlify
Copy link

netlify bot commented Aug 25, 2023

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 228d3ee
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/64e9605736d19e000883207d

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 25, 2023
@hakman
Copy link
Member

hakman commented Aug 25, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 25, 2023
@marcelocyreno marcelocyreno force-pushed the fixing-make-dev-env branch 2 times, most recently from f1003e2 to af4facd Compare August 25, 2023 19:02
@marcelocyreno marcelocyreno changed the title fix: Remove unsupported '--short' flag from kubectl version command Fix "dev-env" Makefile target to align with the recent changes in kubectl's version flag behavior. Aug 25, 2023
@marcelocyreno marcelocyreno changed the title Fix "dev-env" Makefile target to align with the recent changes in kubectl's version flag behavior. Fix “dev-env” Makefile target to work with kubectl 1.28+” Aug 26, 2023
@hakman
Copy link
Member

hakman commented Aug 26, 2023

/kind cleanup
/priority important-soon

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Aug 26, 2023
build/dev-env.sh Outdated Show resolved Hide resolved
@rikatz
Copy link
Contributor

rikatz commented Aug 26, 2023

/lgtm
/approve
Thanks, and thanks @hakman for the review :)

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marcelocyreno, rikatz

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 Aug 26, 2023
@marcelocyreno marcelocyreno changed the title Fix “dev-env” Makefile target to work with kubectl 1.28+” Fix “dev-env” Makefile target to work with kubectl 1.28+ Aug 26, 2023
@k8s-ci-robot k8s-ci-robot merged commit 9487907 into kubernetes:main Aug 26, 2023
40 checks passed
@marcelocyreno marcelocyreno deleted the fixing-make-dev-env branch August 28, 2023 16:15
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants