From eb1492bb001013d8c5a1da9b4366f5e6dc44fb34 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Mon, 2 May 2022 19:25:47 +0800 Subject: [PATCH] kubeadm: replace *clientset.Clientset with clientset.Interface for join phase --- cmd/kubeadm/app/cmd/join.go | 12 ++++++------ cmd/kubeadm/app/cmd/phases/join/checketcd.go | 2 +- cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go | 4 ++-- cmd/kubeadm/app/cmd/phases/join/data.go | 2 +- cmd/kubeadm/app/cmd/phases/join/data_test.go | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index fa0b07e3631..eed57d69cce 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -145,7 +145,7 @@ type joinData struct { cfg *kubeadmapi.JoinConfiguration initCfg *kubeadmapi.InitConfiguration tlsBootstrapCfg *clientcmdapi.Config - clientSet *clientset.Clientset + client clientset.Interface ignorePreflightErrors sets.String outputWriter io.Writer patchesDir string @@ -547,10 +547,10 @@ func (j *joinData) InitCfg() (*kubeadmapi.InitConfiguration, error) { return initCfg, err } -// ClientSet returns the ClientSet for accessing the cluster with the identity defined in admin.conf. -func (j *joinData) ClientSet() (*clientset.Clientset, error) { - if j.clientSet != nil { - return j.clientSet, nil +// Client returns the Client for accessing the cluster with the identity defined in admin.conf. +func (j *joinData) Client() (clientset.Interface, error) { + if j.client != nil { + return j.client, nil } path := filepath.Join(j.KubeConfigDir(), kubeadmconstants.AdminKubeConfigFileName) @@ -558,7 +558,7 @@ func (j *joinData) ClientSet() (*clientset.Clientset, error) { if err != nil { return nil, errors.Wrap(err, "[preflight] couldn't create Kubernetes client") } - j.clientSet = client + j.client = client return client, nil } diff --git a/cmd/kubeadm/app/cmd/phases/join/checketcd.go b/cmd/kubeadm/app/cmd/phases/join/checketcd.go index f663b3d7e0c..e7cca6c16ad 100644 --- a/cmd/kubeadm/app/cmd/phases/join/checketcd.go +++ b/cmd/kubeadm/app/cmd/phases/join/checketcd.go @@ -61,7 +61,7 @@ func runCheckEtcdPhase(c workflow.RunData) error { // Checks that the etcd cluster is healthy // NB. this check cannot be implemented before because it requires the admin.conf and all the certificates // for connecting to etcd already in place - client, err := data.ClientSet() + client, err := data.Client() if err != nil { return err } diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go index 55e1f2e296b..97e7408a98e 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go +++ b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go @@ -116,7 +116,7 @@ func runEtcdPhase(c workflow.RunData) error { } // gets access to the cluster using the identity defined in admin.conf - client, err := data.ClientSet() + client, err := data.Client() if err != nil { return errors.Wrap(err, "couldn't create Kubernetes client") } @@ -180,7 +180,7 @@ func runMarkControlPlanePhase(c workflow.RunData) error { } // gets access to the cluster using the identity defined in admin.conf - client, err := data.ClientSet() + client, err := data.Client() if err != nil { return errors.Wrap(err, "couldn't create Kubernetes client") } diff --git a/cmd/kubeadm/app/cmd/phases/join/data.go b/cmd/kubeadm/app/cmd/phases/join/data.go index ea0b8433139..a988582ff6f 100644 --- a/cmd/kubeadm/app/cmd/phases/join/data.go +++ b/cmd/kubeadm/app/cmd/phases/join/data.go @@ -33,7 +33,7 @@ type JoinData interface { Cfg() *kubeadmapi.JoinConfiguration TLSBootstrapCfg() (*clientcmdapi.Config, error) InitCfg() (*kubeadmapi.InitConfiguration, error) - ClientSet() (*clientset.Clientset, error) + Client() (clientset.Interface, error) IgnorePreflightErrors() sets.String OutputWriter() io.Writer PatchesDir() string diff --git a/cmd/kubeadm/app/cmd/phases/join/data_test.go b/cmd/kubeadm/app/cmd/phases/join/data_test.go index d27f283af38..3fb696b0c30 100644 --- a/cmd/kubeadm/app/cmd/phases/join/data_test.go +++ b/cmd/kubeadm/app/cmd/phases/join/data_test.go @@ -36,7 +36,7 @@ func (j *testJoinData) CertificateKey() string { return func (j *testJoinData) Cfg() *kubeadmapi.JoinConfiguration { return nil } func (j *testJoinData) TLSBootstrapCfg() (*clientcmdapi.Config, error) { return nil, nil } func (j *testJoinData) InitCfg() (*kubeadmapi.InitConfiguration, error) { return nil, nil } -func (j *testJoinData) ClientSet() (*clientset.Clientset, error) { return nil, nil } +func (j *testJoinData) Client() (clientset.Interface, error) { return nil, nil } func (j *testJoinData) IgnorePreflightErrors() sets.String { return nil } func (j *testJoinData) OutputWriter() io.Writer { return nil } func (j *testJoinData) PatchesDir() string { return "" }