Merge pull request #2573 from hswong3i/registry-download

registry: container download related things should defined in the download role

roles/download/defaults/main.yml

@@ -130,6 +130,10 @@ tiller_image_repo: "gcr.io/kubernetes-helm/tiller"
 tiller_image_tag: "{{ helm_version }}"
 vault_image_repo: "vault"
 vault_image_tag: "{{ vault_version }}"
+registry_image_repo: "registry"
+registry_image_tag: "2.6"
+registry_proxy_image_repo: "gcr.io/google_containers/kube-registry-proxy"
+registry_proxy_image_tag: "0.4"
 ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
 ingress_nginx_controller_image_tag: "0.11.0"
 ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
@@ -429,6 +433,22 @@ downloads:
     version: "{{ vault_version }}"
     groups:
       - vault
+  registry:
+    enabled: "{{ registry_enabled }}"
+    container: true
+    repo: "{{ registry_image_repo }}"
+    tag: "{{ registry_image_tag }}"
+    sha256: "{{ registry_digest_checksum|default(None) }}"
+    groups:
+      - kube-node
+  registry_proxy:
+    enabled: "{{ registry_enabled }}"
+    container: true
+    repo: "{{ registry_proxy_image_repo }}"
+    tag: "{{ registry_proxy_image_tag }}"
+    sha256: "{{ registry_proxy_digest_checksum|default(None) }}"
+    groups:
+      - kube-node
   ingress_nginx_controller:
     enabled: "{{ ingress_nginx_enabled }}"
     container: true

roles/kubernetes-apps/registry/defaults/main.yml

@@ -1,9 +1,4 @@
 ---
-registry_image_repo: registry
-registry_image_tag: 2.6
-registry_proxy_image_repo: gcr.io/google_containers/kube-registry-proxy
-registry_proxy_image_tag: 0.4
-
 registry_namespace: "kube-system"
 registry_storage_class: ""
 registry_disk_size: "10Gi"