Add adoption by annotation logic & tests (#232)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: michaelhtm

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2024-10-22T13:52:25Z"
-  build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
+  build_date: "2024-12-04T16:46:43Z"
+  build_hash: 5b95c1667a03835266df2d3f598718dd164184af
   go_version: go1.23.2
-  version: v0.39.1
+  version: v0.39.1-8-g5b95c16
 api_directory_checksum: 585098fc7c99c27ca523f83e860107d22aaa5a10
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: 2c5ef491ef62c9347bcb87918f715692adf727bc
+  file_checksum: 4a977c2334f44fd0ea8d09dd6afe759cd7459eb1
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -351,6 +351,8 @@ resources:
         template_path: hooks/flow_log/sdk_file_end.go.tpl
       post_set_resource_identifiers:
         template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
+      post_populate_resource_from_annotation:
+        template_path: hooks/flow_log/post_populate_resource_from_annotation.go.tpl
     update_operation:
       custom_method_name: customUpdateFlowLog
   InternetGateway:

config/controller/deployment.yaml

@@ -41,6 +41,8 @@ spec:
         - "$(LEADER_ELECTION_NAMESPACE)"
         - --reconcile-default-max-concurrent-syncs
         - "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
+        - --feature-gates
+        - "$(FEATURE_GATES)"
         image: controller:latest
         name: controller
         ports:
@@ -76,6 +78,8 @@ spec:
           value: "ack-system"
         - name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS"
           value: "1"
+        - name: "FEATURE_GATES"
+          value: ""
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false

generator.yaml

@@ -351,6 +351,8 @@ resources:
         template_path: hooks/flow_log/sdk_file_end.go.tpl
       post_set_resource_identifiers:
         template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
+      post_populate_resource_from_annotation:
+        template_path: hooks/flow_log/post_populate_resource_from_annotation.go.tpl
     update_operation:
       custom_method_name: customUpdateFlowLog
   InternetGateway:

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.6
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.39.0
+	github.com/aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130
 	github.com/aws/aws-sdk-go v1.49.0
 	github.com/go-logr/logr v1.4.2
 	github.com/samber/lo v1.37.0

go.sum

@@ -1,5 +1,7 @@
 github.com/aws-controllers-k8s/runtime v0.39.0 h1:IgOXluSzvb4UcDr9eU7SPw5MJnL7kt5R6DuF5Qu9zVQ=
 github.com/aws-controllers-k8s/runtime v0.39.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
+github.com/aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130 h1:EoXYRrpBX2hi5B1IawKr2LJTsVsreHsJdxULLlMNO9U=
+github.com/aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
 github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
 github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

helm/templates/caches-role-binding.yaml

@@ -8,7 +8,7 @@ roleRef:
   name: ack-namespaces-cache-ec2-controller
 subjects:
 - kind: ServiceAccount
-  name: ack-ec2-controller
+  name: {{ include "ack-ec2-controller.service-account.name" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -22,5 +22,5 @@ roleRef:
   name: ack-configmaps-cache-ec2-controller
 subjects:
 - kind: ServiceAccount
-  name: ack-ec2-controller
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "ack-ec2-controller.service-account.name" . }}
+  namespace: {{ .Release.Namespace }}

helm/values.yaml

@@ -163,4 +163,6 @@ featureGates:
   # Enables the Team level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031
   TeamLevelCARM: false
   # Enable ReadOnlyResources feature/annotation. 
-  ReadOnlyResources: false
+  ReadOnlyResources: false
+  # Enable ResourceAdoption feature/annotation. 
+  ResourceAdoption: false