kubeadm: remove arch suffix from control plane images

This change removes arch suffixes from control plane images (etcd,
kube-apiserver, kube-scheduler, kube-proxy, etc.). These are not needed, as
almost all control plane images have a fat manifest now.

We have arch suffixes only for kube-dns images now.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
This commit is contained in:
Rostislav M. Georgiev 2018-08-03 11:53:35 +03:00
parent 029bb4e213
commit 14dbfdcc3b
5 changed files with 8 additions and 13 deletions

View File

@ -43,7 +43,7 @@ func GetKubeControlPlaneImage(image string, cfg *kubeadmapi.ClusterConfiguration
} }
repoPrefix := cfg.GetControlPlaneImageRepository() repoPrefix := cfg.GetControlPlaneImageRepository()
kubernetesImageTag := kubeadmutil.KubernetesVersionToImageTag(cfg.KubernetesVersion) kubernetesImageTag := kubeadmutil.KubernetesVersionToImageTag(cfg.KubernetesVersion)
return GetGenericArchImage(repoPrefix, image, kubernetesImageTag) return GetGenericImage(repoPrefix, image, kubernetesImageTag)
} }
// GetEtcdImage generates and returns the image for etcd or returns cfg.Etcd.Local.Image if specified // GetEtcdImage generates and returns the image for etcd or returns cfg.Etcd.Local.Image if specified
@ -56,7 +56,7 @@ func GetEtcdImage(cfg *kubeadmapi.ClusterConfiguration) string {
if err == nil { if err == nil {
etcdImageTag = etcdImageVersion.String() etcdImageTag = etcdImageVersion.String()
} }
return GetGenericArchImage(cfg.ImageRepository, constants.Etcd, etcdImageTag) return GetGenericImage(cfg.ImageRepository, constants.Etcd, etcdImageTag)
} }
// GetAllImages returns a list of container images kubeadm expects to use on a control plane node // GetAllImages returns a list of container images kubeadm expects to use on a control plane node

View File

@ -59,7 +59,7 @@ func TestGetKubeControlPlaneImage(t *testing.T) {
}, },
{ {
image: constants.KubeAPIServer, image: constants.KubeAPIServer,
expected: GetGenericArchImage(gcrPrefix, "kube-apiserver", expected), expected: GetGenericImage(gcrPrefix, "kube-apiserver", expected),
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix, ImageRepository: gcrPrefix,
KubernetesVersion: testversion, KubernetesVersion: testversion,
@ -67,7 +67,7 @@ func TestGetKubeControlPlaneImage(t *testing.T) {
}, },
{ {
image: constants.KubeControllerManager, image: constants.KubeControllerManager,
expected: GetGenericArchImage(gcrPrefix, "kube-controller-manager", expected), expected: GetGenericImage(gcrPrefix, "kube-controller-manager", expected),
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix, ImageRepository: gcrPrefix,
KubernetesVersion: testversion, KubernetesVersion: testversion,
@ -75,7 +75,7 @@ func TestGetKubeControlPlaneImage(t *testing.T) {
}, },
{ {
image: constants.KubeScheduler, image: constants.KubeScheduler,
expected: GetGenericArchImage(gcrPrefix, "kube-scheduler", expected), expected: GetGenericImage(gcrPrefix, "kube-scheduler", expected),
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix, ImageRepository: gcrPrefix,
KubernetesVersion: testversion, KubernetesVersion: testversion,
@ -110,7 +110,7 @@ func TestGetEtcdImage(t *testing.T) {
}, },
}, },
{ {
expected: GetGenericArchImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion), expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion),
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: gcrPrefix, ImageRepository: gcrPrefix,
KubernetesVersion: testversion, KubernetesVersion: testversion,

View File

@ -108,7 +108,5 @@ spec:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
- operator: Exists - operator: Exists
nodeSelector:
beta.kubernetes.io/arch: {{ .Arch }}
` `
) )

View File

@ -19,7 +19,6 @@ package proxy
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"runtime"
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -75,9 +74,8 @@ func EnsureProxyAddon(cfg *kubeadmapi.InitConfiguration, client clientset.Interf
if err != nil { if err != nil {
return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err) return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err)
} }
proxyDaemonSetBytes, err = kubeadmutil.ParseTemplate(KubeProxyDaemonSet19, struct{ Image, Arch string }{ proxyDaemonSetBytes, err = kubeadmutil.ParseTemplate(KubeProxyDaemonSet19, struct{ Image string }{
Image: images.GetKubeControlPlaneImage(constants.KubeProxy, &cfg.ClusterConfiguration), Image: images.GetKubeControlPlaneImage(constants.KubeProxy, &cfg.ClusterConfiguration),
Arch: runtime.GOARCH,
}) })
if err != nil { if err != nil {
return fmt.Errorf("error when parsing kube-proxy daemonset template: %v", err) return fmt.Errorf("error when parsing kube-proxy daemonset template: %v", err)

View File

@ -108,9 +108,8 @@ func TestCompileManifests(t *testing.T) {
}, },
{ {
manifest: KubeProxyDaemonSet19, manifest: KubeProxyDaemonSet19,
data: struct{ Image, Arch string }{ data: struct{ Image string }{
Image: "foo", Image: "foo",
Arch: "foo",
}, },
expected: true, expected: true,
}, },