github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96632 from sbueringer/pr-fix-staticcheck-apiserver-server

Browse Source 
fix staticcheck: vendor/k8s.io/apiserver/pkg/server/{options,storage}
This commit is contained in:
Kubernetes Prow Robot 2020-12-08 17:30:07 -08:00 committed by GitHub
commit cb8ad64243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.staticcheck_failures
View File

@ -31,10 +31,7 @@ vendor/k8s.io/apiserver/pkg/registry/rest/resttest
vendor/k8s.io/apiserver/pkg/server/dynamiccertificates vendor/k8s.io/apiserver/pkg/server/dynamiccertificates
vendor/k8s.io/apiserver/pkg/server/filters vendor/k8s.io/apiserver/pkg/server/filters
vendor/k8s.io/apiserver/pkg/server/httplog vendor/k8s.io/apiserver/pkg/server/httplog
vendor/k8s.io/apiserver/pkg/server/options
vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig
vendor/k8s.io/apiserver/pkg/server/routes vendor/k8s.io/apiserver/pkg/server/routes
vendor/k8s.io/apiserver/pkg/server/storage
vendor/k8s.io/apiserver/pkg/storage vendor/k8s.io/apiserver/pkg/storage
vendor/k8s.io/apiserver/pkg/storage/cacher vendor/k8s.io/apiserver/pkg/storage/cacher
vendor/k8s.io/apiserver/pkg/storage/etcd3 vendor/k8s.io/apiserver/pkg/storage/etcd3

3
staging/src/k8s.io/apiserver/pkg/server/options/audit.go
View File

@ -308,7 +308,8 @@ func (o *AuditOptions) ApplyTo(
klog.V(2).Info("No audit policy file provided, no events will be recorded for webhook backend") klog.V(2).Info("No audit policy file provided, no events will be recorded for webhook backend")
} else { } else {
if c.EgressSelector != nil { if c.EgressSelector != nil {
egressDialer, err := c.EgressSelector.Lookup(egressselector.ControlPlane.AsNetworkContext()) var egressDialer utilnet.DialFunc
egressDialer, err = c.EgressSelector.Lookup(egressselector.ControlPlane.AsNetworkContext())
if err != nil { if err != nil {
return err return err
} }

3
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
View File

@ -241,7 +241,8 @@ func prefixTransformers(config *apiserverconfig.ResourceConfiguration) ([]value.
case provider.Secretbox != nil: case provider.Secretbox != nil:
transformer, err = secretboxPrefixTransformer(provider.Secretbox) transformer, err = secretboxPrefixTransformer(provider.Secretbox)
case provider.KMS != nil: case provider.KMS != nil:
envelopeService, err := envelopeServiceFactory(provider.KMS.Endpoint, provider.KMS.Timeout.Duration) var envelopeService envelope.Service
envelopeService, err = envelopeServiceFactory(provider.KMS.Endpoint, provider.KMS.Timeout.Duration)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not configure KMS plugin %q, error: %v", provider.KMS.Name, err) return nil, fmt.Errorf("could not configure KMS plugin %q, error: %v", provider.KMS.Name, err)
} }

20
staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go
View File

@ -76,7 +76,6 @@ func TestServerRunWithSNI(t *testing.T) {
// optional ip or hostname to pass to NewLoopbackClientConfig // optional ip or hostname to pass to NewLoopbackClientConfig
LoopbackClientBindAddressOverride string LoopbackClientBindAddressOverride string
ExpectLoopbackClientError bool
}{ }{
"only one cert": { "only one cert": {
Cert: TestCertSpec{ Cert: TestCertSpec{
@ -314,9 +313,10 @@ func TestServerRunWithSNI(t *testing.T) {
return nil return nil
}) })
preparedServer := s.PrepareRun() preparedServer := s.PrepareRun()
preparedServerErrors := make(chan error)
go func() { go func() {
if err := preparedServer.Run(stopCh); err != nil { if err := preparedServer.Run(stopCh); err != nil {
t.Fatal(err) preparedServerErrors <- err
} }
}() }()
@ -356,15 +356,7 @@ func TestServerRunWithSNI(t *testing.T) {
host = test.LoopbackClientBindAddressOverride host = test.LoopbackClientBindAddressOverride
} }
s.LoopbackClientConfig.Host = net.JoinHostPort(host, strconv.Itoa(secureOptions.BindPort)) s.LoopbackClientConfig.Host = net.JoinHostPort(host, strconv.Itoa(secureOptions.BindPort))
if test.ExpectLoopbackClientError {
if err == nil {
t.Fatalf("expected error creating loopback client config")
}
return
}
if err != nil {
t.Fatalf("failed creating loopback client config: %v", err)
}
client, err := discovery.NewDiscoveryClientForConfig(s.LoopbackClientConfig) client, err := discovery.NewDiscoveryClientForConfig(s.LoopbackClientConfig)
if err != nil { if err != nil {
t.Fatalf("failed to create loopback client: %v", err) t.Fatalf("failed to create loopback client: %v", err)
@ -376,6 +368,12 @@ func TestServerRunWithSNI(t *testing.T) {
if expected := &v; !reflect.DeepEqual(got, expected) { if expected := &v; !reflect.DeepEqual(got, expected) {
t.Errorf("loopback client didn't get correct version info: expected=%v got=%v", expected, got) t.Errorf("loopback client didn't get correct version info: expected=%v got=%v", expected, got)
} }
select {
case err := <-preparedServerErrors:
t.Fatalf("preparedServer failed with error: %v", err)
default:
}
}) })
} }
} }

5
staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go
View File

@ -35,9 +35,8 @@ import (
var ( var (
v1GroupVersion = schema.GroupVersion{Group: "", Version: "v1"} v1GroupVersion = schema.GroupVersion{Group: "", Version: "v1"}
scheme = runtime.NewScheme() scheme = runtime.NewScheme()
codecs = serializer.NewCodecFactory(scheme) codecs = serializer.NewCodecFactory(scheme)
parameterCodec = runtime.NewParameterCodec(scheme)
) )
func init() { func init() {