mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #96632 from sbueringer/pr-fix-staticcheck-apiserver-server
fix staticcheck: vendor/k8s.io/apiserver/pkg/server/{options,storage}
This commit is contained in:
commit
cb8ad64243
@ -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/filters
|
||||
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/storage
|
||||
vendor/k8s.io/apiserver/pkg/storage
|
||||
vendor/k8s.io/apiserver/pkg/storage/cacher
|
||||
vendor/k8s.io/apiserver/pkg/storage/etcd3
|
||||
|
@ -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")
|
||||
} else {
|
||||
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 {
|
||||
return err
|
||||
}
|
||||
|
@ -241,7 +241,8 @@ func prefixTransformers(config *apiserverconfig.ResourceConfiguration) ([]value.
|
||||
case provider.Secretbox != nil:
|
||||
transformer, err = secretboxPrefixTransformer(provider.Secretbox)
|
||||
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 {
|
||||
return nil, fmt.Errorf("could not configure KMS plugin %q, error: %v", provider.KMS.Name, err)
|
||||
}
|
||||
|
@ -76,7 +76,6 @@ func TestServerRunWithSNI(t *testing.T) {
|
||||
|
||||
// optional ip or hostname to pass to NewLoopbackClientConfig
|
||||
LoopbackClientBindAddressOverride string
|
||||
ExpectLoopbackClientError bool
|
||||
}{
|
||||
"only one cert": {
|
||||
Cert: TestCertSpec{
|
||||
@ -314,9 +313,10 @@ func TestServerRunWithSNI(t *testing.T) {
|
||||
return nil
|
||||
})
|
||||
preparedServer := s.PrepareRun()
|
||||
preparedServerErrors := make(chan error)
|
||||
go func() {
|
||||
if err := preparedServer.Run(stopCh); err != nil {
|
||||
t.Fatal(err)
|
||||
preparedServerErrors <- err
|
||||
}
|
||||
}()
|
||||
|
||||
@ -356,15 +356,7 @@ func TestServerRunWithSNI(t *testing.T) {
|
||||
host = test.LoopbackClientBindAddressOverride
|
||||
}
|
||||
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)
|
||||
if err != nil {
|
||||
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) {
|
||||
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:
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -35,9 +35,8 @@ import (
|
||||
var (
|
||||
v1GroupVersion = schema.GroupVersion{Group: "", Version: "v1"}
|
||||
|
||||
scheme = runtime.NewScheme()
|
||||
codecs = serializer.NewCodecFactory(scheme)
|
||||
parameterCodec = runtime.NewParameterCodec(scheme)
|
||||
scheme = runtime.NewScheme()
|
||||
codecs = serializer.NewCodecFactory(scheme)
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
Loading…
Reference in New Issue
Block a user