From bc52c6b7008d684c28d71242fbcd78813a68e486 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Wed, 26 Jul 2023 17:44:33 +0800 Subject: [PATCH 1/8] modify --- test/e2e/cmd/init/init.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/e2e/cmd/init/init.go b/test/e2e/cmd/init/init.go index 13cb1981fd8..2f52bc5f15e 100644 --- a/test/e2e/cmd/init/init.go +++ b/test/e2e/cmd/init/init.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "io" + "k8s.io/apimachinery/pkg/util/wait" "os" "path/filepath" "strings" @@ -374,6 +375,26 @@ func (ki *Initializer) prepareKindConfigFile(kindConfigPath string) error { } func (ki *Initializer) configureAddons() error { + err := wait.PollImmediate(10*time.Second, 4*time.Minute, func() (bool, error) { + labelSelector := metav1.LabelSelector{MatchLabels: map[string]string{"app.kubernetes.io/name": "yurt-manager"}} + yurtManagerPods, err := ki.kubeClient.CoreV1().Pods("kube-system").List(context.TODO(), metav1.ListOptions{ + LabelSelector: metav1.FormatLabelSelector(&labelSelector), + }) + if err != nil { + klog.Errorf("failed to list yurt-manager pod, %v", err) + return false, nil + } + for _, pod := range yurtManagerPods.Items { + if !pod.Status.ContainerStatuses[0].Ready { + klog.Info("container is not ready in yurtmanager pod") + return false, nil + } + } + return true, nil + }) + if err != nil { + return err + } if err := ki.configureCoreDnsAddon(); err != nil { return err } From 113f2e74e9a8781f311d42d146ee71dd59d1c34a Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Wed, 26 Jul 2023 17:53:06 +0800 Subject: [PATCH 2/8] modify --- test/e2e/cmd/init/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/cmd/init/init.go b/test/e2e/cmd/init/init.go index 2f52bc5f15e..dec1e93c419 100644 --- a/test/e2e/cmd/init/init.go +++ b/test/e2e/cmd/init/init.go @@ -382,7 +382,7 @@ func (ki *Initializer) configureAddons() error { }) if err != nil { klog.Errorf("failed to list yurt-manager pod, %v", err) - return false, nil + return false, err } for _, pod := range yurtManagerPods.Items { if !pod.Status.ContainerStatuses[0].Ready { From 79c4a4be38885e6232488dc3e59908c3de8134a9 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 09:51:21 +0800 Subject: [PATCH 3/8] modify --- test/e2e/cmd/init/init.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/cmd/init/init.go b/test/e2e/cmd/init/init.go index dec1e93c419..c42a89095e1 100644 --- a/test/e2e/cmd/init/init.go +++ b/test/e2e/cmd/init/init.go @@ -20,12 +20,13 @@ import ( "context" "fmt" "io" - "k8s.io/apimachinery/pkg/util/wait" "os" "path/filepath" "strings" "time" + "k8s.io/apimachinery/pkg/util/wait" + "github.com/spf13/cobra" "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" From e69f8694d0f670e34e4c42618e5393f22e1acf41 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 10:19:06 +0800 Subject: [PATCH 4/8] modify --- test/e2e/cmd/init/init.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/cmd/init/init.go b/test/e2e/cmd/init/init.go index c42a89095e1..9682e68b042 100644 --- a/test/e2e/cmd/init/init.go +++ b/test/e2e/cmd/init/init.go @@ -25,12 +25,11 @@ import ( "strings" "time" - "k8s.io/apimachinery/pkg/util/wait" - "github.com/spf13/cobra" "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/apimachinery/pkg/util/wait" kubeclientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" From 154cb896ffabf3a567345e60e91d16cbba80d8e6 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 14:19:39 +0800 Subject: [PATCH 5/8] move check to deployYurtManager --- test/e2e/cmd/init/converter.go | 3 +++ test/e2e/cmd/init/init.go | 22 +--------------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/test/e2e/cmd/init/converter.go b/test/e2e/cmd/init/converter.go index 5f61b907afb..b64e956f404 100644 --- a/test/e2e/cmd/init/converter.go +++ b/test/e2e/cmd/init/converter.go @@ -284,6 +284,9 @@ func (c *ClusterConverter) deployYurtManager() error { } if podList.Items[0].Status.Phase == corev1.PodRunning { + if podList.Items[0].Status.ContainerStatuses[0].Ready == false { + return false, nil + } for i := range podList.Items[0].Status.Conditions { if podList.Items[0].Status.Conditions[i].Type == corev1.PodReady && podList.Items[0].Status.Conditions[i].Status == corev1.ConditionTrue { diff --git a/test/e2e/cmd/init/init.go b/test/e2e/cmd/init/init.go index 9682e68b042..8e4f7753835 100644 --- a/test/e2e/cmd/init/init.go +++ b/test/e2e/cmd/init/init.go @@ -29,7 +29,6 @@ import ( "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apimachinery/pkg/util/wait" kubeclientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" @@ -375,26 +374,7 @@ func (ki *Initializer) prepareKindConfigFile(kindConfigPath string) error { } func (ki *Initializer) configureAddons() error { - err := wait.PollImmediate(10*time.Second, 4*time.Minute, func() (bool, error) { - labelSelector := metav1.LabelSelector{MatchLabels: map[string]string{"app.kubernetes.io/name": "yurt-manager"}} - yurtManagerPods, err := ki.kubeClient.CoreV1().Pods("kube-system").List(context.TODO(), metav1.ListOptions{ - LabelSelector: metav1.FormatLabelSelector(&labelSelector), - }) - if err != nil { - klog.Errorf("failed to list yurt-manager pod, %v", err) - return false, err - } - for _, pod := range yurtManagerPods.Items { - if !pod.Status.ContainerStatuses[0].Ready { - klog.Info("container is not ready in yurtmanager pod") - return false, nil - } - } - return true, nil - }) - if err != nil { - return err - } + if err := ki.configureCoreDnsAddon(); err != nil { return err } From 513450d8e8ca4156f571c7604d59b49a9e4c77d9 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 14:22:30 +0800 Subject: [PATCH 6/8] modify --- test/e2e/cmd/init/converter.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/cmd/init/converter.go b/test/e2e/cmd/init/converter.go index b64e956f404..b6185815a5d 100644 --- a/test/e2e/cmd/init/converter.go +++ b/test/e2e/cmd/init/converter.go @@ -285,6 +285,7 @@ func (c *ClusterConverter) deployYurtManager() error { if podList.Items[0].Status.Phase == corev1.PodRunning { if podList.Items[0].Status.ContainerStatuses[0].Ready == false { + klog.Info("yurt manager's container is not ready") return false, nil } for i := range podList.Items[0].Status.Conditions { From cde995b266cb009b9b78803f6ac7161a13312604 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 14:30:59 +0800 Subject: [PATCH 7/8] modify --- test/e2e/cmd/init/converter.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/cmd/init/converter.go b/test/e2e/cmd/init/converter.go index b6185815a5d..15fbd0f3879 100644 --- a/test/e2e/cmd/init/converter.go +++ b/test/e2e/cmd/init/converter.go @@ -291,6 +291,7 @@ func (c *ClusterConverter) deployYurtManager() error { for i := range podList.Items[0].Status.Conditions { if podList.Items[0].Status.Conditions[i].Type == corev1.PodReady && podList.Items[0].Status.Conditions[i].Status == corev1.ConditionTrue { + klog.Info("yurt manager's container and pod are both ready") return true, nil } } From 426dd790fb81face438b41dd3d1f56660a6b8ef6 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 27 Jul 2023 14:57:03 +0800 Subject: [PATCH 8/8] modify --- test/e2e/cmd/init/converter.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/e2e/cmd/init/converter.go b/test/e2e/cmd/init/converter.go index 15fbd0f3879..9108248b90e 100644 --- a/test/e2e/cmd/init/converter.go +++ b/test/e2e/cmd/init/converter.go @@ -284,20 +284,20 @@ func (c *ClusterConverter) deployYurtManager() error { } if podList.Items[0].Status.Phase == corev1.PodRunning { - if podList.Items[0].Status.ContainerStatuses[0].Ready == false { - klog.Info("yurt manager's container is not ready") - return false, nil - } for i := range podList.Items[0].Status.Conditions { if podList.Items[0].Status.Conditions[i].Type == corev1.PodReady && - podList.Items[0].Status.Conditions[i].Status == corev1.ConditionTrue { - klog.Info("yurt manager's container and pod are both ready") - return true, nil + podList.Items[0].Status.Conditions[i].Status != corev1.ConditionTrue { + klog.Infof("pod(%s/%s): %#v", podList.Items[0].Namespace, podList.Items[0].Name, podList.Items[0]) + return false, nil + } + if podList.Items[0].Status.Conditions[i].Type == corev1.ContainersReady && + podList.Items[0].Status.Conditions[i].Status != corev1.ConditionTrue { + klog.Info("yurt manager's container is not ready") + return false, nil } } } - klog.Infof("pod(%s/%s): %#v", podList.Items[0].Namespace, podList.Items[0].Name, podList.Items[0]) - return false, nil + return true, nil }) }