parametrize dashboardh and dns images
Change-Id: I70d0984f71d5d8f946c26f5457136f6b9c3a2495
diff --git a/kubernetes/files/kube-addons/dashboard/dashboard-controller.yaml b/kubernetes/files/kube-addons/dashboard/dashboard-controller.yaml
index 46517de..371b4ca 100644
--- a/kubernetes/files/kube-addons/dashboard/dashboard-controller.yaml
+++ b/kubernetes/files/kube-addons/dashboard/dashboard-controller.yaml
@@ -1,3 +1,4 @@
+{%- from "kubernetes/map.jinja" import common with context -%}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@@ -24,7 +25,7 @@
effect: NoSchedule
containers:
- name: kubernetes-dashboard
- image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+ image: {{ common.addons.dashboard.get('image', 'gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1') }}
resources:
# keep request = limit to keep this container in guaranteed class
limits:
diff --git a/kubernetes/files/kube-addons/dns/kubedns-autoscaler.yaml b/kubernetes/files/kube-addons/dns/kubedns-autoscaler.yaml
index 917f162..f8928df 100644
--- a/kubernetes/files/kube-addons/dns/kubedns-autoscaler.yaml
+++ b/kubernetes/files/kube-addons/dns/kubedns-autoscaler.yaml
@@ -18,7 +18,7 @@
effect: NoSchedule
containers:
- name: autoscaler
- image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
+ image: {{ common.addons.dns.autoscaler.get('image', 'gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0') }}
resources:
requests:
cpu: "20m"
diff --git a/kubernetes/files/kube-addons/dns/kubedns-rc.yaml b/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
index 69465a1..e4cf120 100644
--- a/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
+++ b/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
@@ -51,7 +51,7 @@
effect: NoSchedule
containers:
- name: kubedns
- image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
+ image: {{ common.addons.dns.get('kubedns_image', 'gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5') }}
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -99,7 +99,7 @@
name: metrics
protocol: TCP
- name: dnsmasq
- image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ image: {{ common.addons.dns.get('dnsmasq_image', 'gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5') }}
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@@ -128,7 +128,7 @@
cpu: 150m
memory: 10Mi
- name: sidecar
- image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+ image: {{ common.addons.dns.get('sidecar_image', 'gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5') }}
livenessProbe:
httpGet:
path: /metrics