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

Cherry pick #4857 #4859 #4867 into release-2.10 (#4877)

Browse source 
* fix start CoreDNS when init secondary master (#4867)

* Update dns-autoscaler.yml.j2 (#4857)

Merge two tolerations.  because the latest tolerations will cover the first tolerations.

* Remove GCE tests and CNCF funding ended (#4859)
This commit is contained in:
Andreas Holmsten 2019-06-13 14:22:17 +02:00 committed by Kubernetes Prow Robot
parent b90b1fc2b9
commit 7d8da8348e
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -64,7 +64,6 @@ ci-authorized:
include: include:
- .gitlab-ci/lint.yml - .gitlab-ci/lint.yml
- .gitlab-ci/shellcheck.yml - .gitlab-ci/shellcheck.yml
- .gitlab-ci/gce.yml
- .gitlab-ci/digital-ocean.yml - .gitlab-ci/digital-ocean.yml
- .gitlab-ci/terraform.yml - .gitlab-ci/terraform.yml
- .gitlab-ci/packet.yml - .gitlab-ci/packet.yml

5
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View file

@ -46,6 +46,8 @@ spec:
- effect: NoSchedule - effect: NoSchedule
operator: Equal operator: Equal
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master
- key: "CriticalAddonsOnly"
operator: "Exists"
affinity: affinity:
podAntiAffinity: podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -77,7 +79,4 @@ spec:
- --v=2 - --v=2
- --configmap=dns-autoscaler{{ coredns_ordinal_suffix }} - --configmap=dns-autoscaler{{ coredns_ordinal_suffix }}
- --target=Deployment/coredns{{ coredns_ordinal_suffix }} - --target=Deployment/coredns{{ coredns_ordinal_suffix }}
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
serviceAccountName: dns-autoscaler serviceAccountName: dns-autoscaler

2
roles/kubernetes/master/tasks/kubeadm-secondary-legacy.yml
View file

@ -31,7 +31,7 @@
when: inventory_hostname != groups['kube-master']|first when: inventory_hostname != groups['kube-master']|first
- name: kubeadm | Init other uninitialized masters - name: kubeadm | Init other uninitialized masters
command: timeout -k 600s 600s {{ bin_dir }}/kubeadm init --config={{ kube_config_dir }}/kubeadm-config.yaml --ignore-preflight-errors=all command: timeout -k 600s 600s {{ bin_dir }}/kubeadm init --config={{ kube_config_dir }}/kubeadm-config.yaml --ignore-preflight-errors=all --skip-phases=addon/coredns
register: kubeadm_init register: kubeadm_init
retries: 10 retries: 10
until: kubeadm_init is succeeded or "field is immutable" in kubeadm_init.stderr until: kubeadm_init is succeeded or "field is immutable" in kubeadm_init.stderr