Add GKE max_pods_per_node_formula field

Author: Furkhat Kasymov Genii Uulu

castai/resource_node_configuration.go

@@ -67,6 +67,10 @@ const (
 	aksDiskCacheReadWrite                 = "ReadWrite"
 )
 
+const (
+	nodeConfigurationGKEMaxPodsPerNodeDefault = 110
+)
+
 func resourceNodeConfiguration() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceNodeConfigurationCreate,
@@ -508,15 +512,26 @@ func resourceNodeConfiguration() *schema.Resource {
 			FieldNodeConfigurationGKE: {
 				Type:     schema.TypeList,
 				Optional: true,
+				Computed: true,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"max_pods_per_node_formula": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Description: `This is an advanced configuration field. In general, we recommend using max_pods_per_node instead.
+This field accepts a formula to calculate the maximum number of pods that can run on a node. This will affect the pod CIDR range that the node reserves. The following variables are available for use in the formula and will be bound to numeric values before evaluation:
+
+NUM_CPU - Number of CPUs available on the node
+NUM_RAM_GB - Amount of RAM in gigabytes available on the node`,
+							ConflictsWith: []string{FieldNodeConfigurationGKE + ".0.max_pods_per_node"},
+						},
 						"max_pods_per_node": {
 							Type:             schema.TypeInt,
-							Default:          110,
 							Optional:         true,
 							ValidateDiagFunc: validation.ToDiagFunc(validation.IntBetween(10, 256)),
 							Description:      "Maximum number of pods that can be run on a node, which affects how many IP addresses you will need for each node. Defaults to 110",
+							ConflictsWith:    []string{FieldNodeConfigurationGKE + ".0.max_pods_per_node_formula"},
 						},
 						"network_tags": {
 							Type: schema.TypeList,
@@ -617,10 +632,37 @@ func resourceNodeConfiguration() *schema.Resource {
 				},
 			},
 		},
-		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
+		CustomizeDiff: customizeGKEMaxPodsField,
+	}
+}
+
+func customizeGKEMaxPodsField(_ context.Context, d *schema.ResourceDiff, _ interface{}) error {
+	if v, ok := d.GetOk(FieldNodeConfigurationGKE); ok {
+		gkeList := v.([]interface{})
+		gke := gkeList[0].(map[string]interface{})
+
+		static, formula := gke["max_pods_per_node"], gke["max_pods_per_node_formula"]
+		staticNotSet := static == nil || static.(int) == 0
+		formulaNotSet := formula == nil || formula.(string) == ""
+		if staticNotSet && formulaNotSet {
+			gke["max_pods_per_node"] = nodeConfigurationGKEMaxPodsPerNodeDefault
+			gkeList = []interface{}{gke}
+			if err := d.SetNew(FieldNodeConfigurationGKE, gkeList); err != nil {
+				return err
+			}
 			return nil
-		},
+		}
+		if !formulaNotSet {
+			gke["max_pods_per_node"] = nil
+			gkeList = []interface{}{gke}
+			if err := d.SetNew(FieldNodeConfigurationGKE, gkeList); err != nil {
+				return err
+			}
+			return nil
+
+		}
 	}
+	return nil
 }
 
 func resourceNodeConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -1491,7 +1533,10 @@ func toGKEConfig(obj map[string]interface{}) *sdk.NodeconfigV1GKEConfig {
 	}
 
 	out := &sdk.NodeconfigV1GKEConfig{}
-	if v, ok := obj["max_pods_per_node"].(int); ok {
+	if v, ok := obj["max_pods_per_node_formula"].(string); ok && len(v) > 0 {
+		out.MaxPodsPerNodeFormula = toPtr(v)
+	}
+	if v, ok := obj["max_pods_per_node"].(int); ok && v != 0 {
 		out.MaxPodsPerNode = toPtr(int32(v))
 	}
 	if v, ok := obj["network_tags"].([]interface{}); ok {
@@ -1597,6 +1642,9 @@ func flattenGKEConfig(config *sdk.NodeconfigV1GKEConfig) []map[string]interface{
 		return nil
 	}
 	m := map[string]interface{}{}
+	if v := config.MaxPodsPerNodeFormula; v != nil {
+		m["max_pods_per_node_formula"] = *config.MaxPodsPerNodeFormula
+	}
 	if v := config.MaxPodsPerNode; v != nil {
 		m["max_pods_per_node"] = *config.MaxPodsPerNode
 	}

castai/resource_node_configuration_gke_test.go

@@ -37,6 +37,45 @@ func TestAccGKE_ResourceNodeConfiguration(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node", "31"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node_formula", ""),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.disk_type", "pd-balanced"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.0", "ab"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.1", "bc"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.zones.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.on_host_maintenance", "MIGRATE"),
+				),
+			},
+			{
+				Config: testAccGKENodeConfigurationConfigWithoutMaxPods(rName, clusterName, projectID),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "35"),
+					resource.TestCheckResourceAttr(resourceName, "drain_timeout_sec", "10"),
+					resource.TestCheckResourceAttr(resourceName, "min_disk_size", "122"),
+					resource.TestCheckResourceAttr(resourceName, "aks.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node", "110"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node_formula", ""),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.disk_type", "pd-balanced"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.0", "ab"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.1", "bc"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.zones.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.on_host_maintenance", "MIGRATE"),
+				),
+			},
+			{
+				Config: testAccGKENodeConfigurationConfigWithMaxPodsFormula(rName, clusterName, projectID),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "35"),
+					resource.TestCheckResourceAttr(resourceName, "drain_timeout_sec", "10"),
+					resource.TestCheckResourceAttr(resourceName, "min_disk_size", "122"),
+					resource.TestCheckResourceAttr(resourceName, "aks.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node", "0"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node_formula", "NUM_CPU"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.disk_type", "pd-balanced"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.0", "ab"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.1", "bc"),
@@ -53,6 +92,7 @@ func TestAccGKE_ResourceNodeConfiguration(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node", "32"),
+					resource.TestCheckResourceAttr(resourceName, "gke.0.max_pods_per_node_formula", ""),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.disk_type", "pd-ssd"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.0", "bb"),
 					resource.TestCheckResourceAttr(resourceName, "gke.0.network_tags.1", "dd"),
@@ -81,6 +121,35 @@ func TestAccGKE_ResourceNodeConfiguration(t *testing.T) {
 }
 
 func testAccGKENodeConfigurationConfig(rName, clusterName, projectID string) string {
+	const gkeParams = `
+		max_pods_per_node = 31
+		network_tags = ["ab", "bc"]
+		disk_type = "pd-balanced"
+		on_host_maintenance = "MIGRATE"
+	`
+	return testAccGKENodeConfigurationConfigWithGKEConfig(rName, clusterName, projectID, gkeParams)
+}
+
+func testAccGKENodeConfigurationConfigWithoutMaxPods(rName, clusterName, projectID string) string {
+	const gkeParams = `
+		network_tags = ["ab", "bc"]
+		disk_type = "pd-balanced"
+		on_host_maintenance = "MIGRATE"
+	`
+	return testAccGKENodeConfigurationConfigWithGKEConfig(rName, clusterName, projectID, gkeParams)
+}
+
+func testAccGKENodeConfigurationConfigWithMaxPodsFormula(rName, clusterName, projectID string) string {
+	const gkeParams = `
+		max_pods_per_node_formula = "NUM_CPU"
+		network_tags = ["ab", "bc"]
+		disk_type = "pd-balanced"
+		on_host_maintenance = "MIGRATE"
+	`
+	return testAccGKENodeConfigurationConfigWithGKEConfig(rName, clusterName, projectID, gkeParams)
+}
+
+func testAccGKENodeConfigurationConfigWithGKEConfig(rName, clusterName, projectID, gkeParams string) string {
 	return ConfigCompose(testAccGKEClusterConfig(rName, clusterName, projectID), fmt.Sprintf(`
 resource "castai_node_configuration" "test" {
   name   		    = %[1]q
@@ -93,18 +162,15 @@ resource "castai_node_configuration" "test" {
     env = "development"
   }
   gke {
-	max_pods_per_node = 31
-    network_tags = ["ab", "bc"]
-    disk_type = "pd-balanced"
-    on_host_maintenance = "MIGRATE"
+		%s
   }
 }
 
 resource "castai_node_configuration_default" "test" {
   cluster_id       = castai_gke_cluster.test.id
   configuration_id = castai_node_configuration.test.id
 }
-`, rName))
+`, rName, gkeParams))
 }
 
 func testAccGKENodeConfigurationUpdated(rName, clusterName, projectID string) string {