From c1e5f1f0a1a0cb19f7674e10ed7e776dc2af4f29 Mon Sep 17 00:00:00 2001 From: carlory Date: Wed, 29 Jun 2022 11:22:05 +0800 Subject: [PATCH] dix karmadactl e2e Signed-off-by: carlory --- test/e2e/karmadactl_test.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/test/e2e/karmadactl_test.go b/test/e2e/karmadactl_test.go index c16367342..0cd3d6e6b 100644 --- a/test/e2e/karmadactl_test.go +++ b/test/e2e/karmadactl_test.go @@ -462,9 +462,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La ginkgo.By(fmt.Sprintf("Joinning cluster: %s", clusterName), func() { karmadaConfig := karmadactl.NewKarmadaConfig(clientcmd.NewDefaultPathOptions()) opts := karmadactl.CommandJoinOption{ - GlobalCommandOptions: options.GlobalCommandOptions{ - DryRun: false, - }, + DryRun: false, ClusterNamespace: "karmada-cluster", ClusterName: clusterName, ClusterContext: clusterContext, @@ -482,9 +480,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La ginkgo.DeferCleanup(func() { ginkgo.By(fmt.Sprintf("Unjoinning cluster: %s", clusterName), func() { opts := karmadactl.CommandUnjoinOption{ - GlobalCommandOptions: options.GlobalCommandOptions{ - DryRun: false, - }, + DryRun: false, ClusterNamespace: "karmada-cluster", ClusterName: clusterName, ClusterContext: clusterContext, @@ -504,9 +500,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La ginkgo.Context("cordon cluster", func() { ginkgo.BeforeEach(func() { opts := karmadactl.CommandCordonOption{ - GlobalCommandOptions: options.GlobalCommandOptions{ - DryRun: false, - }, + DryRun: false, ClusterName: clusterName, } err := karmadactl.RunCordonOrUncordon(karmadactl.DesiredCordon, karmadaConfig, opts) @@ -541,9 +535,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La ginkgo.It("uncordon cluster", func() { opts := karmadactl.CommandCordonOption{ - GlobalCommandOptions: options.GlobalCommandOptions{ - DryRun: false, - }, + DryRun: false, ClusterName: clusterName, } err := karmadactl.RunCordonOrUncordon(karmadactl.DesiredUnCordon, karmadaConfig, opts)