fixing code-gen-version,test-cases,etc

aws-controllers-k8s · Sep 25, 2023 · 29f48f7 · 29f48f7
1 parent fdc8455
commit 29f48f7
Show file tree

Hide file tree

Showing 21 changed files with 556 additions and 512 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2023-09-20T11:19:38Z"
-  build_hash: e9b68590da73ce9143ba1e4361cebdc1d876c81e
+  build_date: "2023-09-24T06:21:32Z"
+  build_hash: 892f29d00a4c4ad21a2fa32919921de18190979d
   go_version: go1.20.3
-  version: v0.26.1-7-ge9b6859
-api_directory_checksum: 5fba18fb7f9bccf860caf2da80e33859d4f93020
+  version: v0.27.1
+api_directory_checksum: 62d52ec595b37efec3f76b5863d14477e41b4987
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: ae8176be538fe3f653bc1bad979f59bba34b1cbc
+  file_checksum: 4a938ee6da37ee5c79556fdbdafce4b1376b1da3
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -53,6 +53,9 @@ ignore:
     - SecurityGroupRule.GroupOwnerId
     - SecurityGroupRule.ReferencedGroupInfo
     - TerminateInstancesInput.DryRun
+    - CreateLaunchTemplateInput.ClientToken
+    - CreateLaunchTemplateInput.DryRun
+    - CreateLaunchTemplateInput.Tags  
   resource_names:
     - AccountAttribute
     - CapacityReservation
@@ -210,6 +213,12 @@ resources:
         print:
           path: Status.latestVersionNumber
           name: LatestVersion
+      Tags:
+        from:
+          operation: CreateTags
+          path: Tags
+        compare:
+          is_ignored: True
     tags:
       ignore: true
     renames:
@@ -226,8 +235,6 @@ resources:
         DescribeLaunchTemplate:
           input_fields:
             LaunchTemplateName: Name
-    reconcile:
-      requeue_on_success_seconds: 60
     hooks:
       sdk_update_post_build_request:
         template_path: hooks/launch_template/sdk_update_post_build_request.go.tpl

diff --git a/apis/v1alpha1/launch_template.go b/apis/v1alpha1/launch_template.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/controller/controller b/cmd/controller/controller
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -29,14 +29,16 @@ spec:
         - "$(AWS_REGION)"
         - --aws-endpoint-url
         - "$(AWS_ENDPOINT_URL)"
-        - --enable-development-logging
-        - "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
+        - --enable-development-logging=$(ACK_ENABLE_DEVELOPMENT_LOGGING)
         - --log-level
         - "$(ACK_LOG_LEVEL)"
         - --resource-tags
         - "$(ACK_RESOURCE_TAGS)"
         - --watch-namespace
         - "$(ACK_WATCH_NAMESPACE)"
+        - --enable-leader-election=$(ENABLE_LEADER_ELECTION)
+        - --leader-election-namespace
+        - "$(LEADER_ELECTION_NAMESPACE)"
         image: controller:latest
         name: controller
         ports:
@@ -66,6 +68,10 @@ spec:
           value: "info"
         - name: ACK_RESOURCE_TAGS
           value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
+        - name: ENABLE_LEADER_ELECTION
+          value: "false"
+        - name: LEADER_ELECTION_NAMESPACE
+          value: "ack-system"
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false
@@ -79,5 +85,6 @@ spec:
       terminationGracePeriodSeconds: 10
       serviceAccountName: ack-ec2-controller
       hostIPC: false
-      hostNetwork: false
       hostPID: false
+      hostNetwork: false
+      dnsPolicy: ClusterFirst
diff --git a/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml b/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml
@@ -46,21 +46,9 @@ spec:
             description: "LaunchTemplateSpec defines the desired state of LaunchTemplate.
               \n Describes a launch template."
             properties:
-              clientToken:
-                description: "Unique, case-sensitive identifier you provide to ensure
-                  the idempotency of the request. For more information, see Ensuring
-                  idempotency (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html).
-                  \n Constraint: Maximum 128 ASCII characters."
-                type: string
               defaultVersionNumber:
                 format: int64
                 type: integer
-              dryRun:
-                description: Checks whether you have the required permissions for
-                  the action, without actually making the request, and provides an
-                  error response. If you have the required permissions, the error
-                  response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-                type: boolean
               launchTemplateData:
                 description: The information for the launch template.
                 properties:
@@ -577,6 +565,19 @@ spec:
                       type: array
                   type: object
                 type: array
+              tags:
+                description: The tags. The value parameter is required, but if you
+                  don't want the tag to have a value, specify the parameter with no
+                  value, and we set the value to an empty string.
+                items:
+                  description: Describes a tag.
+                  properties:
+                    key:
+                      type: string
+                    value:
+                      type: string
+                  type: object
+                type: array
               versionDescription:
                 description: A description for the first version of the launch template.
                 type: string
@@ -663,17 +664,6 @@ spec:
               launchTemplateID:
                 description: The ID of the launch template.
                 type: string
-              tags:
-                description: The tags for the launch template.
-                items:
-                  description: Describes a tag.
-                  properties:
-                    key:
-                      type: string
-                    value:
-                      type: string
-                  type: object
-                type: array
             type: object
         type: object
     served: true

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -4,4 +4,5 @@ resources:
 - role-reader.yaml
 - role-writer.yaml
 - service-account.yaml
-
+- leader-election-role.yaml
+- leader-election-role-binding.yaml
diff --git a/generator.yaml b/generator.yaml
@@ -53,6 +53,9 @@ ignore:
     - SecurityGroupRule.GroupOwnerId
     - SecurityGroupRule.ReferencedGroupInfo
     - TerminateInstancesInput.DryRun
+    - CreateLaunchTemplateInput.ClientToken
+    - CreateLaunchTemplateInput.DryRun
+    - CreateLaunchTemplateInput.Tags  
   resource_names:
     - AccountAttribute
     - CapacityReservation
@@ -210,6 +213,12 @@ resources:
         print:
           path: Status.latestVersionNumber
           name: LatestVersion
+      Tags:
+        from:
+          operation: CreateTags
+          path: Tags
+        compare:
+          is_ignored: True
     tags:
       ignore: true
     renames:
@@ -226,8 +235,6 @@ resources:
         DescribeLaunchTemplate:
           input_fields:
             LaunchTemplateName: Name
-    reconcile:
-      requeue_on_success_seconds: 60
     hooks:
       sdk_update_post_build_request:
         template_path: hooks/launch_template/sdk_update_post_build_request.go.tpl

diff --git a/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml b/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml
@@ -46,21 +46,9 @@ spec:
             description: "LaunchTemplateSpec defines the desired state of LaunchTemplate.
               \n Describes a launch template."
             properties:
-              clientToken:
-                description: "Unique, case-sensitive identifier you provide to ensure
-                  the idempotency of the request. For more information, see Ensuring
-                  idempotency (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html).
-                  \n Constraint: Maximum 128 ASCII characters."
-                type: string
               defaultVersionNumber:
                 format: int64
                 type: integer
-              dryRun:
-                description: Checks whether you have the required permissions for
-                  the action, without actually making the request, and provides an
-                  error response. If you have the required permissions, the error
-                  response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-                type: boolean
               launchTemplateData:
                 description: The information for the launch template.
                 properties:
@@ -577,6 +565,19 @@ spec:
                       type: array
                   type: object
                 type: array
+              tags:
+                description: The tags. The value parameter is required, but if you
+                  don't want the tag to have a value, specify the parameter with no
+                  value, and we set the value to an empty string.
+                items:
+                  description: Describes a tag.
+                  properties:
+                    key:
+                      type: string
+                    value:
+                      type: string
+                  type: object
+                type: array
               versionDescription:
                 description: A description for the first version of the launch template.
                 type: string
@@ -663,17 +664,6 @@ spec:
               launchTemplateID:
                 description: The ID of the launch template.
                 type: string
-              tags:
-                description: The tags for the launch template.
-                items:
-                  description: Describes a tag.
-                  properties:
-                    key:
-                      type: string
-                    value:
-                      type: string
-                  type: object
-                type: array
             type: object
         type: object
     served: true