From 61cd585ad2e6db6044ee1679fb1907e68e0f3d67 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Wed, 28 Sep 2022 12:36:54 +0800 Subject: [PATCH] kubeadm: remove redundant import alias and unused apiclient util funcs --- cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go | 4 ++-- cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go | 4 ++-- cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go | 2 +- cmd/kubeadm/app/phases/certs/certs.go | 2 +- .../app/phases/certs/renewal/filerenewer_test.go | 2 +- cmd/kubeadm/app/phases/certs/renewal/readwriter.go | 2 +- .../app/phases/certs/renewal/readwriter_test.go | 2 +- cmd/kubeadm/app/phases/copycerts/copycerts.go | 2 +- cmd/kubeadm/app/phases/copycerts/copycerts_test.go | 2 +- cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go | 2 +- cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go | 2 +- cmd/kubeadm/app/util/apiclient/idempotency.go | 12 ------------ cmd/kubeadm/app/util/certs/util.go | 2 +- 13 files changed, 14 insertions(+), 26 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go index c51831b7c50..d2db947cf02 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go @@ -20,10 +20,10 @@ import ( "unsafe" corev1 "k8s.io/api/core/v1" - conversion "k8s.io/apimachinery/pkg/conversion" + "k8s.io/apimachinery/pkg/conversion" bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func Convert_kubeadm_InitConfiguration_To_v1beta2_InitConfiguration(in *kubeadm.InitConfiguration, out *InitConfiguration, s conversion.Scope) error { diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go index 81497856f50..8f73af79e23 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go @@ -17,9 +17,9 @@ limitations under the License. package v1beta3 import ( - conversion "k8s.io/apimachinery/pkg/conversion" + "k8s.io/apimachinery/pkg/conversion" - kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func Convert_kubeadm_InitConfiguration_To_v1beta3_InitConfiguration(in *kubeadm.InitConfiguration, out *InitConfiguration, s conversion.Scope) error { diff --git a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go index 7f2c6562e3f..a8c3d4aeae4 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - clientcmd "k8s.io/client-go/tools/clientcmd" + "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index 22a736088d3..7c823960fe5 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -32,7 +32,7 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) var ( diff --git a/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go b/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go index 6b3b060bbda..1847c7cd14e 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go @@ -22,7 +22,7 @@ import ( certutil "k8s.io/client-go/util/cert" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) func TestFileRenewer(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/certs/renewal/readwriter.go b/cmd/kubeadm/app/phases/certs/renewal/readwriter.go index 7cfb406d048..9924255c842 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/readwriter.go +++ b/cmd/kubeadm/app/phases/certs/renewal/readwriter.go @@ -29,7 +29,7 @@ import ( certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) // certificateReadWriter defines the behavior of a component that diff --git a/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go b/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go index 610b09d0498..9627531e9d8 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go @@ -31,7 +31,7 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" ) diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts.go b/cmd/kubeadm/app/phases/copycerts/copycerts.go index c40489298e6..df35a82a59c 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" clientset "k8s.io/client-go/kubernetes" certutil "k8s.io/client-go/util/cert" - keyutil "k8s.io/client-go/util/keyutil" + "k8s.io/client-go/util/keyutil" bootstraputil "k8s.io/cluster-bootstrap/token/util" "k8s.io/klog/v2" diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts_test.go b/cmd/kubeadm/app/phases/copycerts/copycerts_test.go index 3cc4f01a335..6bc5b384243 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts_test.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts_test.go @@ -29,7 +29,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakeclient "k8s.io/client-go/kubernetes/fake" - keyutil "k8s.io/client-go/util/keyutil" + "k8s.io/client-go/util/keyutil" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go index b300146c3e9..b9c123cfd18 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go @@ -40,7 +40,7 @@ import ( certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) const ( diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go index 459f8bf3b5c..879307e8710 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go @@ -37,7 +37,7 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" kubeconfigtestutil "k8s.io/kubernetes/cmd/kubeadm/test/kubeconfig" ) diff --git a/cmd/kubeadm/app/util/apiclient/idempotency.go b/cmd/kubeadm/app/util/apiclient/idempotency.go index c996d553453..99b831c0472 100644 --- a/cmd/kubeadm/app/util/apiclient/idempotency.go +++ b/cmd/kubeadm/app/util/apiclient/idempotency.go @@ -187,18 +187,6 @@ func CreateOrUpdateDaemonSet(client clientset.Interface, ds *apps.DaemonSet) err return nil } -// DeleteDaemonSetForeground deletes the specified DaemonSet in foreground mode; i.e. it blocks until/makes sure all the managed Pods are deleted -func DeleteDaemonSetForeground(client clientset.Interface, namespace, name string) error { - foregroundDelete := metav1.DeletePropagationForeground - return client.AppsV1().DaemonSets(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{PropagationPolicy: &foregroundDelete}) -} - -// DeleteDeploymentForeground deletes the specified Deployment in foreground mode; i.e. it blocks until/makes sure all the managed Pods are deleted -func DeleteDeploymentForeground(client clientset.Interface, namespace, name string) error { - foregroundDelete := metav1.DeletePropagationForeground - return client.AppsV1().Deployments(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{PropagationPolicy: &foregroundDelete}) -} - // CreateOrUpdateRole creates a Role if the target resource doesn't exist. If the resource exists already, this function will update the resource instead. func CreateOrUpdateRole(client clientset.Interface, role *rbac.Role) error { var lastError error diff --git a/cmd/kubeadm/app/util/certs/util.go b/cmd/kubeadm/app/util/certs/util.go index f61d836ff48..af3e638cb0f 100644 --- a/cmd/kubeadm/app/util/certs/util.go +++ b/cmd/kubeadm/app/util/certs/util.go @@ -27,7 +27,7 @@ import ( certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) // SetupCertificateAuthority is a utility function for kubeadm testing that creates a