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

* 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)

.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

requirements.txt

@@ -1,7 +1,7 @@
-ansible>=2.7.8
-jinja2>=2.9.6
-netaddr
-pbr>=1.6
-hvac
-jmespath
-ruamel.yaml
+ansible==2.7.8
+jinja2==2.10.1
+netaddr==0.7.19
+pbr==5.2.0
+hvac==0.8.2
+jmespath==0.9.4
+ruamel.yaml==0.15.96

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

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

tests/requirements.txt

@@ -1,9 +1,8 @@
 -r ../requirements.txt
-yamllint
+yamllint==1.15.0
 apache-libcloud==2.2.1
-boto==2.9.0
-tox
-dopy
-PyCrypto
+tox==3.11.1
+dopy==0.3.7
+PyCrypto==2.6.1
 ansible-lint==4.1.0
-openshift
+openshift==0.8.8

tests/scripts/rebase.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 set -euxo pipefail
 
-# Rebase on master to get latest changes
+# Rebase PRs on master to get latest changes
+if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then
   git config user.email "ci@kubespray.io"
   git config user.name "CI"
-git pull --rebase origin master
+  git pull --rebase origin release-2.10
+fi