PLT-1956: Fixed config drift issue for machine pool config

docs/resources/cluster_maas.md

@@ -216,10 +216,6 @@ Required:
 
 - `resource_pool` (String) The name of the resource pool in the Maas cloud.
 
-Read-Only:
-
-- `id` (String) This is a computed(read-only) ID of the placement that is used to connect to the Maas cloud.
-
 
 <a id="nestedblock--machine_pool--network"></a>
 ### Nested Schema for `machine_pool.network`

spectrocloud/cluster_common_namespaces.go

@@ -37,22 +37,28 @@ func toClusterNamespace(clusterRbacBinding interface{}) *models.V1ClusterNamespa
 		return nil
 	}
 
-	gpu_limit, err := strconv.ParseInt(resourceAllocation["gpu_limit"].(string), 10, 32)
-	if err != nil {
-		return nil
-	}
-	gpu_provider := "nvidia"
-	if provider, exists := resourceAllocation["gpu_provider"]; exists {
-		gpu_provider = provider.(string)
+	var gpuConfig *models.V1GpuConfig
+	if gpuLimitVal, exists := resourceAllocation["gpu_limit"]; exists && gpuLimitVal != nil {
+		gpu_limit, err := strconv.ParseInt(gpuLimitVal.(string), 10, 32)
+		if err != nil {
+			return nil
+		}
+
+		gpu_provider := "nvidia"
+		if provider, exists := resourceAllocation["gpu_provider"]; exists && provider != nil {
+			gpu_provider = provider.(string)
+		}
+
+		gpuConfig = &models.V1GpuConfig{
+			Limit:    int32(gpu_limit),
+			Provider: &gpu_provider,
+		}
 	}
 
 	resource_alloc := &models.V1ClusterNamespaceResourceAllocation{
 		CPUCores:  cpu_cores,
 		MemoryMiB: memory_MiB,
-		GpuConfig: &models.V1GpuConfig{
-			Limit:    int32(gpu_limit),
-			Provider: &gpu_provider,
-		},
+		GpuConfig: gpuConfig,
 	}
 
 	ns := &models.V1ClusterNamespaceResourceInputEntity{
@@ -78,11 +84,15 @@ func flattenClusterNamespaces(items []*models.V1ClusterNamespaceResource) []inte
 		flattenResourceAllocation := make(map[string]interface{})
 		flattenResourceAllocation["cpu_cores"] = strconv.Itoa(int(math.Round(namespace.Spec.ResourceAllocation.CPUCores)))
 		flattenResourceAllocation["memory_MiB"] = strconv.Itoa(int(math.Round(namespace.Spec.ResourceAllocation.MemoryMiB)))
-		flattenResourceAllocation["gpu_limit"] = strconv.Itoa(int(namespace.Spec.ResourceAllocation.GpuConfig.Limit))
-		if namespace.Spec.ResourceAllocation.GpuConfig.Provider != nil {
-			flattenResourceAllocation["gpu_provider"] = *namespace.Spec.ResourceAllocation.GpuConfig.Provider
-		} else {
-			flattenResourceAllocation["gpu_provider"] = "nvidia"
+
+		// Only set GPU fields if GpuConfig exists and has meaningful values
+		if namespace.Spec.ResourceAllocation.GpuConfig != nil && namespace.Spec.ResourceAllocation.GpuConfig.Limit > 0 {
+			flattenResourceAllocation["gpu_limit"] = strconv.Itoa(int(namespace.Spec.ResourceAllocation.GpuConfig.Limit))
+			if namespace.Spec.ResourceAllocation.GpuConfig.Provider != nil {
+				flattenResourceAllocation["gpu_provider"] = *namespace.Spec.ResourceAllocation.GpuConfig.Provider
+			} else {
+				flattenResourceAllocation["gpu_provider"] = "nvidia"
+			}
 		}
 
 		flattenNamespace["resource_allocation"] = flattenResourceAllocation

spectrocloud/resource_cluster_maas.go

@@ -261,11 +261,6 @@ func resourceClusterMaas() *schema.Resource {
 							MaxItems: 1,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
-									"id": {
-										Type:        schema.TypeString,
-										Computed:    true,
-										Description: "This is a computed(read-only) ID of the placement that is used to connect to the Maas cloud.",
-									},
 									"resource_pool": {
 										Type:        schema.TypeString,
 										Required:    true,
@@ -613,7 +608,7 @@ func toMaasCluster(c *client.V1Client, d *schema.ResourceData) (*models.V1Spectr
 			Policies:        toPolicies(d),
 			CloudConfig: &models.V1MaasClusterConfig{
 				Domain:      &DomainVal,
-				EnableLxdVM: d.Get("enable_lxd_vm").(bool),
+				EnableLxdVM: cloudConfig["enable_lxd_vm"].(bool),
 			},
 		},
 	}