From 3018f83b210950242d0485026c0e070ef7f7afd9 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sat, 25 Jan 2025 22:43:49 +0000 Subject: [PATCH] Revert "fix --wait's failure to work on coredns pods (#19748)" This reverts commit 3fef3ea0acb24dea4e8dfd48f2c81723209207c8. --- .../bsutil/kverify/system_pods.go | 27 +++---------------- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go index e13e5cde4916..7da7512312db 100644 --- a/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go +++ b/pkg/minikube/bootstrapper/bsutil/kverify/system_pods.go @@ -76,8 +76,7 @@ func WaitForSystemPods(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg con } // ExpectAppsRunning returns whether or not all expected k8s-apps are running. (without waiting for them) -func ExpectAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expected []string) error { - +func ExpectAppsRunning(cs *kubernetes.Clientset, expected []string) error { found := map[string]bool{} pods, err := cs.CoreV1().Pods("kube-system").List(context.Background(), meta.ListOptions{}) @@ -86,32 +85,12 @@ func ExpectAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expe } klog.Infof("%d kube-system pods found", len(pods.Items)) - for !config.IsHA(*cfg) && !cfg.DisableOptimizations { - // when --disable-optimization is not specified - // for non-HA cluster - // core dns deployment has been scaled to 1 pods, wait until there is only 1 pod - corednsPods, err := cs.CoreV1().Pods("kube-system").List(context.Background(), meta.ListOptions{ - LabelSelector: "k8s-app=kube-dns", - }) - if err != nil { - return err - } - if len(corednsPods.Items) == 1 { - break - } - } - for _, pod := range pods.Items { klog.Info(podStatusMsg(pod)) if pod.Status.Phase != core.PodRunning { continue } - for _, cs := range pod.Status.ContainerStatuses { - if !cs.Ready { - continue - } - } for k, v := range pod.ObjectMeta.Labels { if k == "component" || k == "k8s-app" { @@ -133,12 +112,12 @@ func ExpectAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expe } // WaitForAppsRunning waits for expected Apps To be running -func WaitForAppsRunning(cfg *config.ClusterConfig, cs *kubernetes.Clientset, expected []string, timeout time.Duration) error { +func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout time.Duration) error { klog.Info("waiting for k8s-apps to be running ...") start := time.Now() checkRunning := func() error { - return ExpectAppsRunning(cfg, cs, expected) + return ExpectAppsRunning(cs, expected) } if err := retry.Local(checkRunning, timeout); err != nil { diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 25b726df5d7f..325ec0817657 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -567,7 +567,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.AppsRunningKey] { - if err := kverify.WaitForAppsRunning(&cfg, client, kverify.AppsRunningList, timeout); err != nil { + if err := kverify.WaitForAppsRunning(client, kverify.AppsRunningList, timeout); err != nil { return errors.Wrap(err, "waiting for apps_running") } }