* 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:
parent
b90b1fc2b9
commit
7d8da8348e
3 changed files with 3 additions and 5 deletions
|
@ -64,7 +64,6 @@ ci-authorized:
|
|||
include:
|
||||
- .gitlab-ci/lint.yml
|
||||
- .gitlab-ci/shellcheck.yml
|
||||
- .gitlab-ci/gce.yml
|
||||
- .gitlab-ci/digital-ocean.yml
|
||||
- .gitlab-ci/terraform.yml
|
||||
- .gitlab-ci/packet.yml
|
||||
|
|
|
@ -46,6 +46,8 @@ spec:
|
|||
- effect: NoSchedule
|
||||
operator: Equal
|
||||
key: node-role.kubernetes.io/master
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
|
@ -77,7 +79,4 @@ spec:
|
|||
- --v=2
|
||||
- --configmap=dns-autoscaler{{ coredns_ordinal_suffix }}
|
||||
- --target=Deployment/coredns{{ coredns_ordinal_suffix }}
|
||||
tolerations:
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
serviceAccountName: dns-autoscaler
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
when: inventory_hostname != groups['kube-master']|first
|
||||
|
||||
- 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
|
||||
retries: 10
|
||||
until: kubeadm_init is succeeded or "field is immutable" in kubeadm_init.stderr
|
||||
|
|
Loading…
Reference in a new issue