Merge pull request #3091 from CecileRobertMichon/presubmit-pending-pods

Fix custom builds kube pending pods

Author: k8s-ci-robot

scripts/ci-entrypoint.sh

@@ -139,6 +139,10 @@ install_addons() {
     # export the target cluster KUBECONFIG if not already set
     export KUBECONFIG="${KUBECONFIG:-${PWD}/kubeconfig}"
 
+    # wait for the apiserver pod to be Ready.
+    APISERVER_POD=$("${KUBECTL}" get pods -n kube-system -o name | grep apiserver)
+    "${KUBECTL}" wait --for=condition=Ready -n kube-system "${APISERVER_POD}" --timeout=5m
+
     # Copy the kubeadm configmap to the calico-system namespace. This is a workaround needed for the calico-node-windows daemonset to be able to run in the calico-system namespace.
     "${KUBECTL}" create ns calico-system
     until "${KUBECTL}" get configmap kubeadm-config --namespace=kube-system

templates/test/dev/cluster-template-custom-builds-machine-pool.yaml

@@ -48,9 +48,11 @@
 
         export KUBECONFIG=/etc/kubernetes/admin.conf
         kubectl -n kube-system set image daemonset/kube-proxy kube-proxy="${REGISTRY}/kube-proxy:${IMAGE_TAG}"
+        systemctl stop kubelet
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-apiserver:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-apiserver.yaml
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-controller-manager:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-controller-manager.yaml
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-scheduler:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-scheduler.yaml
+        systemctl restart kubelet
     path: /tmp/replace-k8s-components.sh
     owner: "root:root"
     permissions: "0744"

templates/test/dev/cluster-template-custom-builds.yaml

@@ -61,9 +61,11 @@ spec:
 
         export KUBECONFIG=/etc/kubernetes/admin.conf
         kubectl -n kube-system set image daemonset/kube-proxy kube-proxy="${REGISTRY}/kube-proxy:${IMAGE_TAG}"
+        systemctl stop kubelet
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-apiserver:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-apiserver.yaml
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-controller-manager:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-controller-manager.yaml
         yq e '.spec.containers[0].image = "${REGISTRY}/kube-scheduler:${IMAGE_TAG}"' -i /etc/kubernetes/manifests/kube-scheduler.yaml
+        systemctl restart kubelet
     - path: /etc/kubernetes/azure.json
       owner: "root:root"
       permissions: "0644"