diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 9284fbbdf..334406a14 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -52,9 +52,6 @@ calico_policy_image_repo: "calico/kube-policy-controller" calico_policy_image_tag: "{{ calico_policy_version }}" calico_rr_image_repo: "quay.io/calico/routereflector" calico_rr_image_tag: "v0.3.0" -exechealthz_version: 1.1 -exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64" -exechealthz_image_tag: "{{ exechealthz_version }}" hyperkube_image_repo: "quay.io/coreos/hyperkube" hyperkube_image_tag: "{{ kube_version }}_coreos.0" pod_infra_image_repo: "gcr.io/google_containers/pause-amd64" @@ -74,12 +71,16 @@ nginx_image_tag: 1.11.4-alpine dnsmasq_version: 2.72 dnsmasq_image_repo: "andyshinn/dnsmasq" dnsmasq_image_tag: "{{ dnsmasq_version }}" -kubednsmasq_version: 1.3 -kubednsmasq_image_repo: "gcr.io/google_containers/kube-dnsmasq-amd64" -kubednsmasq_image_tag: "{{ kubednsmasq_version }}" -kubedns_version: 1.7 -kubedns_image_repo: "gcr.io/google_containers/kubedns-amd64" +kubedns_version: 1.14.2 +kubedns_image_repo: "gcr.io/google_containers/k8s-dns-kube-dns-amd64" kubedns_image_tag: "{{ kubedns_version }}" +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 }}" +kubednsautoscaler_version: 1.1.1 +kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" +kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}" test_image_repo: busybox test_image_tag: latest elasticsearch_version: "v2.4.1" @@ -193,26 +194,31 @@ downloads: repo: "{{ dnsmasq_image_repo }}" tag: "{{ dnsmasq_image_tag }}" sha256: "{{ dnsmasq_digest_checksum|default(None) }}" - kubednsmasq: - container: true - repo: "{{ kubednsmasq_image_repo }}" - tag: "{{ kubednsmasq_image_tag }}" - sha256: "{{ kubednsmasq_digest_checksum|default(None) }}" kubedns: container: true repo: "{{ kubedns_image_repo }}" tag: "{{ kubedns_image_tag }}" sha256: "{{ kubedns_digest_checksum|default(None) }}" + dnsmasq_nanny: + container: true + repo: "{{ dnsmasq_nanny_image_repo }}" + tag: "{{ dnsmasq_nanny_image_tag }}" + sha256: "{{ dnsmasq_nanny_digest_checksum|default(None) }}" + dnsmasq_sidecar: + container: true + repo: "{{ dnsmasq_sidecar_image_repo }}" + tag: "{{ dnsmasq_sidecar_image_tag }}" + sha256: "{{ dnsmasq_sidecar_digest_checksum|default(None) }}" + kubednsautoscaler: + container: true + repo: "{{ kubednsautoscaler_image_repo }}" + tag: "{{ kubednsautoscaler_image_tag }}" + sha256: "{{ kubednsautoscaler_digest_checksum|default(None) }}" testbox: container: true repo: "{{ test_image_repo }}" tag: "{{ test_image_tag }}" sha256: "{{ testbox_digest_checksum|default(None) }}" - exechealthz: - container: true - repo: "{{ exechealthz_image_repo }}" - tag: "{{ exechealthz_image_tag }}" - sha256: "{{ exechealthz_digest_checksum|default(None) }}" elasticsearch: container: true repo: "{{ elasticsearch_image_repo }}" diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml index 2255ba416..3d2e7a419 100644 --- a/roles/kubernetes-apps/ansible/defaults/main.yml +++ b/roles/kubernetes-apps/ansible/defaults/main.yml @@ -1,5 +1,6 @@ # Versions kubedns_version : 1.14.2 +kubednsautoscaler_version: 1.1.1 # Limits for dnsmasq/kubedns apps dns_memory_limit: 170Mi @@ -15,6 +16,8 @@ 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 }}" +kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-amd64" +kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}" # Netchecker deploy_netchecker: false diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml index 6ef0f2f7a..a1d5455ad 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml +++ b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml @@ -32,7 +32,7 @@ spec: spec: containers: - name: autoscaler - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1 + image: "{{ kubednsautoscaler_image_repo }}:{{ kubednsautoscaler_image_tag }}" resources: requests: cpu: "20m" diff --git a/roles/kubernetes/node/meta/main.yml b/roles/kubernetes/node/meta/main.yml index 2ef549c90..12a7d73b7 100644 --- a/roles/kubernetes/node/meta/main.yml +++ b/roles/kubernetes/node/meta/main.yml @@ -23,11 +23,14 @@ dependencies: when: deploy_netchecker tags: [download, netchecker] - role: download - file: "{{ downloads.kubednsmasq }}" + file: "{{ downloads.kubedns }}" tags: [download, dnsmasq] - role: download - file: "{{ downloads.kubedns }}" + file: "{{ downloads.dnsmasq_nanny }}" tags: [download, dnsmasq] - role: download - file: "{{ downloads.exechealthz }}" + file: "{{ downloads.dnsmasq_sidecar }}" tags: [download, dnsmasq] + - role: download + file: "{{ downloads.kubednsautoscaler }}" + tags: [download, dnsmasq] \ No newline at end of file