Skip to content

K
k3s
Commit 07d24e45 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28004 from mikedanese/fix-nil

Automatic merge from submit-queue return nil from NewClientConfig instead of empty struct This is a go convention and fixes an nil pointer in kubelet when passing in bad command line options: ``` I0624 04:12:33.333246 25404 plugins.go:141] Loaded network plugin "kubenet" E0624 04:12:33.333390 25404 runtime.go:58] Recovered from panic: "invalid memory address or nil pointer dereference" (runtime error: invalid memory address or nil pointer dereference) /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/runtime/runtime.go:52 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/runtime/runtime.go:40 /usr/local/go/src/runtime/asm_amd64.s:472 /usr/local/go/src/runtime/panic.go:443 /usr/local/go/src/runtime/panic.go:62 /usr/local/go/src/runtime/sigpanic_unix.go:24 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go:132 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/kubelet/kubelet.go:254 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/listwatch.go:80 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/reflector.go:262 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/reflector.go:204 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:86 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:87 /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:49 ``` cc @caesarxuchao @lavalamp
parents 5b50b743 3162197c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 21 deletions
cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go
View file @ 07d24e45
...@@ -155,14 +155,15 @@ func NewForConfig(c *$.Config|raw$) (*Clientset, error) { ...@@ -155,14 +155,15 @@ func NewForConfig(c *$.Config|raw$) (*Clientset, error) {
var err error var err error
$range .allGroups$ clientset.$.Group$Client, err =$.PackageName$.NewForConfig(&configShallowCopy) $range .allGroups$ clientset.$.Group$Client, err =$.PackageName$.NewForConfig(&configShallowCopy)
if err!=nil { if err!=nil {
return &clientset, err return nil, err
} }
$end$ $end$
clientset.DiscoveryClient, err = $.NewDiscoveryClientForConfig|raw$(&configShallowCopy) clientset.DiscoveryClient, err = $.NewDiscoveryClientForConfig|raw$(&configShallowCopy)
if err!=nil { if err!=nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
` `
......
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
View file @ 07d24e45
...@@ -59,14 +59,15 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -59,14 +59,15 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
var err error var err error
clientset.TestgroupClient, err = unversionedtestgroup.NewForConfig(&configShallowCopy) clientset.TestgroupClient, err = unversionedtestgroup.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil { if err != nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
// NewForConfigOrDie creates a new Clientset for the given config and // NewForConfigOrDie creates a new Clientset for the given config and
......
federation/client/clientset_generated/federation_internalclientset/clientset.go
View file @ 07d24e45
...@@ -70,18 +70,19 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -70,18 +70,19 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
var err error var err error
clientset.FederationClient, err = unversionedfederation.NewForConfig(&configShallowCopy) clientset.FederationClient, err = unversionedfederation.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy) clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil { if err != nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
// NewForConfigOrDie creates a new Clientset for the given config and // NewForConfigOrDie creates a new Clientset for the given config and
......
federation/client/clientset_generated/federation_release_1_3/clientset.go
View file @ 07d24e45
...@@ -70,18 +70,19 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -70,18 +70,19 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
var err error var err error
clientset.FederationClient, err = v1alpha1federation.NewForConfig(&configShallowCopy) clientset.FederationClient, err = v1alpha1federation.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil { if err != nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
// NewForConfigOrDie creates a new Clientset for the given config and // NewForConfigOrDie creates a new Clientset for the given config and
......
pkg/client/clientset_generated/internalclientset/clientset.go
View file @ 07d24e45
...@@ -103,30 +103,31 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -103,30 +103,31 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
var err error var err error
clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy) clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.ExtensionsClient, err = unversionedextensions.NewForConfig(&configShallowCopy) clientset.ExtensionsClient, err = unversionedextensions.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.AutoscalingClient, err = unversionedautoscaling.NewForConfig(&configShallowCopy) clientset.AutoscalingClient, err = unversionedautoscaling.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.BatchClient, err = unversionedbatch.NewForConfig(&configShallowCopy) clientset.BatchClient, err = unversionedbatch.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.RbacClient, err = unversionedrbac.NewForConfig(&configShallowCopy) clientset.RbacClient, err = unversionedrbac.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil { if err != nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
// NewForConfigOrDie creates a new Clientset for the given config and // NewForConfigOrDie creates a new Clientset for the given config and
......
pkg/client/clientset_generated/release_1_3/clientset.go
View file @ 07d24e45
...@@ -92,26 +92,27 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -92,26 +92,27 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
var err error var err error
clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy) clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.AutoscalingClient, err = v1autoscaling.NewForConfig(&configShallowCopy) clientset.AutoscalingClient, err = v1autoscaling.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.BatchClient, err = v1batch.NewForConfig(&configShallowCopy) clientset.BatchClient, err = v1batch.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return &clientset, err return nil, err
} }
clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
if err != nil { if err != nil {
glog.Errorf("failed to create the DiscoveryClient: %v", err) glog.Errorf("failed to create the DiscoveryClient: %v", err)
return nil, err
} }
return &clientset, err return &clientset, nil
} }
// NewForConfigOrDie creates a new Clientset for the given config and // NewForConfigOrDie creates a new Clientset for the given config and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment