Merge pull request #41487 from itspooya/add-eks-update-strategy

resource/aws_eks_node_group : Add `update_strategy` attribute

Author: YakDriver

.changelog/41487.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_eks_node_group : Add `update_config.update_strategy` attribute
+```
+
+```release-note:enhancement
+data-source/aws_eks_node_group : Add `update_config` block including `update_strategy` attribute
+```

internal/service/eks/node_group.go

@@ -359,6 +359,11 @@ func resourceNodeGroup() *schema.Resource {
 								"update_config.0.max_unavailable_percentage",
 							},
 						},
+						"update_strategy": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							ValidateDiagFunc: enum.Validate[types.NodegroupUpdateStrategies](),
+						},
 					},
 				},
 			},
@@ -986,6 +991,10 @@ func expandNodegroupUpdateConfig(tfMap map[string]any) *types.NodegroupUpdateCon
 		apiObject.MaxUnavailablePercentage = aws.Int32(int32(v))
 	}
 
+	if v, ok := tfMap["update_strategy"].(string); ok && v != "" {
+		apiObject.UpdateStrategy = types.NodegroupUpdateStrategies(v)
+	}
+
 	return apiObject
 }
 
@@ -1239,6 +1248,10 @@ func flattenNodegroupUpdateConfig(apiObject *types.NodegroupUpdateConfig) map[st
 		tfMap["max_unavailable_percentage"] = aws.ToInt32(v)
 	}
 
+	if apiObject.UpdateStrategy != "" {
+		tfMap["update_strategy"] = string(apiObject.UpdateStrategy)
+	}
+
 	return tfMap
 }
 

internal/service/eks/node_group_data_source.go

@@ -176,6 +176,26 @@ func dataSourceNodeGroup() *schema.Resource {
 					},
 				},
 			},
+			"update_config": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"max_unavailable": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"max_unavailable_percentage": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"update_strategy": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
 			names.AttrVersion: {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -231,6 +251,13 @@ func dataSourceNodeGroupRead(ctx context.Context, d *schema.ResourceData, meta a
 	if err := d.Set("taints", flattenTaints(nodeGroup.Taints)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "setting taints: %s", err)
 	}
+	if nodeGroup.UpdateConfig != nil {
+		if err := d.Set("update_config", []any{flattenNodegroupUpdateConfig(nodeGroup.UpdateConfig)}); err != nil {
+			return sdkdiag.AppendErrorf(diags, "setting update_config: %s", err)
+		}
+	} else {
+		d.Set("update_config", nil)
+	}
 	d.Set(names.AttrVersion, nodeGroup.Version)
 
 	if err := d.Set(names.AttrTags, keyValueTags(ctx, nodeGroup.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {

internal/service/eks/node_group_data_source_test.go

@@ -49,6 +49,7 @@ func TestAccEKSNodeGroupDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(resourceName, "subnet_ids.#", dataSourceResourceName, "subnet_ids.#"),
 					resource.TestCheckResourceAttrPair(resourceName, "taint.#", dataSourceResourceName, "taints.#"),
 					resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsPercent, dataSourceResourceName, acctest.CtTagsPercent),
+					resource.TestCheckResourceAttrPair(resourceName, "update_config.#", dataSourceResourceName, "update_config.#"),
 					resource.TestCheckResourceAttrPair(resourceName, names.AttrVersion, dataSourceResourceName, names.AttrVersion),
 				),
 			},

internal/service/eks/node_group_test.go

@@ -1069,6 +1069,52 @@ func TestAccEKSNodeGroup_update(t *testing.T) {
 	})
 }
 
+func TestAccEKSNodeGroup_updateStrategy(t *testing.T) {
+	ctx := acctest.Context(t)
+	var nodeGroup1, nodeGroup2 types.Nodegroup
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_eks_node_group.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, names.EKSServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckNodeGroupDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNodeGroupConfig_update1(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup1),
+					resource.TestCheckResourceAttr(resourceName, "update_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "update_config.0.max_unavailable", "1"),
+					resource.TestCheckResourceAttr(resourceName, "update_config.0.max_unavailable_percentage", "0"),
+				),
+			},
+			{
+				Config: testAccNodeGroupConfig_updateStrategy(rName, "DEFAULT"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup1),
+					resource.TestCheckResourceAttr(resourceName, "update_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "update_config.0.update_strategy", "DEFAULT"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccNodeGroupConfig_updateStrategy(rName, "MINIMAL"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup2),
+					resource.TestCheckResourceAttr(resourceName, "update_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "update_config.0.update_strategy", "MINIMAL"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccEKSNodeGroup_version(t *testing.T) {
 	ctx := acctest.Context(t)
 	var nodeGroup1, nodeGroup2 types.Nodegroup
@@ -2403,6 +2449,35 @@ resource "aws_eks_node_group" "test" {
 `, rName))
 }
 
+func testAccNodeGroupConfig_updateStrategy(rName, updateStrategy string) string {
+	return acctest.ConfigCompose(testAccNodeGroupConfig_base(rName), fmt.Sprintf(`
+resource "aws_eks_node_group" "test" {
+  cluster_name    = aws_eks_cluster.test.name
+  node_group_name = %[1]q
+  node_role_arn   = aws_iam_role.node.arn
+  subnet_ids      = aws_subnet.test[*].id
+
+  scaling_config {
+    desired_size = 1
+    max_size     = 3
+    min_size     = 1
+  }
+
+  update_config {
+    max_unavailable = 1
+    update_strategy = %[2]q
+  }
+
+  depends_on = [
+    aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy,
+    aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy,
+    aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly,
+    aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy,
+  ]
+}
+`, rName, updateStrategy))
+}
+
 func testAccNodeGroupConfig_version(rName, version string) string {
 	return acctest.ConfigCompose(testAccNodeGroupConfig_versionBase(rName, version), fmt.Sprintf(`
 resource "aws_eks_node_group" "test" {

website/docs/r/eks_node_group.html.markdown

@@ -206,6 +206,7 @@ The following arguments are mutually exclusive.
 
 * `max_unavailable` - (Optional) Desired max number of unavailable worker nodes during node group update.
 * `max_unavailable_percentage` - (Optional) Desired max percentage of unavailable worker nodes during node group update.
+* `update_strategy` - (Optional) Strategy to use for updating the node group. Valid values: `MINIMAL` and `DEFAULT`.
 
 ## Attribute Reference