From 1c96fa21d24b847432e3775e0fd45bb251693d8c Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Thu, 23 Nov 2017 20:21:20 +0800 Subject: [PATCH] Minor cleanup in kubeadm. --- cmd/kubeadm/app/BUILD | 1 - cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go | 1 - cmd/kubeadm/app/cmd/token.go | 3 +-- cmd/kubeadm/app/phases/token/BUILD | 14 -------------- cmd/kubeadm/app/phases/upgrade/postupgrade.go | 2 +- 5 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 cmd/kubeadm/app/phases/token/BUILD diff --git a/cmd/kubeadm/app/BUILD b/cmd/kubeadm/app/BUILD index a2366dc98c1..24502fd9478 100644 --- a/cmd/kubeadm/app/BUILD +++ b/cmd/kubeadm/app/BUILD @@ -44,7 +44,6 @@ filegroup( "//cmd/kubeadm/app/phases/kubelet:all-srcs", "//cmd/kubeadm/app/phases/markmaster:all-srcs", "//cmd/kubeadm/app/phases/selfhosting:all-srcs", - "//cmd/kubeadm/app/phases/token:all-srcs", "//cmd/kubeadm/app/phases/upgrade:all-srcs", "//cmd/kubeadm/app/phases/uploadconfig:all-srcs", "//cmd/kubeadm/app/preflight:all-srcs", diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index dcf554fbabb..12e902d3ce5 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -80,7 +80,6 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { func(obj *kubeadm.NodeConfiguration, c fuzz.Continue) { c.FuzzNoCustom(obj) obj.CACertPath = "foo" - obj.CACertPath = "foo" obj.DiscoveryFile = "foo" obj.DiscoveryToken = "foo" obj.DiscoveryTokenAPIServers = []string{"foo"} diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index ee2aba0ffb8..87b8d077750 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -390,8 +390,7 @@ func getClientset(file string, dryRun bool) (clientset.Interface, error) { } return apiclient.NewDryRunClient(dryRunGetter, os.Stdout), nil } - client, err := kubeconfigutil.ClientSetFromFile(file) - return client, err + return kubeconfigutil.ClientSetFromFile(file) } func getJoinCommand(token string, kubeConfigFile string) (string, error) { diff --git a/cmd/kubeadm/app/phases/token/BUILD b/cmd/kubeadm/app/phases/token/BUILD deleted file mode 100644 index 7e76248ad95..00000000000 --- a/cmd/kubeadm/app/phases/token/BUILD +++ /dev/null @@ -1,14 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index 2eae65ab1a2..52613d4c4c1 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -58,7 +58,7 @@ func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.MasterC errs = append(errs, err) } - // Create/update RBAC rules that makes the 1.8.0+ nodes to rotate certificates and get their CSRs approved automatically + // Create/update RBAC rules that makes the nodes to rotate certificates and get their CSRs approved automatically if err := nodebootstraptoken.AutoApproveNodeCertificateRotation(client); err != nil { errs = append(errs, err) }