Better NPE handling of updateComputeConfig

Author: kunhwi.ko

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,6 +1,6 @@
 ack_generate_info:
-  build_date: "2025-09-19T17:11:39Z"
-  build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd
+  build_date: "2025-10-05T05:04:19Z"
+  build_hash: 37562000612658e62686882f1b4b924049d1e38c
   go_version: go1.24.6
   version: v0.52.0
 api_directory_checksum: 2b5e65a1d5f0a032d51209f925b714aff4b6dc96

pkg/resource/cluster/hook.go

@@ -666,37 +666,54 @@ func (rm *resourceManager) updateComputeConfig(
 	exit := rlog.Trace("rm.updateComputeConfig")
 	defer exit(err)
 
-	// Convert []*string to []string for NodePools
-	nodePools := make([]string, 0, len(r.ko.Spec.ComputeConfig.NodePools))
-	for _, nodePool := range r.ko.Spec.ComputeConfig.NodePools {
-		if nodePool != nil {
-			nodePools = append(nodePools, *nodePool)
-		}
-	}
-
+	// All three fields must be initialized for EKS Auto Mode to be properly toggled.
 	input := &svcsdk.UpdateClusterConfigInput{
-		Name: r.ko.Spec.Name,
-		ComputeConfig: &svcsdktypes.ComputeConfigRequest{
-			Enabled:     r.ko.Spec.ComputeConfig.Enabled,
-			NodePools:   nodePools, // Use the converted []string slice
-			NodeRoleArn: r.ko.Spec.ComputeConfig.NodeRoleARN,
-		},
+		Name:          r.ko.Spec.Name,
+		ComputeConfig: &svcsdktypes.ComputeConfigRequest{},
 		StorageConfig: &svcsdktypes.StorageConfigRequest{
-			BlockStorage: &svcsdktypes.BlockStorage{
-				Enabled: r.ko.Spec.StorageConfig.BlockStorage.Enabled,
-			},
+			BlockStorage: &svcsdktypes.BlockStorage{},
 		},
 		KubernetesNetworkConfig: &svcsdktypes.KubernetesNetworkConfigRequest{
-			ElasticLoadBalancing: &svcsdktypes.ElasticLoadBalancing{
-				Enabled: r.ko.Spec.KubernetesNetworkConfig.ElasticLoadBalancing.Enabled,
-			},
-			IpFamily:        svcsdktypes.IpFamily(*r.ko.Spec.KubernetesNetworkConfig.IPFamily),
-			ServiceIpv4Cidr: r.ko.Spec.KubernetesNetworkConfig.ServiceIPv4CIDR,
+			ElasticLoadBalancing: &svcsdktypes.ElasticLoadBalancing{},
 		},
 	}
 
+	// Process compute configs
+	if r.ko.Spec.ComputeConfig != nil {
+		// Convert []*string to []string for NodePools
+		nodePools := make([]string, 0, len(r.ko.Spec.ComputeConfig.NodePools))
+		for _, nodePool := range r.ko.Spec.ComputeConfig.NodePools {
+			if nodePool != nil {
+				nodePools = append(nodePools, *nodePool)
+			}
+		}
+
+		input.ComputeConfig.Enabled = r.ko.Spec.ComputeConfig.Enabled
+		input.ComputeConfig.NodePools = nodePools // Use the converted []string slice
+		input.ComputeConfig.NodeRoleArn = r.ko.Spec.ComputeConfig.NodeRoleARN
+	}
+
+	// Process storage configs
+	if r.ko.Spec.StorageConfig != nil && r.ko.Spec.StorageConfig.BlockStorage != nil {
+		input.StorageConfig.BlockStorage.Enabled = r.ko.Spec.StorageConfig.BlockStorage.Enabled
+	}
+
+	// Process network configs
+	if r.ko.Spec.KubernetesNetworkConfig != nil {
+		if r.ko.Spec.KubernetesNetworkConfig.ElasticLoadBalancing != nil {
+			input.KubernetesNetworkConfig.ElasticLoadBalancing.Enabled = r.ko.Spec.KubernetesNetworkConfig.ElasticLoadBalancing.Enabled
+		}
+
+		if r.ko.Spec.KubernetesNetworkConfig.IPFamily != nil {
+			input.KubernetesNetworkConfig.IpFamily = svcsdktypes.IpFamily(*r.ko.Spec.KubernetesNetworkConfig.IPFamily)
+		}
+
+		input.KubernetesNetworkConfig.ServiceIpv4Cidr = r.ko.Spec.KubernetesNetworkConfig.ServiceIPv4CIDR
+	}
+
 	_, err = rm.sdkapi.UpdateClusterConfig(ctx, input)
 	rm.metrics.RecordAPICall("UPDATE", "UpdateClusterConfig", err)
+
 	if err != nil {
 		return err
 	}

pkg/resource/cluster/sdk.go

@@ -5,6 +5,16 @@
 	if r.ko.Spec.ResourcesVPCConfig != nil && r.ko.Spec.ResourcesVPCConfig.SecurityGroupRefs != nil {
 		ko.Spec.ResourcesVPCConfig.SecurityGroupRefs = r.ko.Spec.ResourcesVPCConfig.SecurityGroupRefs
 	}
+
+	latestConfig := ko.Spec.KubernetesNetworkConfig
+
+	// ElasticLoadBalancing can by default be initialized as false even when ACK is providing an empty input.
+	// This condition prevents unnecessary deltas when the desired value is empty and ElasticLoadBalancing is already disabled.
+	if latestConfig != nil && latestConfig.ElasticLoadBalancing != nil && latestConfig.ElasticLoadBalancing.Enabled != nil {
+		if *latestConfig.ElasticLoadBalancing.Enabled == false && r.ko.Spec.KubernetesNetworkConfig == nil {
+			latestConfig.ElasticLsoadBalancing = nil
+		}
+	}
 
 	if !clusterActive(&resource{ko}) {
 		// Setting resource synced condition to false will trigger a requeue of