diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43442077f..8b40ffd94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 index df9bd3623..9cacf6079 100644 --- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 @@ -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 diff --git a/roles/kubernetes/master/tasks/kubeadm-secondary-legacy.yml b/roles/kubernetes/master/tasks/kubeadm-secondary-legacy.yml index a478d94fa..6f613353b 100644 --- a/roles/kubernetes/master/tasks/kubeadm-secondary-legacy.yml +++ b/roles/kubernetes/master/tasks/kubeadm-secondary-legacy.yml @@ -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