C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch some image from dockerhub to k8s.gcr (also increase pkg retries) (#6955)

Browse source
This commit is contained in:
Florian Ruynat 2020-11-26 17:46:19 +01:00 committed by GitHub
parent 7938748d77
commit 405692d793
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/sample/group_vars/k8s-cluster/addons.yml
View file

@ -1,7 +1,7 @@
--- ---
# Kubernetes dashboard # Kubernetes dashboard
# RBAC required. see docs/getting-started.md for access details. # RBAC required. see docs/getting-started.md for access details.
dashboard_enabled: true # dashboard_enabled: true
# Helm deployment # Helm deployment
helm_enabled: false helm_enabled: false

15
roles/download/defaults/main.yml
View file

@ -479,7 +479,7 @@ haproxy_image_tag: 2.2
# Coredns version should be supported by corefile-migration (or at least work with) # Coredns version should be supported by corefile-migration (or at least work with)
# bundle with kubeadm; if not 'basic' upgrade can sometimes fail # bundle with kubeadm; if not 'basic' upgrade can sometimes fail
coredns_version: "1.7.0" 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 }}" coredns_image_tag: "{{ coredns_version }}"
nodelocaldns_version: "1.16.0" nodelocaldns_version: "1.16.0"
@ -489,10 +489,8 @@ nodelocaldns_image_tag: "{{ nodelocaldns_version }}"
dnsautoscaler_version: 1.8.3 dnsautoscaler_version: 1.8.3
dnsautoscaler_image_repo: "{{ kube_image_repo }}/cpa/cluster-proportional-autoscaler-{{ image_arch }}" dnsautoscaler_image_repo: "{{ kube_image_repo }}/cpa/cluster-proportional-autoscaler-{{ image_arch }}"
dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}" dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}"
test_image_repo: "{{ docker_image_repo }}/library/busybox" test_image_repo: "{{ kube_image_repo }}/busybox"
test_image_tag: latest test_image_tag: latest
busybox_image_repo: "{{ docker_image_repo }}/library/busybox"
busybox_image_tag: 1.32.0
helm_version: "v3.2.4" helm_version: "v3.2.4"
helm_image_repo: "{{ docker_image_repo }}/lachlanevenson/k8s-helm" helm_image_repo: "{{ docker_image_repo }}/lachlanevenson/k8s-helm"
helm_image_tag: "{{ helm_version }}" helm_image_tag: "{{ helm_version }}"
@ -918,15 +916,6 @@ downloads:
groups: groups:
- kube-master - 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: testbox:
enabled: false enabled: false
container: true container: true

1
tests/files/packet_centos8-calico.yml
View file

@ -9,6 +9,7 @@ deploy_netchecker: true
dns_min_replicas: 1 dns_min_replicas: 1
metrics_server_enabled: true metrics_server_enabled: true
dashboard_namespace: "kube-dashboard" dashboard_namespace: "kube-dashboard"
dashboard_enabled: true
loadbalancer_apiserver_type: haproxy loadbalancer_apiserver_type: haproxy
# required / not autodetected for now # required / not autodetected for now

2
tests/files/tf-ovh_ubuntu18-calico.yml
View file

@ -2,7 +2,7 @@
dns_min_replicas: 1 dns_min_replicas: 1
deploy_netchecker: true deploy_netchecker: true
sonobuoy_enabled: true sonobuoy_enabled: true
pkg_install_retries: 10 pkg_install_retries: 15
retry_stagger: 10 retry_stagger: 10
# Ignore ping errors # Ignore ping errors