wait for mgmt cluster healthy and kubeconfig implemented

Author: sreenivasmrpivot

internal/models/ekscluster/spec.go

@@ -69,4 +69,6 @@ const (
 	releaseVersionKey           = "release_version"
 	readyCondition              = "Ready"
 	errorSeverity               = "ERROR"
+	waitForKubeconfig           = "wait_for_kubeconfig"
+	kubeconfigKey               = "kubeconfig"
 )

internal/resources/ekscluster/constants.go

@@ -10,6 +10,8 @@ import (
 	"log"
 	"strconv"
 	"time"
+	// "os"
+	// "strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -20,6 +22,9 @@ import (
 	"github.com/vmware/terraform-provider-tanzu-mission-control/internal/helper"
 	eksmodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/ekscluster"
 	"github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/common"
+
+	clustermodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/cluster"
+	configModels "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/kubeconfig"
 )
 
 func DataSourceTMCEKSCluster() *schema.Resource {
@@ -79,6 +84,35 @@ func dataSourceTMCEKSClusterRead(ctx context.Context, d *schema.ResourceData, m
 			return true, nil
 		}
 
+		// if val := os.Getenv("WAIT_FOR_HEALTHY"); strings.EqualFold(val, "TRUE") || val == "" {
+		if isWaitForKubeconfig(d) {
+			clusFullName := &clustermodel.VmwareTanzuManageV1alpha1ClusterFullName { Name: resp.EksCluster.Spec.AgentName, OrgID: clusterFn.OrgID, ManagementClusterName: "eks", ProvisionerName: "eks" }
+			clusterResp, err := config.TMCConnection.ClusterResourceService.ManageV1alpha1ClusterResourceServiceGet(clusFullName)
+			if err != nil {
+				log.Printf("Unable to get Tanzu Mission Control cluster entry, name : %s", clusterFn.Name)
+			}
+	
+			if !isManagemetClusterHealthy(clusterResp) {
+				log.Printf("[DEBUG] waiting for cluster(%s) to be in Healthy status", clusterFn.Name)
+				return true, nil
+			}
+			
+			fn := &configModels.VmwareTanzuManageV1alpha1ClusterFullName{
+				ManagementClusterName: "eks",
+				ProvisionerName:       "eks",
+				Name:                  resp.EksCluster.Spec.AgentName,
+				OrgID:                 "",
+			}
+			resp, err := config.TMCConnection.KubeConfigResourceService.KubeconfigServiceGet(fn)
+
+			if kubeConfigReady(err, resp) {
+				if err = d.Set(kubeconfigKey, resp.Kubeconfig); err != nil {
+					log.Printf("Failed to set Kubeconfig")
+					return true, nil
+				}
+			}
+		}
+		
 		return false, nil
 	}
 
@@ -124,6 +158,14 @@ func dataSourceTMCEKSClusterRead(ctx context.Context, d *schema.ResourceData, m
 	return diags
 }
 
+func isManagemetClusterHealthy(cluster *clustermodel.VmwareTanzuManageV1alpha1ClusterGetClusterResponse) bool {
+	return cluster.Cluster.Status.Health != nil && *cluster.Cluster.Status.Health == clustermodel.VmwareTanzuManageV1alpha1CommonClusterHealthHEALTHY 
+}
+
+func kubeConfigReady(err error, resp *configModels.VmwareTanzuManageV1alpha1ClusterKubeconfigGetKubeconfigResponse) bool {
+	return err == nil && *resp.Status == configModels.VmwareTanzuManageV1alpha1ClusterKubeconfigGetKubeconfigResponseStatusREADY
+}
+
 func setResourceData(d *schema.ResourceData, eksCluster *eksmodel.VmwareTanzuManageV1alpha1EksclusterEksCluster, remoteNodepools []*eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolNodepool) error {
 	status := map[string]interface{}{
 		// TODO: add condition

internal/resources/ekscluster/data_source.go

@@ -1,6 +1,3 @@
-//go:build ekscluster
-// +build ekscluster
-
 /*
 Copyright 2022 VMware, Inc. All Rights Reserved.
 SPDX-License-Identifier: MPL-2.0
@@ -14,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	eksmodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/ekscluster"
+	clustermodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/cluster"
 )
 
 func TestNodepoolPosMap(t *testing.T) {
@@ -62,3 +60,45 @@ func TestNodepoolPosMap(t *testing.T) {
 		})
 	}
 }
+
+func TestIsManagemetClusterHealthy(t *testing.T) {
+	tests := []struct {
+		name    string
+		cluster *clustermodel.VmwareTanzuManageV1alpha1ClusterGetClusterResponse
+		response bool
+		err     error
+	}{
+		{
+			name: "Not healthy",
+			cluster: &clustermodel.VmwareTanzuManageV1alpha1ClusterGetClusterResponse{
+				Cluster: &clustermodel.VmwareTanzuManageV1alpha1ClusterCluster{
+					Status: &clustermodel.VmwareTanzuManageV1alpha1ClusterStatus{
+						Health: clustermodel.NewVmwareTanzuManageV1alpha1CommonClusterHealth(clustermodel.VmwareTanzuManageV1alpha1CommonClusterHealthUNHEALTHY),
+					},
+				},
+			},
+			response: false,
+			err: nil,
+		},
+		{
+			name: "Healthy",
+			cluster: &clustermodel.VmwareTanzuManageV1alpha1ClusterGetClusterResponse{
+				Cluster: &clustermodel.VmwareTanzuManageV1alpha1ClusterCluster{
+					Status: &clustermodel.VmwareTanzuManageV1alpha1ClusterStatus{
+						Health: clustermodel.NewVmwareTanzuManageV1alpha1CommonClusterHealth(clustermodel.VmwareTanzuManageV1alpha1CommonClusterHealthHEALTHY),
+					},
+				},
+			},		
+			response: true,	
+			err: nil,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.response != isManagemetClusterHealthy(test.cluster) {
+				t.Errorf("expected function output to match")
+			}
+		})
+	}
+}

internal/resources/ekscluster/data_source_test.go

@@ -86,6 +86,17 @@ var clusterSchema = map[string]*schema.Schema{
 			return true
 		},
 	},
+	waitForKubeconfig: {
+		Type:        schema.TypeBool,
+		Description: "Wait until pinniped extension is ready to provide kubeconfig",
+		Default:     false,
+		Optional:    true,
+	},
+	kubeconfigKey: {
+		Type:        schema.TypeString,
+		Description: "Kubeconfig for connecting to newly created cluster base64 encoded. This will only be returned if you have elected to wait for kubeconfig.",
+		Computed:    true,
+	},	
 }
 
 var clusterSpecSchema = &schema.Schema{
@@ -958,3 +969,12 @@ func flattenEniConfig(item *eksmodel.VmwareTanzuManageV1alpha1EksclusterEniConfi
 
 	return data
 }
+
+func isWaitForKubeconfig(data *schema.ResourceData) bool {
+	v := data.Get(waitForKubeconfig)
+	if v != nil {
+		return v.(bool)
+	}
+
+	return false
+}