Add tags for HostedZone

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2023-05-15T23:45:27Z"
-  build_hash: 8f3ba427974fd6e769926778d54834eaee3b81a3
-  go_version: go1.19
-  version: v0.26.1
-api_directory_checksum: e2bcdcfd015dd5528e4df8745ede3ffccfd4e683
+  build_date: "2023-07-17T18:30:35Z"
+  build_hash: e9b68590da73ce9143ba1e4361cebdc1d876c81e
+  go_version: go1.20.3
+  version: v0.26.1-7-ge9b6859
+api_directory_checksum: 2f681761d3417cd3c65709b6dc71d9853bdf0481
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: 554ef2519945f32ea8788a1add7a3c496c944d88
+  file_checksum: e4f89494b4e355fb756095b55c95050a23efa0b3
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -30,8 +30,28 @@ resources:
       - InvalidDomainName
       - InvalidInput
       - InvalidVPCId
+    fields:
+      Tags:
+        from:
+          operation: ChangeTagsForResource
+          path: AddTags
+        compare:
+          is_ignored: True
     hooks:
+      delta_pre_compare:
+        code: compareTags(delta, a, b)
+      sdk_read_one_post_set_output:
+        template_path: hooks/hosted_zone/sdk_read_one_post_set_output.go.tpl
+      sdk_create_post_set_output:
+        template_path: hooks/hosted_zone/sdk_create_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/hosted_zone/sdk_create_post_build_request.go.tpl
+      sdk_file_end:
+        template_path: hooks/hosted_zone/sdk_file_end.go.tpl
+      ensure_tags:
+        template_path: hooks/hosted_zone/sdk_ensure_tags.go.tpl
+
     tags:
       ignore: true
+    update_operation:
+      custom_method_name: customUpdateHostedZone

config/crd/bases/route53.services.k8s.aws_hostedzones.yaml

@@ -67,6 +67,22 @@ spec:
                   your domain to the set of NameServers that CreateHostedZone returns
                   in DelegationSet."
                 type: string
+              tags:
+                description: "A complex type that contains a list of the tags that
+                  you want to add to the specified health check or hosted zone and/or
+                  the tags that you want to edit Value for. \n You can add a maximum
+                  of 10 tags to a health check or a hosted zone."
+                items:
+                  description: A complex type that contains information about a tag
+                    that you want to add or edit for the specified health check or
+                    hosted zone.
+                  properties:
+                    key:
+                      type: string
+                    value:
+                      type: string
+                  type: object
+                type: array
               vpc:
                 description: "(Private hosted zones only) A complex type that contains
                   information about the Amazon VPC that you're associating with this

generator.yaml

@@ -30,8 +30,28 @@ resources:
       - InvalidDomainName
       - InvalidInput
       - InvalidVPCId
+    fields:
+      Tags:
+        from:
+          operation: ChangeTagsForResource
+          path: AddTags
+        compare:
+          is_ignored: True
     hooks:
+      delta_pre_compare:
+        code: compareTags(delta, a, b)
+      sdk_read_one_post_set_output:
+        template_path: hooks/hosted_zone/sdk_read_one_post_set_output.go.tpl
+      sdk_create_post_set_output:
+        template_path: hooks/hosted_zone/sdk_create_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/hosted_zone/sdk_create_post_build_request.go.tpl
+      sdk_file_end:
+        template_path: hooks/hosted_zone/sdk_file_end.go.tpl
+      ensure_tags:
+        template_path: hooks/hosted_zone/sdk_ensure_tags.go.tpl
+
     tags:
       ignore: true
+    update_operation:
+      custom_method_name: customUpdateHostedZone

helm/crds/route53.services.k8s.aws_hostedzones.yaml

@@ -67,6 +67,22 @@ spec:
                   your domain to the set of NameServers that CreateHostedZone returns
                   in DelegationSet."
                 type: string
+              tags:
+                description: "A complex type that contains a list of the tags that
+                  you want to add to the specified health check or hosted zone and/or
+                  the tags that you want to edit Value for. \n You can add a maximum
+                  of 10 tags to a health check or a hosted zone."
+                items:
+                  description: A complex type that contains information about a tag
+                    that you want to add or edit for the specified health check or
+                    hosted zone.
+                  properties:
+                    key:
+                      type: string
+                    value:
+                      type: string
+                  type: object
+                type: array
               vpc:
                 description: "(Private hosted zones only) A complex type that contains
                   information about the Amazon VPC that you're associating with this

helm/templates/deployment.yaml

@@ -18,10 +18,12 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
+{{- if .Values.deployment.annotations }}
       annotations:
       {{- range $key, $value := .Values.deployment.annotations }}
         {{ $key }}: {{ $value | quote }}
       {{- end }}
+{{- end }}
       labels:
         app.kubernetes.io/name: {{ include "app.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -104,11 +106,19 @@ spec:
           value: {{ include "aws.credentials.path" . }}
         - name: AWS_PROFILE
           value: {{ .Values.aws.credentials.profile }}
+        {{- end }}
+        {{- if .Values.deployment.extraEnvVars -}}
+          {{ toYaml .Values.deployment.extraEnvVars | nindent 8 }}
+        {{- end }}
         volumeMounts:
+        {{- if .Values.aws.credentials.secretName }}
           - name: {{ .Values.aws.credentials.secretName }}
             mountPath: {{ include "aws.credentials.secret_mount_path" . }}
             readOnly: true
         {{- end }}
+        {{- if .Values.deployment.extraVolumeMounts -}}
+          {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }}
+        {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false
@@ -133,9 +143,12 @@ spec:
       hostIPC: false
       hostNetwork: false
       hostPID: false
-      {{ if .Values.aws.credentials.secretName -}}
       volumes:
+      {{- if .Values.aws.credentials.secretName -}}
         - name: {{ .Values.aws.credentials.secretName }}
           secret:
             secretName: {{ .Values.aws.credentials.secretName }}
       {{ end -}}
+{{- if .Values.deployment.extraVolumes }}
+{{ toYaml .Values.deployment.extraVolumes | indent 8}}
+{{- end }}

helm/values.schema.json

@@ -58,6 +58,15 @@
         },
         "priorityClassName": {
           "type": "string"
+        },
+        "extraVolumeMounts": {
+          "type": "array"
+        },
+        "extraVolumes": {
+          "type": "array"
+        },
+        "extraEnvVars": {
+          "type": "array"
         }
       },
       "required": [

helm/values.yaml

@@ -28,6 +28,26 @@ deployment:
   # Which priorityClassName to set?
   # See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
   priorityClassName: ""
+  extraVolumes: []
+  extraVolumeMounts: []
+
+  # Additional server container environment variables
+  #
+  # You specify this manually like you would a raw deployment manifest.
+  # This means you can bind in environment variables from secrets.
+  #
+  # e.g. static environment variable:
+  #  - name: DEMO_GREETING
+  #    value: "Hello from the environment"
+  #
+  # e.g. secret environment variable:
+  # - name: USERNAME
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: mysecret
+  #       key: username
+  extraEnvVars: []
+
 
 # If "installScope: cluster" then these labels will be applied to ClusterRole
 role:
@@ -90,7 +110,7 @@ deletionPolicy: delete
 # controller reconciliation configurations
 reconcile:
   # The default duration, in seconds, to wait before resyncing desired state of custom resources.
-  defaultResyncPeriod: 0
+  defaultResyncPeriod: 36000 # 10 Hours
   # An object representing the reconcile resync configuration for each specific resource.
   resourceResyncPeriods: {}