From 30e4ba74a8d499f3f55277083bc1d05bed3d9529 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Fri, 9 Feb 2018 16:17:48 -0800 Subject: [PATCH] Remove unused getClusterCIDR() getClusterCIDR() has been unused since the PR 57305[1], so this removes the method for code cleanup. [1]: https://github.com/kubernetes/kubernetes/pull/57305 --- cmd/kubeadm/app/phases/addons/proxy/proxy.go | 9 +-------- .../app/phases/addons/proxy/proxy_test.go | 17 ----------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy.go b/cmd/kubeadm/app/phases/addons/proxy/proxy.go index 6df557fbc13..a5e3dd2d1a4 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy.go @@ -77,7 +77,7 @@ func EnsureProxyAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Inte if err != nil { return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err) } - proxyDaemonSetBytes, err = kubeadmutil.ParseTemplate(KubeProxyDaemonSet19, struct{ ImageRepository, Arch, Version, ImageOverride, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{ + proxyDaemonSetBytes, err = kubeadmutil.ParseTemplate(KubeProxyDaemonSet19, struct{ ImageRepository, Arch, Version, ImageOverride, MasterTaintKey, CloudTaintKey string }{ ImageRepository: cfg.GetControlPlaneImageRepository(), Arch: runtime.GOARCH, Version: kubeadmutil.KubernetesVersionToImageTag(cfg.KubernetesVersion), @@ -154,10 +154,3 @@ func createClusterRoleBindings(client clientset.Interface) error { }, }) } - -func getClusterCIDR(podsubnet string) string { - if len(podsubnet) == 0 { - return "" - } - return "- --cluster-cidr=" + podsubnet -} diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go index 69cf755d011..01345234375 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go @@ -90,23 +90,6 @@ func TestCreateServiceAccount(t *testing.T) { } } -func TestGetClusterCIDR(t *testing.T) { - emptyClusterCIDR := getClusterCIDR("") - if emptyClusterCIDR != "" { - t.Errorf("Invalid format: %s", emptyClusterCIDR) - } - - clusterCIDR := getClusterCIDR("10.244.0.0/16") - if clusterCIDR != "- --cluster-cidr=10.244.0.0/16" { - t.Errorf("Invalid format: %s", clusterCIDR) - } - - clusterIPv6CIDR := getClusterCIDR("2001:db8::/64") - if clusterIPv6CIDR != "- --cluster-cidr=2001:db8::/64" { - t.Errorf("Invalid format: %s", clusterIPv6CIDR) - } -} - func TestCompileManifests(t *testing.T) { var tests = []struct { manifest string