github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #35948 from spacexnice/master

Browse Source 
Automatic merge from submit-queue

support customize repository prefix of image through environment KUBE…

## Problem
kubeadm does not support customize repository prefix of image. this prevent us from using our own image repository to deploy k8s.

## Fix
make ```gcr.io/google_containers/ ``` be configurable.
ADD environment variable KUBE_REPO_PREFIX

Signed-off-by: yaoyao.xyy <yaoyao.xyy@alibaba-inc.com>
This commit is contained in:
Kubernetes Submit Queue 2016-11-30 18:39:25 -08:00 committed by GitHub
commit 39e64fde8c
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/apis/kubeadm/env.go
View File

@ -36,6 +36,7 @@ func SetEnvParams() *EnvParams {
"host_pki_path": "/etc/kubernetes/pki", "host_pki_path": "/etc/kubernetes/pki",
"host_etcd_path": "/var/lib/etcd", "host_etcd_path": "/var/lib/etcd",
"hyperkube_image": "", "hyperkube_image": "",
"repo_prefix": "gcr.io/google_containers",
"discovery_image": fmt.Sprintf("gcr.io/google_containers/kube-discovery-%s:%s", runtime.GOARCH, "1.0"), "discovery_image": fmt.Sprintf("gcr.io/google_containers/kube-discovery-%s:%s", runtime.GOARCH, "1.0"),
"etcd_image": "", "etcd_image": "",
"component_loglevel": "--v=2", "component_loglevel": "--v=2",
@ -52,6 +53,7 @@ func SetEnvParams() *EnvParams {
HostPKIPath: envParams["host_pki_path"], HostPKIPath: envParams["host_pki_path"],
HostEtcdPath: envParams["host_etcd_path"], HostEtcdPath: envParams["host_etcd_path"],
HyperkubeImage: envParams["hyperkube_image"], HyperkubeImage: envParams["hyperkube_image"],
RepositoryPrefix: envParams["repo_prefix"],
DiscoveryImage: envParams["discovery_image"], DiscoveryImage: envParams["discovery_image"],
EtcdImage: envParams["etcd_image"], EtcdImage: envParams["etcd_image"],
ComponentLoglevel: envParams["component_loglevel"], ComponentLoglevel: envParams["component_loglevel"],

1
cmd/kubeadm/app/apis/kubeadm/types.go
View File

@ -23,6 +23,7 @@ type EnvParams struct {
HostPKIPath string HostPKIPath string
HostEtcdPath string HostEtcdPath string
HyperkubeImage string HyperkubeImage string
RepositoryPrefix string
DiscoveryImage string DiscoveryImage string
EtcdImage string EtcdImage string
ComponentLoglevel string ComponentLoglevel string

21
cmd/kubeadm/app/images/images.go
View File

@ -49,21 +49,22 @@ func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideIma
if overrideImage != "" { if overrideImage != "" {
return overrideImage return overrideImage
} }
repoPrefix := kubeadmapi.GlobalEnvParams.RepositoryPrefix
return map[string]string{ return map[string]string{
KubeEtcdImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "etcd", runtime.GOARCH, etcdVersion), KubeEtcdImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "etcd", runtime.GOARCH, etcdVersion),
KubeAPIServerImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-apiserver", runtime.GOARCH, cfg.KubernetesVersion), KubeAPIServerImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-apiserver", runtime.GOARCH, cfg.KubernetesVersion),
KubeControllerManagerImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-controller-manager", runtime.GOARCH, cfg.KubernetesVersion), KubeControllerManagerImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-controller-manager", runtime.GOARCH, cfg.KubernetesVersion),
KubeSchedulerImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-scheduler", runtime.GOARCH, cfg.KubernetesVersion), KubeSchedulerImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-scheduler", runtime.GOARCH, cfg.KubernetesVersion),
KubeProxyImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-proxy", runtime.GOARCH, cfg.KubernetesVersion), KubeProxyImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-proxy", runtime.GOARCH, cfg.KubernetesVersion),
}[image] }[image]
} }
func GetAddonImage(image string) string { func GetAddonImage(image string) string {
repoPrefix := kubeadmapi.GlobalEnvParams.RepositoryPrefix
return map[string]string{ return map[string]string{
KubeDNSImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kubedns", runtime.GOARCH, kubeDNSVersion), KubeDNSImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kubedns", runtime.GOARCH, kubeDNSVersion),
KubeDNSmasqImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "kube-dnsmasq", runtime.GOARCH, dnsmasqVersion), KubeDNSmasqImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "kube-dnsmasq", runtime.GOARCH, dnsmasqVersion),
KubeExechealthzImage: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "exechealthz", runtime.GOARCH, exechealthzVersion), KubeExechealthzImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "exechealthz", runtime.GOARCH, exechealthzVersion),
Pause: fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, "pause", runtime.GOARCH, pauseVersion), Pause: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, "pause", runtime.GOARCH, pauseVersion),
}[image] }[image]
} }