Skip to content

Commit a59f469

Browse files
ack-botack-bot
authored
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.
1 parent f4a798d commit a59f469

18 files changed

+62
-25
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ack_generate_info:
2-
build_date: "2024-07-19T23:00:31Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:38:07Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
6-
api_directory_checksum: a0ca03c8b7d3292d666682d6aa2a6d3e665e5505
5+
version: v0.36.0
6+
api_directory_checksum: 78fb7fd24a85da24b8de6246cad67ff3fb6598f8
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0
99
generator_config_info:

‎apis/v1alpha1/types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/controller/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/route53-controller
9-
newTag: 0.0.15
9+
newTag: 0.0.16

‎config/crd/bases/route53.services.k8s.aws_healthchecks.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ spec:
7575
healthThreshold:
7676
format: int64
7777
type: integer
78-
iPAddress:
79-
type: string
8078
insufficientDataHealthStatus:
8179
type: string
8280
inverted:
8381
type: boolean
82+
ipAddress:
83+
type: string
8484
measureLatency:
8585
type: boolean
8686
port:

‎config/crd/bases/route53.services.k8s.aws_recordsets.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ spec:
428428
properties:
429429
name:
430430
type: string
431+
namespace:
432+
type: string
431433
type: object
432434
type: object
433435
multiValueAnswer:

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.35.0
8+
github.com/aws-controllers-k8s/runtime v0.36.0
99
github.com/aws/aws-sdk-go v1.49.0
1010
github.com/go-logr/logr v1.4.1
1111
github.com/spf13/pflag v1.0.5

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
2-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
1+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
2+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
33
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
44
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
55
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: route53-chart
33
description: A Helm chart for the ACK service controller for Amazon Route53 (Route53)
4-
version: 0.0.15
5-
appVersion: 0.0.15
4+
version: 0.0.16
5+
appVersion: 0.0.16
66
home: https://github.com/aws-controllers-k8s/route53-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/route53.services.k8s.aws_healthchecks.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ spec:
7575
healthThreshold:
7676
format: int64
7777
type: integer
78-
iPAddress:
79-
type: string
8078
insufficientDataHealthStatus:
8179
type: string
8280
inverted:
8381
type: boolean
82+
ipAddress:
83+
type: string
8484
measureLatency:
8585
type: boolean
8686
port:

‎helm/crds/route53.services.k8s.aws_recordsets.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ spec:
428428
properties:
429429
name:
430430
type: string
431+
namespace:
432+
type: string
431433
type: object
432434
type: object
433435
multiValueAnswer:

‎helm/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/route53-controller:0.0.15".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/route53-controller:0.0.16".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎helm/templates/_helpers.tpl

+10-1
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,13 @@ rules:
177177
- get
178178
- patch
179179
- update
180-
{{- end }}
180+
{{- end }}
181+
182+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
183+
{{- define "ack-route53-controller.feature-gates" -}}
184+
{{- $list := list -}}
185+
{{- range $k, $v := .Values.featureGates -}}
186+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
187+
{{- end -}}
188+
{{ join "," $list }}
189+
{{- end -}}

‎helm/templates/deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ spec:
7979
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
8080
- --reconcile-resource-max-concurrent-syncs
8181
- "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
82+
{{- end }}
83+
{{- if .Values.featureGates}}
84+
- --feature-gates
85+
- "$(FEATURE_GATES)"
8286
{{- end }}
8387
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
8488
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -122,6 +126,10 @@ spec:
122126
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
123127
- name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
124128
value: {{ $key }}={{ $value }}
129+
{{- end }}
130+
{{- if .Values.featureGates}}
131+
- name: FEATURE_GATES
132+
value: {{ include "ack-route53-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

+7
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,13 @@
268268
"type": "object"
269269
}
270270
},
271+
"featureGates": {
272+
"description": "Feature gates settings",
273+
"type": "object",
274+
"additionalProperties": {
275+
"type": "boolean"
276+
}
277+
},
271278
"required": [
272279
"image",
273280
"deployment",

‎helm/values.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/route53-controller
7-
tag: 0.0.15
7+
tag: 0.0.16
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -153,3 +153,10 @@ leaderElection:
153153
# will attempt to use the namespace of the service account mounted to the Controller
154154
# pod.
155155
namespace: ""
156+
157+
# Configuration for feature gates. These are optional controller features that
158+
# can be individually enabled ("true") or disabled ("false") by adding key/value
159+
# pairs below.
160+
featureGates: {}
161+
# featureGate1: true
162+
# featureGate2: false

‎pkg/resource/record_set/references.go

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/resources/health_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
healthCheckConfig:
77
failureThreshold: 3
8-
iPAddress: $IP_ADDR
8+
ipAddress: $IP_ADDR
99
port: 80
1010
requestInterval: 30
1111
type: TCP

‎test/e2e/tests/test_health_check.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def patch_health_check(ref):
6464
"spec": {
6565
"healthCheckConfig": {
6666
"failureThreshold": 5,
67-
"iPAddress": ip_address,
67+
"ipAddress": ip_address,
6868
}
6969
}
7070
}
@@ -90,7 +90,7 @@ def test_crud(self, route53_client, health_check):
9090
# Update health check resource and check that the value is propagated to AWS
9191
updated = patch_health_check(ref)
9292
assert updated["spec"]["healthCheckConfig"]["failureThreshold"] != cr["spec"]["healthCheckConfig"]["failureThreshold"]
93-
assert updated["spec"]["healthCheckConfig"]["iPAddress"] != cr["spec"]["healthCheckConfig"]["iPAddress"]
93+
assert updated["spec"]["healthCheckConfig"]["ipAddress"] != cr["spec"]["healthCheckConfig"]["ipAddress"]
9494

9595
# Check health check has been updated in AWS
9696
route53_validator.assert_health_check(updated)

0 commit comments

Comments
 (0)