Merge pull request #13224 from sttts/sttts-fix-apiext-registration

kube/client: add to global client-go scheme in init func

pkg/kube/client.go

@@ -85,15 +85,8 @@ type Client struct {
 	kubeClient *kubernetes.Clientset
 }
 
-var addToScheme sync.Once
+func init() {
-
-// New creates a new Client.
-func New(getter genericclioptions.RESTClientGetter) *Client {
-	if getter == nil {
-		getter = genericclioptions.NewConfigFlags(true)
-	}
 	// Add CRDs to the scheme. They are missing by default.
-	addToScheme.Do(func() {
 	if err := apiextv1.AddToScheme(scheme.Scheme); err != nil {
 		// This should never happen.
 		panic(err)
@@ -101,7 +94,13 @@ func New(getter genericclioptions.RESTClientGetter) *Client {
 	if err := apiextv1beta1.AddToScheme(scheme.Scheme); err != nil {
 		panic(err)
 	}
-	})
+}
+
+// New creates a new Client.
+func New(getter genericclioptions.RESTClientGetter) *Client {
+	if getter == nil {
+		getter = genericclioptions.NewConfigFlags(true)
+	}
 	return &Client{
 		Factory: cmdutil.NewFactory(getter),
 		Log:     nopLogger,