Merge pull request #48806 from kad/use-constants

Automatic merge from submit-queue (batch tested with PRs 48333, 48806, 49046)

kubeadm: Generate kube-proxy image name in its own pkg

**What this PR does / why we need it**: code cleanup. Control kube-proxy image parameter in DaemonSet template.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
Minor cleanup. Attn @luxas 

**Release note**:
```release-note
NONE
```

cmd/kubeadm/app/images/images.go

@@ -29,7 +29,6 @@ const (
 	KubeAPIServerImage         = "apiserver"
 	KubeControllerManagerImage = "controller-manager"
 	KubeSchedulerImage         = "scheduler"
-	KubeProxyImage             = "proxy"
 
 	etcdVersion = "3.0.17"
 )
@@ -45,6 +44,5 @@ func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideIma
 		KubeAPIServerImage:         fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-apiserver", runtime.GOARCH, kubernetesImageTag),
 		KubeControllerManagerImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-controller-manager", runtime.GOARCH, kubernetesImageTag),
 		KubeSchedulerImage:         fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-scheduler", runtime.GOARCH, kubernetesImageTag),
-		KubeProxyImage:             fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-proxy", runtime.GOARCH, kubernetesImageTag),
 	}[image]
 }

cmd/kubeadm/app/images/images_test.go

@@ -62,11 +62,6 @@ func TestGetCoreImage(t *testing.T) {
 			c: &kubeadmapi.MasterConfiguration{ImageRepository: gcrPrefix, KubernetesVersion: testversion}},
 			fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-scheduler", runtime.GOARCH, expected),
 		},
-		{getCoreImageTest{
-			i: KubeProxyImage,
-			c: &kubeadmapi.MasterConfiguration{ImageRepository: gcrPrefix, KubernetesVersion: testversion}},
-			fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-proxy", runtime.GOARCH, expected),
-		},
 	}
 	for _, it := range imageTest {
 		actual := GetCoreImage(it.t.i, it.t.c, it.t.o)

cmd/kubeadm/app/phases/addons/BUILD

@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
-        "//cmd/kubeadm/app/images:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
         "//pkg/api:go_default_library",
         "//plugin/pkg/scheduler/algorithm:go_default_library",

cmd/kubeadm/app/phases/addons/addons.go

@@ -29,7 +29,6 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	"k8s.io/kubernetes/cmd/kubeadm/app/images"
 	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
@@ -45,11 +44,14 @@ func CreateEssentialAddons(cfg *kubeadmapi.MasterConfiguration, client *clientse
 		return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err)
 	}
 
-	proxyDaemonSetBytes, err := kubeadmutil.ParseTemplate(KubeProxyDaemonSet, struct{ Image, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
+	proxyDaemonSetBytes, err := kubeadmutil.ParseTemplate(KubeProxyDaemonSet, struct{ ImageRepository, Arch, Version, ImageOverride, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
-		Image:          images.GetCoreImage("proxy", cfg, cfg.UnifiedControlPlaneImage),
+		ImageRepository: cfg.ImageRepository,
-		ClusterCIDR:    getClusterCIDR(cfg.Networking.PodSubnet),
+		Arch:            runtime.GOARCH,
-		MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster,
+		Version:         kubeadmutil.KubernetesVersionToImageTag(cfg.KubernetesVersion),
-		CloudTaintKey:  algorithm.TaintExternalCloudProvider,
+		ImageOverride:   cfg.UnifiedControlPlaneImage,
+		ClusterCIDR:     getClusterCIDR(cfg.Networking.PodSubnet),
+		MasterTaintKey:  kubeadmconstants.LabelNodeRoleMaster,
+		CloudTaintKey:   algorithm.TaintExternalCloudProvider,
 	})
 	if err != nil {
 		return fmt.Errorf("error when parsing kube-proxy daemonset template: %v", err)

cmd/kubeadm/app/phases/addons/addons_test.go

@@ -54,11 +54,14 @@ func TestCompileManifests(t *testing.T) {
 		},
 		{
 			manifest: KubeProxyDaemonSet,
-			data: struct{ Image, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
+			data: struct{ ImageRepository, Arch, Version, ImageOverride, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
-				Image:          "foo",
+				ImageRepository: "foo",
-				ClusterCIDR:    "foo",
+				Arch:            "foo",
-				MasterTaintKey: "foo",
+				Version:         "foo",
-				CloudTaintKey:  "foo",
+				ImageOverride:   "foo",
+				ClusterCIDR:     "foo",
+				MasterTaintKey:  "foo",
+				CloudTaintKey:   "foo",
 			},
 			expected: true,
 		},

cmd/kubeadm/app/phases/addons/manifests.go

@@ -68,7 +68,7 @@ spec:
     spec:
       containers:
       - name: kube-proxy
-        image: {{ .Image }}
+        image: {{ if .ImageOverride }}{{ .ImageOverride }}{{ else }}{{ .ImageRepository }}/kube-proxy-{{ .Arch }}:{{ .Version }}{{ end }}
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/kube-proxy