registry: container download related things should defined in the download role
This commit is contained in:
parent
deac627dc7
commit
4c0e9ba890
2 changed files with 20 additions and 5 deletions
|
@ -130,6 +130,10 @@ tiller_image_repo: "gcr.io/kubernetes-helm/tiller"
|
||||||
tiller_image_tag: "{{ helm_version }}"
|
tiller_image_tag: "{{ helm_version }}"
|
||||||
vault_image_repo: "vault"
|
vault_image_repo: "vault"
|
||||||
vault_image_tag: "{{ vault_version }}"
|
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_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
|
||||||
ingress_nginx_controller_image_tag: "0.11.0"
|
ingress_nginx_controller_image_tag: "0.11.0"
|
||||||
ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
|
ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
|
||||||
|
@ -429,6 +433,22 @@ downloads:
|
||||||
version: "{{ vault_version }}"
|
version: "{{ vault_version }}"
|
||||||
groups:
|
groups:
|
||||||
- vault
|
- 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:
|
ingress_nginx_controller:
|
||||||
enabled: "{{ ingress_nginx_enabled }}"
|
enabled: "{{ ingress_nginx_enabled }}"
|
||||||
container: true
|
container: true
|
||||||
|
|
|
@ -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_namespace: "kube-system"
|
||||||
registry_storage_class: ""
|
registry_storage_class: ""
|
||||||
registry_disk_size: "10Gi"
|
registry_disk_size: "10Gi"
|
||||||
|
|
Loading…
Reference in a new issue