Merge pull request #43 from platform9/private/srinivas/apiserverflags-fix

srinivaschavan · web-flow · commit 4c4100122590 · 2024-09-10T15:13:33.000+05:30
Prevent terraform from failing when ApiServerFlags are set
diff --git a/internal/provider/cluster_resource.go b/internal/provider/cluster_resource.go
@@ -1586,6 +1586,10 @@ func createCreateClusterRequest(ctx context.Context, clusterModel *resource_clus
 			return createClusterReq, diags
 		}
 		createClusterReq.CloudProperties = cloudProperties
+		// It looks like the cloudProperties field is getting embedded under
+		// another cloudProperties field causing terraform to complain about inconsitency
+		// This fix prevents that. We might have to relook at the whole cloudProperties section later
+		createClusterReq.ApiServerFlags = cloudProperties.APIServerFlags
 	}
 
 	createClusterReq.EtcdBackup, diags = getEtcdBackupConfig(ctx, clusterModel.EtcdBackup)

Original file line number	Diff line number	Diff line change
`@@ -1586,6 +1586,10 @@ func createCreateClusterRequest(ctx context.Context, clusterModel *resource_clus`
`1586`	`1586`	`return createClusterReq, diags`
`1587`	`1587`	`}`
`1588`	`1588`	`createClusterReq.CloudProperties = cloudProperties`
	`1589`	`+ // It looks like the cloudProperties field is getting embedded under`
	`1590`	`+ // another cloudProperties field causing terraform to complain about inconsitency`
	`1591`	`+ // This fix prevents that. We might have to relook at the whole cloudProperties section later`
	`1592`	`+ createClusterReq.ApiServerFlags = cloudProperties.APIServerFlags`
`1589`	`1593`	`}`
`1590`	`1594`
`1591`	`1595`	`createClusterReq.EtcdBackup, diags = getEtcdBackupConfig(ctx, clusterModel.EtcdBackup)`