Skip to content

Fix default config flags#107131

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
jonnylangefeld:jlf/fix-default-config-flags
Dec 20, 2021
Merged

Fix default config flags#107131
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
jonnylangefeld:jlf/fix-default-config-flags

Conversation

@jonnylangefeld
Copy link
Copy Markdown
Contributor

@jonnylangefeld jonnylangefeld commented Dec 20, 2021 •
edited by k8s-ci-robot
Loading

This is a follow up to #105520 which only changed the new default config flags in the NewKubectlCommand function if kubeConfigFlags == nil. However they are not nil because they were initialized before here:

kubernetes/staging/src/k8s.io/kubectl/pkg/cmd/cmd.go

Line 97 in 2fe968d

ConfigFlags: genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag(),

This fix uses the same defaults for both functions

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

It completes an older PR #105520 which missed to set the newly introduced default discovery burst in the NewDefaultKubectlCommand function. It only set it in the NewKubectlCommand function if kubeConfigFlags == nil, which never happened because it was already initialized in the NewDefaultKubectlCommand function as shown above.

kubernetes/staging/src/k8s.io/kubectl/pkg/cmd/cmd.go

Lines 296 to 297 in 2fe968d

if kubeConfigFlags == nil {
kubeConfigFlags = genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag().WithDiscoveryBurst(300).WithDiscoveryQPS(50.0)

The difference is demonstrated with these two builds:

Build of this PR (c4fbd35):

╰─ time ./_output/bin/kubectl get pods
NAME      READY   STATUS    RESTARTS   AGE
toolbox   1/1     Running   0          4d1h
./_output/bin/kubectl get pods  0.54s user 1.23s system 12% cpu 14.245 total

Build of current master (489fb9b):

╰─ time ./_output/bin/kubectl get pods
I1219 19:48:52.781276   28978 request.go:665] Waited for 1.196431349s due to client-side throttling, not priority and fairness, request: GET:https://10.216.1.114/apis/networking.gke.io/v1beta2?timeout=32s
I1219 19:49:02.977362   28978 request.go:665] Waited for 11.392070918s due to client-side throttling, not priority and fairness, request: GET:https://10.216.1.114/apis/kms.cnrm.cloud.google.com/v1beta1?timeout=32s
NAME      READY   STATUS    RESTARTS   AGE
toolbox   1/1     Running   0          4d1h
./_output/bin/kubectl get pods  0.56s user 1.21s system 5% cpu 31.313 total

Which issue(s) this PR fixes:

Fixes #105520

Special notes for your reviewer:

/assign @seans3 @lavalamp @justinsb @soltysh

Does this PR introduce a user-facing change?

Fix kubectl config flags incorrectly setting burst and discovery limits

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 20, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Dec 20, 2021

Hi @jonnylangefeld. 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.

Details

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-priority Indicates a PR lacks a `priority/foo` label and requires one. label Dec 20, 2021
@k8s-ci-robot k8s-ci-robot added 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 Dec 20, 2021
@jonnylangefeld
Fix default config flags
c4fbd35 
This is a follow up to kubernetes#105520 which only changed the new default config flags in the `NewKubectlCommand` function if `kubeConfigFlags == nil`. However they are not nil because they were initialized before here:
https://github.com/kubernetes/kubernetes/blob/2fe968deb6cef4feea5bd0eb435e71844e397eed/staging/src/k8s.io/kubectl/pkg/cmd/cmd.go#L97

This fix uses the same defaults for both functions

Signed-off-by: Jonny Langefeld <jonny.langefeld@gmail.com>
@jonnylangefeld jonnylangefeld force-pushed the jlf/fix-default-config-flags branch from c455982 to c4fbd35 Compare December 20, 2021 04:00
@jonnylangefeld jonnylangefeld mentioned this pull request Dec 20, 2021
Merged
@jonnylangefeld
Copy link
Copy Markdown
Contributor Author

jonnylangefeld commented Dec 20, 2021

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 20, 2021
soltysh
soltysh approved these changes Dec 20, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/triage accepted
/priority backlog
/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. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. 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. labels Dec 20, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 20, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Dec 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jonnylangefeld, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Dec 20, 2021
@jonnylangefeld
Copy link
Copy Markdown
Contributor Author

jonnylangefeld commented Dec 20, 2021

/retest

@k8s-ci-robot k8s-ci-robot merged commit 9386aa0 into kubernetes:master Dec 20, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Dec 20, 2021
@kbudde kbudde mentioned this pull request Jan 14, 2022
Closed
@ulucinar ulucinar mentioned this pull request Feb 28, 2022
Merged
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Mar 1, 2022
@eddiezane
Copy link
Copy Markdown
Member

eddiezane commented Mar 1, 2022

/release-note-edit

Fix kubectl config flags incorrectly setting burst and discovery limits

k8s-ci-robot added a commit that referenced this pull request Mar 4, 2022
@k8s-ci-robot
Merge pull request #108401 from ulucinar/automated-cherry-pick-of-#10…
4f8f197 
…7131-upstream-release-1.23

Automated cherry pick of #107131: Fix default config flags
@ulucinar ulucinar mentioned this pull request Mar 11, 2022
Closed
This was referenced May 22, 2022
Closed
Merged
@jonnylangefeld jonnylangefeld mentioned this pull request Jul 5, 2022
Closed
1 task
@jashandeep-sohi jashandeep-sohi mentioned this pull request Jul 14, 2022
Merged
@vadasambar vadasambar mentioned this pull request Aug 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@soltysh soltysh soltysh approved these changes

@seans3 seans3 Awaiting requested review from seans3

Assignees

@soltysh soltysh

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubectl 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

None yet

Milestone

v1.24

Development

Successfully merging this pull request may close these issues.

4 participants

@jonnylangefeld @k8s-ci-robot @eddiezane @soltysh