rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-10 03:08:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #309 from moelsayed/update_defaults

Browse Source 
Move default system images to rancher
This commit is contained in:
Alena Prokharchyk 2018-02-03 09:00:03 -08:00 committed by GitHub
commit 110c9f3832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster.yml
View File

@ -79,16 +79,16 @@ services:
system_images: system_images:
etcd: quay.io/coreos/etcd:v3.0.17 etcd: rancher/etcd:v3.0.17
kubernetes: rancher/k8s:v1.8.5-rancher4 kubernetes: rancher/k8s:v1.8.5-rancher4
alpine: alpine:latest alpine: alpine:latest
nginx_proxy: rancher/rke-nginx-proxy:v0.1.1 nginx_proxy: rancher/rke-nginx-proxy:v0.1.1
cert_downloader: rancher/rke-cert-deployer:v0.1.1 cert_downloader: rancher/rke-cert-deployer:v0.1.1
kubernetes_services_sidecar: rancher/rke-service-sidekick:v0.1.0 kubernetes_services_sidecar: rancher/rke-service-sidekick:v0.1.0
kubedns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 kubedns: rancher/k8s-dns-kube-dns-amd64:1.14.5
dnsmasq: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 dnsmasq: rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5
kubedns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 kubedns_sidecar: rancher/k8s-dns-sidecar-amd64:1.14.5
kubedns_autoscaler: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0 kubedns_autoscaler: rancher/cluster-proportional-autoscaler-amd64:1.0.0
# all addon manifests MUST specify a namespace # all addon manifests MUST specify a namespace
addons: |- addons: |-

10
cluster/defaults.go
View File

@ -32,7 +32,7 @@ const (
DefaultKubernetesServicesSidecarImage = "rancher/rke-service-sidekick:v0.1.0" DefaultKubernetesServicesSidecarImage = "rancher/rke-service-sidekick:v0.1.0"
DefaultIngressController = "nginx" DefaultIngressController = "nginx"
DefaultEtcdImage = "quay.io/coreos/etcd:v3.0.17" DefaultEtcdImage = "rancher/etcd:v3.0.17"
DefaultK8sImage = "rancher/k8s:v1.8.5-rancher4" DefaultK8sImage = "rancher/k8s:v1.8.5-rancher4"
DefaultFlannelImage = "quay.io/coreos/flannel:v0.9.1" DefaultFlannelImage = "quay.io/coreos/flannel:v0.9.1"
@ -50,10 +50,10 @@ const (
DefaultCanalCNIImage = "quay.io/calico/cni:v1.11.0" DefaultCanalCNIImage = "quay.io/calico/cni:v1.11.0"
DefaultCanalFlannelImage = "quay.io/coreos/flannel:v0.9.1" DefaultCanalFlannelImage = "quay.io/coreos/flannel:v0.9.1"
DefaultKubeDNSImage = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5" DefaultKubeDNSImage = "rancher/k8s-dns-kube-dns-amd64:1.14.5"
DefaultDNSmasqImage = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5" DefaultDNSmasqImage = "rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.5"
DefaultKubeDNSSidecarImage = "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5" DefaultKubeDNSSidecarImage = "rancher/k8s-dns-sidecar-amd64:1.14.5"
DefaultKubeDNSAutoScalerImage = "gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0" DefaultKubeDNSAutoScalerImage = "rancher/cluster-proportional-autoscaler-amd64:1.0.0"
) )
func setDefaultIfEmptyMapValue(configMap map[string]string, key string, value string) { func setDefaultIfEmptyMapValue(configMap map[string]string, key string, value string) {