1 files changed, 28 insertions, 27 deletions
diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml
index d9c044b6..71c0c622 100644
--- a/ansible/roles/rke/defaults/main.yml
+++ b/ansible/roles/rke/defaults/main.yml
@@ -6,6 +6,7 @@ kube_config_dir: "{{ ansible_env.HOME }}/.kube"
 cluster_config_dir: "{{ app_data_path }}/cluster"
 # Whether dashboard is exposed.
 rke_dashboard_exposed: true
+rke_dns: {}
 rke_etcd:
   # By default rke creates bind mount:
   # /var/lib/etcd -> /var/lib/rancher/etcd
@@ -48,30 +49,30 @@ rke_etcd:
 
 rke:
   # rke (rancher) images
-  etcd: rancher/coreos-etcd:v3.2.24-rancher1
-  alpine: rancher/rke-tools:v0.1.27
-  nginx_proxy: rancher/rke-tools:v0.1.27
-  cert_downloader: rancher/rke-tools:v0.1.27
-  kubernetes_services_sidecar: rancher/rke-tools:v0.1.27
-  kubedns: rancher/k8s-dns-kube-dns:1.15.0
-  dnsmasq: rancher/k8s-dns-dnsmasq-nanny:1.15.0
-  kubedns_sidecar: rancher/k8s-dns-sidecar:1.15.0
-  kubedns_autoscaler: rancher/cluster-proportional-autoscaler:1.0.0
-  coredns: coredns/coredns:1.2.6
-  coredns_autoscaler: rancher/cluster-proportional-autoscaler:1.0.0
-  kubernetes: rancher/hyperkube:v1.13.5-rancher1
-  flannel: rancher/coreos-flannel:v0.10.0-rancher1
-  flannel_cni: rancher/flannel-cni:v0.3.0-rancher1
-  calico_node: rancher/calico-node:v3.4.0
-  calico_cni: rancher/calico-cni:v3.4.0
-  calico_controllers: ""
-  calico_ctl: rancher/calico-ctl:v2.0.0
-  canal_node: rancher/calico-node:v3.4.0
-  canal_cni: rancher/calico-cni:v3.4.0
-  canal_flannel: rancher/coreos-flannel:v0.10.0
-  weave_node: weaveworks/weave-kube:2.5.0
-  weave_cni: weaveworks/weave-npc:2.5.0
-  pod_infra_container: rancher/pause:3.1
-  ingress: rancher/nginx-ingress-controller:0.21.0-rancher3
-  ingress_backend: rancher/nginx-ingress-controller-defaultbackend:1.4-rancher1
-  metrics_server: rancher/metrics-server:v0.3.1
+  etcd: "rancher/coreos-etcd:v3.3.10-rancher1"
+  alpine: "rancher/rke-tools:v0.1.50"
+  nginx_proxy: "rancher/rke-tools:v0.1.50"
+  cert_downloader: "rancher/rke-tools:v0.1.50"
+  kubernetes_services_sidecar: "rancher/rke-tools:v0.1.50"
+  kubedns: "rancher/k8s-dns-kube-dns:1.15.0"
+  dnsmasq: "rancher/k8s-dns-dnsmasq-nanny:1.15.0"
+  kubedns_sidecar: "rancher/k8s-dns-sidecar:1.15.0"
+  kubedns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0"
+  coredns: "rancher/coredns-coredns:1.3.1"
+  coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0"
+  kubernetes: "rancher/hyperkube:v1.15.4-rancher1"
+  flannel: "rancher/coreos-flannel:v0.11.0-rancher1"
+  flannel_cni: "rancher/flannel-cni:v0.3.0-rancher5"
+  calico_node: "rancher/calico-node:v3.7.4"
+  calico_cni: "rancher/calico-cni:v3.7.4"
+  calico_controllers: "rancher/calico-kube-controllers:v3.7.4"
+  calico_ctl: "rancher/calico-ctl:v2.0.0"
+  canal_node: "rancher/calico-node:v3.7.4"
+  canal_cni: "rancher/calico-cni:v3.7.4"
+  canal_flannel: "rancher/coreos-flannel:v0.11.0"
+  weave_node: "weaveworks/weave-kube:2.5.2"
+  weave_cni: "weaveworks/weave-npc:2.5.2"
+  pod_infra_container: "rancher/pause:3.1"
+  ingress: "rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"
+  ingress_backend: "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1"
+  metrics_server: "rancher/metrics-server:v0.3.3"