Merge pull request #2083 from carlory/fix-e2e-karmadactl
fix karmadactl e2e
This commit is contained in:
commit
41ab9a58e7
|
@ -462,9 +462,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La
|
||||||
ginkgo.By(fmt.Sprintf("Joinning cluster: %s", clusterName), func() {
|
ginkgo.By(fmt.Sprintf("Joinning cluster: %s", clusterName), func() {
|
||||||
karmadaConfig := karmadactl.NewKarmadaConfig(clientcmd.NewDefaultPathOptions())
|
karmadaConfig := karmadactl.NewKarmadaConfig(clientcmd.NewDefaultPathOptions())
|
||||||
opts := karmadactl.CommandJoinOption{
|
opts := karmadactl.CommandJoinOption{
|
||||||
GlobalCommandOptions: options.GlobalCommandOptions{
|
DryRun: false,
|
||||||
DryRun: false,
|
|
||||||
},
|
|
||||||
ClusterNamespace: "karmada-cluster",
|
ClusterNamespace: "karmada-cluster",
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
ClusterContext: clusterContext,
|
ClusterContext: clusterContext,
|
||||||
|
@ -482,9 +480,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La
|
||||||
ginkgo.DeferCleanup(func() {
|
ginkgo.DeferCleanup(func() {
|
||||||
ginkgo.By(fmt.Sprintf("Unjoinning cluster: %s", clusterName), func() {
|
ginkgo.By(fmt.Sprintf("Unjoinning cluster: %s", clusterName), func() {
|
||||||
opts := karmadactl.CommandUnjoinOption{
|
opts := karmadactl.CommandUnjoinOption{
|
||||||
GlobalCommandOptions: options.GlobalCommandOptions{
|
DryRun: false,
|
||||||
DryRun: false,
|
|
||||||
},
|
|
||||||
ClusterNamespace: "karmada-cluster",
|
ClusterNamespace: "karmada-cluster",
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
ClusterContext: clusterContext,
|
ClusterContext: clusterContext,
|
||||||
|
@ -504,9 +500,7 @@ var _ = framework.SerialDescribe("Karmadactl cordon/uncordon testing", ginkgo.La
|
||||||
ginkgo.Context("cordon cluster", func() {
|
ginkgo.Context("cordon cluster", func() {
|
||||||
ginkgo.BeforeEach(func() {
|
ginkgo.BeforeEach(func() {
|
||||||
opts := karmadactl.CommandCordonOption{
|
opts := karmadactl.CommandCordonOption{
|
||||||
GlobalCommandOptions: options.GlobalCommandOptions{
|
DryRun: false,
|
||||||
DryRun: false,
|
|
||||||
},
|
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
}
|
}
|
||||||
err := karmadactl.RunCordonOrUncordon(karmadactl.DesiredCordon, karmadaConfig, opts)
|
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() {
|
ginkgo.It("uncordon cluster", func() {
|
||||||
opts := karmadactl.CommandCordonOption{
|
opts := karmadactl.CommandCordonOption{
|
||||||
GlobalCommandOptions: options.GlobalCommandOptions{
|
DryRun: false,
|
||||||
DryRun: false,
|
|
||||||
},
|
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
}
|
}
|
||||||
err := karmadactl.RunCordonOrUncordon(karmadactl.DesiredUnCordon, karmadaConfig, opts)
|
err := karmadactl.RunCordonOrUncordon(karmadactl.DesiredUnCordon, karmadaConfig, opts)
|
||||||
|
|
Loading…
Reference in New Issue