github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87485 from gavinfish/kubectl_pkg_config

Browse Source 
Staticcheck: vendor/k8s.io/kubectl/pkg/cmd/exec|config|certificates
This commit is contained in:
Kubernetes Prow Robot 2020-02-29 02:26:39 -08:00 committed by GitHub
commit 665c6648eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.staticcheck_failures
View File

@ -92,10 +92,7 @@ vendor/k8s.io/client-go/restmapper
vendor/k8s.io/client-go/tools/leaderelection
vendor/k8s.io/client-go/transport
vendor/k8s.io/component-base/metrics
vendor/k8s.io/kubectl/pkg/cmd/certificates
vendor/k8s.io/kubectl/pkg/cmd/config
vendor/k8s.io/kubectl/pkg/cmd/edit
vendor/k8s.io/kubectl/pkg/cmd/exec
vendor/k8s.io/kubectl/pkg/cmd/get
vendor/k8s.io/kubectl/pkg/cmd/scale
vendor/k8s.io/kubectl/pkg/cmd/set

2
staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go
View File

@ -234,7 +234,7 @@ func (o *CertificateOptions) modifyCertificateCondition(builder *resource.Builde
csr := info.Object.(*certificatesv1beta1.CertificateSigningRequest)
csr, hasCondition := modify(csr)
if !hasCondition || force {
csr, err = clientSet.CertificateSigningRequests().UpdateApproval(csr)
_, err = clientSet.CertificateSigningRequests().UpdateApproval(csr)
if errors.IsConflict(err) && i < 10 {
if err := info.Get(); err != nil {
return err

1
staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go
View File

@ -37,7 +37,6 @@ import (
type createAuthInfoOptions struct {
configAccess clientcmd.ConfigAccess
name string
authPath cliflag.StringFlag
clientCertificate cliflag.StringFlag
clientKey cliflag.StringFlag
token cliflag.StringFlag

7
staging/src/k8s.io/kubectl/pkg/cmd/config/navigation_step_parser.go
View File

@ -92,13 +92,6 @@ func (s *navigationSteps) pop() navigationStep {
return navigationStep{}
}
func (s *navigationSteps) peek() navigationStep {
if s.moreStepsRemaining() {
return s.steps[s.currentStepIndex]
}
return navigationStep{}
}
func (s *navigationSteps) moreStepsRemaining() bool {
return len(s.steps) > s.currentStepIndex
}

3
staging/src/k8s.io/kubectl/pkg/cmd/config/unset_test.go
View File

@ -125,6 +125,9 @@ func (test unsetConfigTest) run(t *testing.T) {
if err == nil {
err = opts.run(buf)
}
if test.expectedErr == "" && err != nil {
t.Fatalf("unexpected error: %v", err)
}
config, err := clientcmd.LoadFromFile(fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error loading kubeconfig file: %v", err)

2
staging/src/k8s.io/kubectl/pkg/cmd/config/view.go
View File

@ -65,8 +65,6 @@ var (
# Get the password for the e2e user
kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'`)
defaultOutputFormat = "yaml"
)
// NewCmdConfigView returns a Command instance for 'config view' sub command

5
staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go
View File

@ -148,6 +148,9 @@ func TestPodAndContainer(t *testing.T) {
options.ErrOut = bytes.NewBuffer([]byte{})
options.Out = bytes.NewBuffer([]byte{})
err = options.Complete(tf, cmd, test.args, test.argsLenAtDash)
if !test.expectError && err != nil {
t.Errorf("%s: unexpected error: %v", test.name, err)
}
err = options.Validate()
if test.expectError && err == nil {
@ -160,7 +163,7 @@ func TestPodAndContainer(t *testing.T) {
return
}
pod, err := options.ExecutablePodFn(tf, test.obj, defaultPodExecTimeout)
pod, _ := options.ExecutablePodFn(tf, test.obj, defaultPodExecTimeout)
if pod.Name != test.expectedPod {
t.Errorf("%s: expected: %s, got: %s", test.name, test.expectedPod, options.PodName)
}