Browse Source
Merge pull request #2173 from mirwan/hardcoded_dnsmasq-autoscaler_image
Dnsmasq autoscaler image should be a variable
pull/2191/head
Brad Beam
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
1 deletions
-
roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2
-
roles/download/defaults/main.yml
|
|
@ -39,7 +39,7 @@ spec: |
|
|
operator: Exists |
|
|
operator: Exists |
|
|
containers: |
|
|
containers: |
|
|
- name: autoscaler |
|
|
- name: autoscaler |
|
|
image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1 |
|
|
|
|
|
|
|
|
image: "{{ dnsmasqautoscaler_image_repo }}:{{ dnsmasqautoscaler_image_tag }}" |
|
|
resources: |
|
|
resources: |
|
|
requests: |
|
|
requests: |
|
|
cpu: "20m" |
|
|
cpu: "20m" |
|
|
|
|
|
@ -101,6 +101,9 @@ dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64" |
|
|
dnsmasq_nanny_image_tag: "{{ kubedns_version }}" |
|
|
dnsmasq_nanny_image_tag: "{{ kubedns_version }}" |
|
|
dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-amd64" |
|
|
dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-amd64" |
|
|
dnsmasq_sidecar_image_tag: "{{ kubedns_version }}" |
|
|
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_version: 1.1.1 |
|
|
kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" |
|
|
kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" |
|
|
kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}" |
|
|
kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}" |
|
|
|
