Update to ACK runtime v0.36.0, code-generator v0.36.0 (#49)

### Update to ACK runtime `v0.36.0`, code-generator `v0.36.0` ---------- * ACK code-generator `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.36.0) * ACK runtime `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.36.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.15` to `v0.0.16` Once this PR is merged, release `v0.0.16` will be automatically created for `route53-controller` **Please close this PR, if you do not want the new patch release for `route53-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building route53-controller ==== Copying common custom resource definitions into route53 Building Kubernetes API objects for route53 Generating deepcopy code for route53 Generating custom resource definitions for route53 Building service controller for route53 Generating RBAC manifests for route53 Running gofmt against generated code for route53 Updating additional GitHub repository maintenance files ==== building route53-controller release artifacts ==== Building release artifacts for route53-v0.0.16 Generating common custom resource definitions Generating custom resource definitions for route53 Generating RBAC manifests for route53 ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Aug 7, 2024 · a59f469 · a59f469
1 parent f4a798d
commit a59f469
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 25 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,9 +1,9 @@
 ack_generate_info:
-  build_date: "2024-07-19T23:00:31Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:38:07Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
-api_directory_checksum: a0ca03c8b7d3292d666682d6aa2a6d3e665e5505
+  version: v0.36.0
+api_directory_checksum: 78fb7fd24a85da24b8de6246cad67ff3fb6598f8
 api_version: v1alpha1
 aws_sdk_go_version: v1.49.0
 generator_config_info:

diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/route53-controller
-  newTag: 0.0.15
+  newTag: 0.0.16
diff --git a/config/crd/bases/route53.services.k8s.aws_healthchecks.yaml b/config/crd/bases/route53.services.k8s.aws_healthchecks.yaml
@@ -75,12 +75,12 @@ spec:
                   healthThreshold:
                     format: int64
                     type: integer
-                  iPAddress:
-                    type: string
                   insufficientDataHealthStatus:
                     type: string
                   inverted:
                     type: boolean
+                  ipAddress:
+                    type: string
                   measureLatency:
                     type: boolean
                   port:

diff --git a/config/crd/bases/route53.services.k8s.aws_recordsets.yaml b/config/crd/bases/route53.services.k8s.aws_recordsets.yaml
@@ -428,6 +428,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               multiValueAnswer:

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.5
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.35.0
+	github.com/aws-controllers-k8s/runtime v0.36.0
 	github.com/aws/aws-sdk-go v1.49.0
 	github.com/go-logr/logr v1.4.1
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
-github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
+github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
+github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
 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=

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: route53-chart
 description: A Helm chart for the ACK service controller for Amazon Route53 (Route53)
-version: 0.0.15
-appVersion: 0.0.15
+version: 0.0.16
+appVersion: 0.0.16
 home: https://github.com/aws-controllers-k8s/route53-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/helm/crds/route53.services.k8s.aws_healthchecks.yaml b/helm/crds/route53.services.k8s.aws_healthchecks.yaml
@@ -75,12 +75,12 @@ spec:
                   healthThreshold:
                     format: int64
                     type: integer
-                  iPAddress:
-                    type: string
                   insufficientDataHealthStatus:
                     type: string
                   inverted:
                     type: boolean
+                  ipAddress:
+                    type: string
                   measureLatency:
                     type: boolean
                   port:

diff --git a/helm/crds/route53.services.k8s.aws_recordsets.yaml b/helm/crds/route53.services.k8s.aws_recordsets.yaml
@@ -428,6 +428,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               multiValueAnswer:

diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/route53-controller:0.0.15".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/route53-controller:0.0.16".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -177,4 +177,13 @@ rules:
   - get
   - patch
   - update
-{{- end }}
+{{- end }}
+
+{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
+{{- define "ack-route53-controller.feature-gates" -}}
+{{- $list := list -}}
+{{- range $k, $v := .Values.featureGates -}}
+{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
+{{- end -}}
+{{ join "," $list }}
+{{- end -}}
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -79,6 +79,10 @@ spec:
 {{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
         - --reconcile-resource-max-concurrent-syncs
         - "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
+{{- end }}
+{{- if .Values.featureGates}}
+        - --feature-gates
+        - "$(FEATURE_GATES)"
 {{- end }}
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -122,6 +126,10 @@ spec:
 {{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
         - name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
           value: {{ $key }}={{ $value }}
+{{- end }}
+{{- if .Values.featureGates}}
+        - name: FEATURE_GATES
+          value: {{ include "ack-route53-controller.feature-gates" . }}
 {{- end }}
         {{- if .Values.aws.credentials.secretName }}
         - name: AWS_SHARED_CREDENTIALS_FILE

diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -268,6 +268,13 @@
       "type": "object"
     }
   },
+  "featureGates": {
+    "description": "Feature gates settings",
+    "type": "object",
+    "additionalProperties": {
+      "type": "boolean"
+    }
+  },
   "required": [
     "image",
     "deployment",

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/route53-controller
-  tag: 0.0.15
+  tag: 0.0.16
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -153,3 +153,10 @@ leaderElection:
   # will attempt to use the namespace of the service account mounted to the Controller
   # pod.
   namespace: ""
+
+# Configuration for feature gates.  These are optional controller features that
+# can be individually enabled ("true") or disabled ("false") by adding key/value
+# pairs below.
+featureGates: {}
+  # featureGate1: true
+  # featureGate2: false
diff --git a/pkg/resource/record_set/references.go b/pkg/resource/record_set/references.go
diff --git a/test/e2e/resources/health_check.yaml b/test/e2e/resources/health_check.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   healthCheckConfig:
     failureThreshold: 3
-    iPAddress: $IP_ADDR
+    ipAddress: $IP_ADDR
     port: 80
     requestInterval: 30
     type: TCP

diff --git a/test/e2e/tests/test_health_check.py b/test/e2e/tests/test_health_check.py
@@ -64,7 +64,7 @@ def patch_health_check(ref):
         "spec": {
             "healthCheckConfig": {
                 "failureThreshold": 5,
-                "iPAddress": ip_address,
+                "ipAddress": ip_address,
             }
         }
     }
@@ -90,7 +90,7 @@ def test_crud(self, route53_client, health_check):
         # Update health check resource and check that the value is propagated to AWS
         updated = patch_health_check(ref)
         assert updated["spec"]["healthCheckConfig"]["failureThreshold"] != cr["spec"]["healthCheckConfig"]["failureThreshold"]
-        assert updated["spec"]["healthCheckConfig"]["iPAddress"] != cr["spec"]["healthCheckConfig"]["iPAddress"]
+        assert updated["spec"]["healthCheckConfig"]["ipAddress"] != cr["spec"]["healthCheckConfig"]["ipAddress"]
 
         # Check health check has been updated in AWS
         route53_validator.assert_health_check(updated)