Switch some image from dockerhub to k8s.gcr (also increase pkg retries) (#6955)
This commit is contained in:
parent
7938748d77
commit
405692d793
4 changed files with 5 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
# Kubernetes dashboard
|
||||
# RBAC required. see docs/getting-started.md for access details.
|
||||
dashboard_enabled: true
|
||||
# dashboard_enabled: true
|
||||
|
||||
# Helm deployment
|
||||
helm_enabled: false
|
||||
|
|
|
@ -479,7 +479,7 @@ haproxy_image_tag: 2.2
|
|||
# Coredns version should be supported by corefile-migration (or at least work with)
|
||||
# bundle with kubeadm; if not 'basic' upgrade can sometimes fail
|
||||
coredns_version: "1.7.0"
|
||||
coredns_image_repo: "{{ docker_image_repo }}/coredns/coredns"
|
||||
coredns_image_repo: "{{ kube_image_repo }}/coredns"
|
||||
coredns_image_tag: "{{ coredns_version }}"
|
||||
|
||||
nodelocaldns_version: "1.16.0"
|
||||
|
@ -489,10 +489,8 @@ nodelocaldns_image_tag: "{{ nodelocaldns_version }}"
|
|||
dnsautoscaler_version: 1.8.3
|
||||
dnsautoscaler_image_repo: "{{ kube_image_repo }}/cpa/cluster-proportional-autoscaler-{{ image_arch }}"
|
||||
dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}"
|
||||
test_image_repo: "{{ docker_image_repo }}/library/busybox"
|
||||
test_image_repo: "{{ kube_image_repo }}/busybox"
|
||||
test_image_tag: latest
|
||||
busybox_image_repo: "{{ docker_image_repo }}/library/busybox"
|
||||
busybox_image_tag: 1.32.0
|
||||
helm_version: "v3.2.4"
|
||||
helm_image_repo: "{{ docker_image_repo }}/lachlanevenson/k8s-helm"
|
||||
helm_image_tag: "{{ helm_version }}"
|
||||
|
@ -918,15 +916,6 @@ downloads:
|
|||
groups:
|
||||
- kube-master
|
||||
|
||||
busybox:
|
||||
enabled: "{{ kube_network_plugin in ['kube-router'] }}"
|
||||
container: true
|
||||
repo: "{{ busybox_image_repo }}"
|
||||
tag: "{{ busybox_image_tag }}"
|
||||
sha256: "{{ busybox_digest_checksum|default(None) }}"
|
||||
groups:
|
||||
- k8s-cluster
|
||||
|
||||
testbox:
|
||||
enabled: false
|
||||
container: true
|
||||
|
|
|
@ -9,6 +9,7 @@ deploy_netchecker: true
|
|||
dns_min_replicas: 1
|
||||
metrics_server_enabled: true
|
||||
dashboard_namespace: "kube-dashboard"
|
||||
dashboard_enabled: true
|
||||
loadbalancer_apiserver_type: haproxy
|
||||
|
||||
# required / not autodetected for now
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
dns_min_replicas: 1
|
||||
deploy_netchecker: true
|
||||
sonobuoy_enabled: true
|
||||
pkg_install_retries: 10
|
||||
pkg_install_retries: 15
|
||||
retry_stagger: 10
|
||||
|
||||
# Ignore ping errors
|
||||
|
|
Loading…
Reference in a new issue