k8s: add option to wait for pools in the wait for cluster (#1193)

scaleway · Jul 10, 2020 · 5150184 · 5150184
1 parent 7cf7d2d
commit 5150184
Show file tree

Hide file tree

Showing 6 changed files with 3,622 additions and 9 deletions.
diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden
@@ -10,8 +10,9 @@ EXAMPLES:
     scw k8s cluster wait 11111111-1111-1111-1111-111111111111
 
 ARGS:
-  cluster-id        ID of the cluster.
-  [region=fr-par]   Region to target. If none is passed will use default region from the config
+  cluster-id         ID of the cluster.
+  [wait-for-pools]   Wait for pools to be ready.
+  [region=fr-par]    Region to target. If none is passed will use default region from the config
 
 FLAGS:
   -h, --help   help for wait

diff --git a/internal/namespaces/k8s/v1/custom_cluster.go b/internal/namespaces/k8s/v1/custom_cluster.go
@@ -129,21 +129,53 @@ func waitForClusterFunc(action int) core.WaitFunc {
 }
 
 func k8sClusterWaitCommand() *core.Command {
+	type customClusterWaitArgs struct {
+		k8s.WaitForClusterRequest
+		WaitForPools bool
+	}
 	return &core.Command{
 		Short:     `Wait for a cluster to reach a stable state`,
 		Long:      `Wait for server to reach a stable state. This is similar to using --wait flag on other action commands, but without requiring a new action on the server.`,
 		Namespace: "k8s",
 		Resource:  "cluster",
 		Verb:      "wait",
-		ArgsType:  reflect.TypeOf(k8s.WaitForClusterRequest{}),
+		ArgsType:  reflect.TypeOf(customClusterWaitArgs{}),
 		Run: func(ctx context.Context, argsI interface{}) (i interface{}, err error) {
+			args := argsI.(*customClusterWaitArgs)
+
 			api := k8s.NewAPI(core.ExtractClient(ctx))
-			return api.WaitForCluster(&k8s.WaitForClusterRequest{
-				Region:        argsI.(*k8s.WaitForClusterRequest).Region,
-				ClusterID:     argsI.(*k8s.WaitForClusterRequest).ClusterID,
+			cluster, err := api.WaitForCluster(&k8s.WaitForClusterRequest{
+				Region:        args.Region,
+				ClusterID:     args.ClusterID,
 				Timeout:       scw.TimeDurationPtr(clusterActionTimeout),
 				RetryInterval: core.DefaultRetryInterval,
 			})
+			if err != nil {
+				return nil, err
+			}
+
+			if args.WaitForPools {
+				pools, err := api.ListPools(&k8s.ListPoolsRequest{
+					Region:    cluster.Region,
+					ClusterID: cluster.ID,
+				}, scw.WithAllPages())
+				if err != nil {
+					return cluster, err
+				}
+				for _, pool := range pools.Pools {
+					_, err := api.WaitForPool(&k8s.WaitForPoolRequest{
+						Region:        pool.Region,
+						PoolID:        pool.ID,
+						Timeout:       scw.TimeDurationPtr(poolActionTimeout),
+						RetryInterval: core.DefaultRetryInterval,
+					})
+					if err != nil {
+						return cluster, err
+					}
+				}
+			}
+
+			return cluster, nil
 		},
 		ArgSpecs: core.ArgSpecs{
 			{
@@ -152,6 +184,10 @@ func k8sClusterWaitCommand() *core.Command {
 				Required:   true,
 				Positional: true,
 			},
+			{
+				Name:  "wait-for-pools",
+				Short: "Wait for pools to be ready.",
+			},
 			core.RegionArgSpec(),
 		},
 		Examples: []*core.Example{

diff --git a/internal/namespaces/k8s/v1/custom_cluster_test.go b/internal/namespaces/k8s/v1/custom_cluster_test.go
@@ -9,7 +9,7 @@ import (
 func Test_GetCluster(t *testing.T) {
 	t.Run("Simple", core.Test(&core.TestConfig{
 		Commands:   GetCommands(),
-		BeforeFunc: createCluster("Cluster", kapsuleVersion, 1),
+		BeforeFunc: createCluster("Cluster", kapsuleVersion, 1, "DEV1-M"),
 		Cmd:        "scw k8s cluster get {{ .Cluster.ID }}",
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
@@ -18,3 +18,16 @@ func Test_GetCluster(t *testing.T) {
 		AfterFunc: deleteCluster("Cluster"),
 	}))
 }
+
+func Test_WaitCluster(t *testing.T) {
+	t.Run("wait for pools", core.Test(&core.TestConfig{
+		Commands:   GetCommands(),
+		BeforeFunc: createCluster("Cluster", kapsuleVersion, 1, "GP1-XS"),
+		Cmd:        "scw k8s cluster wait {{ .Cluster.ID }} wait-for-pools=true",
+		Check: core.TestCheckCombine(
+			core.TestCheckGolden(),
+			core.TestCheckExitCode(0),
+		),
+		AfterFunc: deleteCluster("Cluster"),
+	}))
+}
diff --git a/internal/namespaces/k8s/v1/helpers_test.go b/internal/namespaces/k8s/v1/helpers_test.go
@@ -19,10 +19,10 @@ const (
 
 // createCluster creates a basic cluster with "poolSize" dev1-m as nodes, the given version and
 // register it in the context Meta at metaKey.
-func createCluster(metaKey string, version string, poolSize int) core.BeforeFunc {
+func createCluster(metaKey string, version string, poolSize int, nodeType string) core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
 		metaKey,
-		fmt.Sprintf("scw k8s cluster create name=cli-test version=%s cni=cilium pools.0.node-type=DEV1-M pools.0.size=%d pools.0.name=default", version, poolSize))
+		fmt.Sprintf("scw k8s cluster create name=cli-test version=%s cni=cilium pools.0.node-type=%s pools.0.size=%d pools.0.name=default", version, nodeType, poolSize))
 }
 
 // createClusterAndWaitAndKubeconfig creates a basic cluster with 1 dev1-m as node, the given version and