Fix AdoptedResources functionality for CapacityReservations

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-05-13T17:53:20Z"
-  build_hash: 55bf57b2806c33a7fcd074be403f26ce3f8e58db
-  go_version: go1.24.2
-  version: v0.46.2
+  build_date: "2025-05-26T04:21:07Z"
+  build_hash: b57010693b861c793703028023ae75209a6af343
+  go_version: go1.24.0
+  version: v0.43.2-26-gb570106-dirty
 api_directory_checksum: 3df6921566512e42abdabd564c80aea5311d410a
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 631d4b99d0839af4f2c0561d15f7da3c911786d7
+  file_checksum: 172877410214b442af4d618739f2222b3dfebb3b
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -325,8 +325,14 @@ resources:
         template_path: hooks/capacity_reservation/sdk_create_post_build_request.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/capacity_reservation/sdk_update_pre_build_request.go.tpl
+      sdk_update_post_build_request:
+        template_path: hooks/capacity_reservation/sdk_update_post_build_request.go.tpl
       sdk_update_post_set_output:
         template_path: hooks/capacity_reservation/sdk_update_post_set_output.go.tpl
+      post_set_resource_identifiers:
+        template_path: hooks/capacity_reservation/post_set_resource_identifiers.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/capacity_reservation/sdk_read_many_post_set_output.go.tpl
   DhcpOptions:
     exceptions:
       terminal_codes:

config/controller/kustomization.yaml

@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/ec2-controller
-  newTag: 1.4.4
+  newTag: 1.4.5

generator.yaml

@@ -325,8 +325,14 @@ resources:
         template_path: hooks/capacity_reservation/sdk_create_post_build_request.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/capacity_reservation/sdk_update_pre_build_request.go.tpl
+      sdk_update_post_build_request:
+        template_path: hooks/capacity_reservation/sdk_update_post_build_request.go.tpl
       sdk_update_post_set_output:
         template_path: hooks/capacity_reservation/sdk_update_post_set_output.go.tpl
+      post_set_resource_identifiers:
+        template_path: hooks/capacity_reservation/post_set_resource_identifiers.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/capacity_reservation/sdk_read_many_post_set_output.go.tpl
   DhcpOptions:
     exceptions:
       terminal_codes:

helm/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: ec2-chart
 description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2)
-version: 1.4.4
-appVersion: 1.4.4
+version: 1.4.5
+appVersion: 1.4.5
 home: https://github.com/aws-controllers-k8s/ec2-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

helm/templates/NOTES.txt

@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.4".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.5".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/ec2-controller
-  tag: 1.4.4
+  tag: 1.4.5
   pullPolicy: IfNotPresent
   pullSecrets: []
 

templates/hooks/capacity_reservation/post_set_resource_identifiers.go.tpl

@@ -0,0 +1,24 @@
+
+	if instanceCount, ok := identifier.AdditionalKeys["instanceCount"]; ok {
+			parsedInstanceCount, err := strconv.ParseInt(instanceCount, 10, 64)
+			if err != nil {
+				return fmt.Errorf("failed to parse instanceCount: %v", err)
+			}
+			r.ko.Spec.InstanceCount = &parsedInstanceCount
+	}
+
+	if instancePlatform, ok := identifier.AdditionalKeys["instancePlatform"]; ok {
+		r.ko.Spec.InstancePlatform = &instancePlatform
+	}
+
+	if instanceType, ok := identifier.AdditionalKeys["instanceType"]; ok {
+		r.ko.Spec.InstanceType = &instanceType
+	}
+
+	if availabilityZone, ok := identifier.AdditionalKeys["availabilityZone"]; ok {
+		r.ko.Spec.AvailabilityZone = &availabilityZone
+	}
+
+	if availabilityZoneID, ok := identifier.AdditionalKeys["availabilityZoneID"]; ok {
+		r.ko.Spec.AvailabilityZoneID = &availabilityZoneID
+	}

templates/hooks/capacity_reservation/sdk_read_many_post_set_output.go.tpl

@@ -0,0 +1,7 @@
+
+    // set the instance count in spec from the total instance count in status,
+	// without this there's no diff detected for this field in the desired object and latest state in aws 
+	// causing update calls to have no effect at all
+	if ko.Status.TotalInstanceCount != nil {
+		ko.Spec.InstanceCount = ko.Status.TotalInstanceCount
+	}

templates/hooks/capacity_reservation/sdk_update_post_build_request.go.tpl

@@ -0,0 +1,9 @@
+
+    // If additionalInfo field is being updated, other fields cannot be modified simultaneously,
+	// hence we reset them or else we run into InvalidParameterCombination error
+	if input.AdditionalInfo != nil {
+		input.InstanceCount = nil
+		input.EndDate = nil
+		input.EndDateType = ""
+		input.InstanceMatchCriteria = ""
+	}