From 1a9989ade9970cd36420a6c899fd39f55926fea5 Mon Sep 17 00:00:00 2001 From: Erwan Miran Date: Tue, 16 Jan 2018 09:11:59 +0100 Subject: [PATCH 1/2] move hardcoded dnsmasq autoscaler image to its own variable --- roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 | 2 +- roles/download/defaults/main.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 b/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 index d9e7b10f3..d871bcbf9 100644 --- a/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 +++ b/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 @@ -39,7 +39,7 @@ spec: operator: Exists containers: - name: autoscaler - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1 + image: "{{ dnsmasqautoscaler_image_repo }}:{{ dnsmasqautoscaler_image_tag }}" resources: requests: cpu: "20m" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index e88ba3b37..2fecab98b 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -101,6 +101,9 @@ dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64" dnsmasq_nanny_image_tag: "{{ kubedns_version }}" dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-amd64" dnsmasq_sidecar_image_tag: "{{ kubedns_version }}" +dnsmasqautoscaler_version: 1.1.1 +dnsmasqautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" +dnsmasqautoscaler_image_tag: "{{ dnsmasqautoscaler_version }}" kubednsautoscaler_version: 1.1.1 kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}" From e5b4011aa48f5e59f13fab7738767266e896f045 Mon Sep 17 00:00:00 2001 From: Erwan Miran Date: Tue, 16 Jan 2018 09:11:59 +0100 Subject: [PATCH 2/2] move hardcoded dnsmasq autoscaler image to its own variable --- roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 | 2 +- roles/download/defaults/main.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 b/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 index d9e7b10f3..d871bcbf9 100644 --- a/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 +++ b/roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 @@ -39,7 +39,7 @@ spec: operator: Exists containers: - name: autoscaler - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1 + image: "{{ dnsmasqautoscaler_image_repo }}:{{ dnsmasqautoscaler_image_tag }}" resources: requests: cpu: "20m" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index e88ba3b37..2fecab98b 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -101,6 +101,9 @@ dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64" dnsmasq_nanny_image_tag: "{{ kubedns_version }}" dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-amd64" dnsmasq_sidecar_image_tag: "{{ kubedns_version }}" +dnsmasqautoscaler_version: 1.1.1 +dnsmasqautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" +dnsmasqautoscaler_image_tag: "{{ dnsmasqautoscaler_version }}" kubednsautoscaler_version: 1.1.1 kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"