Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inventory/sample/group_vars/k8s-cluster/addons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 2 additions & 13 deletions roles/download/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The official release repo for CoreDNS is DockerHub. I know kubeadm default is the one in gcr.io but I'm wondering what we should use, the official one or the kubeadm's.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it doesn't really matter, as long as that's part of their release process now that CoreDNS is kube default DNS stack

coredns_image_tag: "{{ coredns_version }}"

nodelocaldns_version: "1.15.16"
Expand All @@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is used in test and we don't care about the busybox image..

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 }}"
Expand Down Expand Up @@ -918,15 +916,6 @@ downloads:
groups:
- kube-master

busybox:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For information, this is no longer used in kube-router since 1.x

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
Expand Down
1 change: 1 addition & 0 deletions tests/files/packet_centos8-calico.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/files/tf-ovh_ubuntu18-calico.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down