From 5521b187a7b7a31ef5f9726a1d1ec5e328b4fd62 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Sat, 3 Feb 2018 09:41:37 +0200 Subject: [PATCH] Move default system images to rancher --- cluster.yml | 10 +++++----- cluster/defaults.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cluster.yml b/cluster.yml index 29056609..c6b8c7ab 100644 --- a/cluster.yml +++ b/cluster.yml @@ -79,16 +79,16 @@ services: system_images: - etcd: quay.io/coreos/etcd:v3.0.17 + etcd: rancher/etcd:v3.0.17 kubernetes: rancher/k8s:v1.8.5-rancher4 alpine: alpine:latest nginx_proxy: rancher/rke-nginx-proxy:v0.1.1 cert_downloader: rancher/rke-cert-deployer:v0.1.1 kubernetes_services_sidecar: rancher/rke-service-sidekick:v0.1.0 - kubedns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 - dnsmasq: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 - kubedns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 - kubedns_autoscaler: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0 + kubedns: rancher/k8s-dns-kube-dns-amd64:1.14.5 + dnsmasq: rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5 + kubedns_sidecar: rancher/k8s-dns-sidecar-amd64:1.14.5 + kubedns_autoscaler: rancher/cluster-proportional-autoscaler-amd64:1.0.0 # all addon manifests MUST specify a namespace addons: |- diff --git a/cluster/defaults.go b/cluster/defaults.go index be1e77ae..34e5acb9 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -32,7 +32,7 @@ const ( DefaultKubernetesServicesSidecarImage = "rancher/rke-service-sidekick:v0.1.0" DefaultIngressController = "nginx" - DefaultEtcdImage = "quay.io/coreos/etcd:v3.0.17" + DefaultEtcdImage = "rancher/etcd:v3.0.17" DefaultK8sImage = "rancher/k8s:v1.8.5-rancher4" DefaultFlannelImage = "quay.io/coreos/flannel:v0.9.1" @@ -50,10 +50,10 @@ const ( DefaultCanalCNIImage = "quay.io/calico/cni:v1.11.0" DefaultCanalFlannelImage = "quay.io/coreos/flannel:v0.9.1" - DefaultKubeDNSImage = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5" - DefaultDNSmasqImage = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5" - DefaultKubeDNSSidecarImage = "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5" - DefaultKubeDNSAutoScalerImage = "gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0" + DefaultKubeDNSImage = "rancher/k8s-dns-kube-dns-amd64:1.14.5" + DefaultDNSmasqImage = "rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5" + DefaultKubeDNSSidecarImage = "rancher/k8s-dns-sidecar-amd64:1.14.5" + DefaultKubeDNSAutoScalerImage = "rancher/cluster-proportional-autoscaler-amd64:1.0.0" ) func setDefaultIfEmptyMapValue(configMap map[string]string, key string, value string) {