fix: return overrides and default node pool on gcp k8s (#333)

multycloud · Jul 6, 2022 · 5a2091e · 5a2091e
1 parent 7a1a1f5
commit 5a2091e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/resources/types/aws/kubernetes_cluster.go b/resources/types/aws/kubernetes_cluster.go
@@ -92,6 +92,7 @@ func (r AwsKubernetesCluster) FromState(state *output.TfState) (*resourcespb.Kub
 		Name:             r.Args.Name,
 		ServiceCidr:      r.Args.ServiceCidr,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
+		GcpOverride:      r.Args.GcpOverride,
 	}
 	result.Endpoint = "dryrun"
 	if !flags.DryRun {

diff --git a/resources/types/azure/kubernetes_cluster.go b/resources/types/azure/kubernetes_cluster.go
@@ -31,6 +31,7 @@ func (r AzureKubernetesCluster) FromState(state *output.TfState) (*resourcespb.K
 		Name:             r.Args.Name,
 		ServiceCidr:      r.Args.ServiceCidr,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
+		GcpOverride:      r.Args.GcpOverride,
 	}
 	result.Endpoint = "dryrun"
 	if !flags.DryRun {

diff --git a/resources/types/gcp/kubernetes_cluster.go b/resources/types/gcp/kubernetes_cluster.go
@@ -37,6 +37,7 @@ func (r GcpKubernetesCluster) FromState(state *output.TfState) (*resourcespb.Kub
 		Name:             r.Args.Name,
 		ServiceCidr:      r.Args.ServiceCidr,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
+		GcpOverride:      r.Args.GcpOverride,
 	}
 	result.Endpoint = "dryrun"
 	if !flags.DryRun {
@@ -55,6 +56,12 @@ func (r GcpKubernetesCluster) FromState(state *output.TfState) (*resourcespb.Kub
 		result.KubeConfigRaw = rawConfig
 	}
 
+	var err error
+	result.DefaultNodePool, err = GcpKubernetesNodePool{r.DefaultNodePool}.FromState(state)
+	if err != nil {
+		return nil, err
+	}
+
 	return result, nil
 }
 

diff --git a/resources/types/gcp/kubernetes_node_pool.go b/resources/types/gcp/kubernetes_node_pool.go
@@ -34,9 +34,10 @@ func (r GcpKubernetesNodePool) FromState(state *output.TfState) (*resourcespb.Ku
 		MaxNodeCount:      r.Args.MaxNodeCount,
 		VmSize:            r.Args.VmSize,
 		DiskSizeGb:        r.Args.DiskSizeGb,
-		Labels:            r.Args.Labels,
-		AzureOverride:     r.Args.AzureOverride,
 		AvailabilityZone:  r.Args.AvailabilityZone,
+		AwsOverride:       r.Args.AwsOverride,
+		AzureOverride:     r.Args.AzureOverride,
+		Labels:            r.Args.Labels,
 	}, nil
 }