Skip to content

Commit 0c14253

Browse files
ack-botack-bot
authoredJan 29, 2024
Update to ACK runtime v0.29.2, code-generator v0.29.2 (#36)
### Update to ACK runtime `v0.29.2`, code-generator `v0.29.2` ---------- * ACK code-generator `v0.29.2` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.29.2) * ACK runtime `v0.29.2` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.29.2) ---------- NOTE: This PR increments the release version of service controller from `v0.0.9` to `v0.0.10` Once this PR is merged, release `v0.0.10` 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.10 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.
·
v0.0.24v0.0.10
1 parent 3ebed1f commit 0c14253

15 files changed

+382
-670
lines changed
 

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2023-12-14T22:02:04Z"
3-
build_hash: 1f16813c807af6889060b4ce7ded2a69dc027d8c
2+
build_date: "2024-01-29T07:07:03Z"
3+
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
44
go_version: go1.21.5
5-
version: v0.28.0
5+
version: v0.29.2
66
api_directory_checksum: 7af528570a707bccda3cf78442be0ac40262981e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

‎cmd/controller/main.go

+29-7
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.9
9+
newTag: 0.0.10

‎go.mod

+37-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
module github.com/aws-controllers-k8s/route53-controller
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.21.5
46

57
require (
6-
github.com/aws-controllers-k8s/runtime v0.28.0
8+
github.com/aws-controllers-k8s/runtime v0.29.2
79
github.com/aws/aws-sdk-go v1.49.0
8-
github.com/go-logr/logr v1.2.3
10+
github.com/go-logr/logr v1.2.4
911
github.com/spf13/pflag v1.0.5
10-
k8s.io/api v0.26.8
11-
k8s.io/apimachinery v0.26.8
12-
k8s.io/client-go v0.26.8
13-
sigs.k8s.io/controller-runtime v0.14.5
12+
k8s.io/api v0.28.3
13+
k8s.io/apimachinery v0.28.3
14+
k8s.io/client-go v0.28.3
15+
sigs.k8s.io/controller-runtime v0.16.3
1416
)
1517

1618
require (
1719
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
19-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
20+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2022
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
23+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2224
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2325
github.com/fsnotify/fsnotify v1.6.0 // indirect
24-
github.com/go-logr/zapr v1.2.3 // indirect
25-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
26-
github.com/go-openapi/jsonreference v0.20.0 // indirect
27-
github.com/go-openapi/swag v0.19.14 // indirect
26+
github.com/go-logr/zapr v1.2.4 // indirect
27+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
28+
github.com/go-openapi/jsonreference v0.20.2 // indirect
29+
github.com/go-openapi/swag v0.22.3 // indirect
2830
github.com/gogo/protobuf v1.3.2 // indirect
2931
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
30-
github.com/golang/protobuf v1.5.2 // indirect
31-
github.com/google/gnostic v0.5.7-v3refs // indirect
32+
github.com/golang/protobuf v1.5.3 // indirect
33+
github.com/google/gnostic-models v0.6.8 // indirect
3234
github.com/google/go-cmp v0.5.9 // indirect
33-
github.com/google/gofuzz v1.1.0 // indirect
35+
github.com/google/gofuzz v1.2.0 // indirect
3436
github.com/google/uuid v1.3.0 // indirect
3537
github.com/imdario/mergo v0.3.12 // indirect
3638
github.com/itchyny/gojq v0.12.6 // indirect
@@ -39,39 +41,38 @@ require (
3941
github.com/jmespath/go-jmespath v0.4.0 // indirect
4042
github.com/josharian/intern v1.0.0 // indirect
4143
github.com/json-iterator/go v1.1.12 // indirect
42-
github.com/mailru/easyjson v0.7.6 // indirect
43-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
44+
github.com/mailru/easyjson v0.7.7 // indirect
45+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4446
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4547
github.com/modern-go/reflect2 v1.0.2 // indirect
4648
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4749
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_golang v1.14.0 // indirect
49-
github.com/prometheus/client_model v0.3.0 // indirect
50-
github.com/prometheus/common v0.37.0 // indirect
51-
github.com/prometheus/procfs v0.8.0 // indirect
50+
github.com/prometheus/client_golang v1.16.0 // indirect
51+
github.com/prometheus/client_model v0.4.0 // indirect
52+
github.com/prometheus/common v0.44.0 // indirect
53+
github.com/prometheus/procfs v0.10.1 // indirect
5254
github.com/samber/lo v1.37.0 // indirect
53-
go.uber.org/atomic v1.7.0 // indirect
54-
go.uber.org/multierr v1.6.0 // indirect
55-
go.uber.org/zap v1.24.0 // indirect
56-
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
55+
go.uber.org/multierr v1.11.0 // indirect
56+
go.uber.org/zap v1.26.0 // indirect
57+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
5758
golang.org/x/net v0.17.0 // indirect
58-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
59+
golang.org/x/oauth2 v0.8.0 // indirect
5960
golang.org/x/sys v0.13.0 // indirect
6061
golang.org/x/term v0.13.0 // indirect
6162
golang.org/x/text v0.13.0 // indirect
6263
golang.org/x/time v0.3.0 // indirect
63-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
64+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6465
google.golang.org/appengine v1.6.7 // indirect
65-
google.golang.org/protobuf v1.28.1 // indirect
66+
google.golang.org/protobuf v1.30.0 // indirect
6667
gopkg.in/inf.v0 v0.9.1 // indirect
6768
gopkg.in/yaml.v2 v2.4.0 // indirect
6869
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
70-
k8s.io/component-base v0.26.1 // indirect
71-
k8s.io/klog/v2 v2.80.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
73-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
74-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
70+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
71+
k8s.io/component-base v0.28.3 // indirect
72+
k8s.io/klog/v2 v2.100.1 // indirect
73+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
74+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
75+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7576
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7677
sigs.k8s.io/yaml v1.3.0 // indirect
7778
)

‎go.sum

+105-494
Large diffs are not rendered by default.

‎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.9
5-
appVersion: 0.0.9
4+
version: 0.0.10
5+
appVersion: 0.0.10
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/services.k8s.aws_adoptedresources.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ spec:
161161
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
162162
type: string
163163
name:
164-
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
164+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names'
165165
type: string
166166
uid:
167-
description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
167+
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids'
168168
type: string
169169
required:
170170
- apiVersion

‎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.9".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/route53-controller:0.0.10".
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

+111
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,114 @@ If release name contains chart name it will be used as a full name.
4646
{{- define "aws.credentials.path" -}}
4747
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
4848
{{- end -}}
49+
50+
{{/* The rules a of ClusterRole or Role */}}
51+
{{- define "controller-role-rules" }}
52+
rules:
53+
- apiGroups:
54+
- ""
55+
resources:
56+
- configmaps
57+
verbs:
58+
- get
59+
- list
60+
- patch
61+
- watch
62+
- apiGroups:
63+
- ""
64+
resources:
65+
- namespaces
66+
verbs:
67+
- get
68+
- list
69+
- watch
70+
- apiGroups:
71+
- ""
72+
resources:
73+
- secrets
74+
verbs:
75+
- get
76+
- list
77+
- patch
78+
- watch
79+
- apiGroups:
80+
- route53.services.k8s.aws
81+
resources:
82+
- hostedzones
83+
verbs:
84+
- create
85+
- delete
86+
- get
87+
- list
88+
- patch
89+
- update
90+
- watch
91+
- apiGroups:
92+
- route53.services.k8s.aws
93+
resources:
94+
- hostedzones/status
95+
verbs:
96+
- get
97+
- patch
98+
- update
99+
- apiGroups:
100+
- route53.services.k8s.aws
101+
resources:
102+
- recordsets
103+
verbs:
104+
- create
105+
- delete
106+
- get
107+
- list
108+
- patch
109+
- update
110+
- watch
111+
- apiGroups:
112+
- route53.services.k8s.aws
113+
resources:
114+
- recordsets/status
115+
verbs:
116+
- get
117+
- patch
118+
- update
119+
- apiGroups:
120+
- services.k8s.aws
121+
resources:
122+
- adoptedresources
123+
verbs:
124+
- create
125+
- delete
126+
- get
127+
- list
128+
- patch
129+
- update
130+
- watch
131+
- apiGroups:
132+
- services.k8s.aws
133+
resources:
134+
- adoptedresources/status
135+
verbs:
136+
- get
137+
- patch
138+
- update
139+
- apiGroups:
140+
- services.k8s.aws
141+
resources:
142+
- fieldexports
143+
verbs:
144+
- create
145+
- delete
146+
- get
147+
- list
148+
- patch
149+
- update
150+
- watch
151+
- apiGroups:
152+
- services.k8s.aws
153+
resources:
154+
- fieldexports/status
155+
verbs:
156+
- get
157+
- patch
158+
- update
159+
{{- end }}

‎helm/templates/caches-role-binding.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
name: ack-namespaces-cache-route53-controller
5+
roleRef:
6+
kind: ClusterRole
7+
apiGroup: rbac.authorization.k8s.io
8+
name: ack-namespaces-cache-route53-controller
9+
subjects:
10+
- kind: ServiceAccount
11+
name: ack-route53-controller
12+
namespace: {{ .Release.Namespace }}
13+
---
14+
apiVersion: rbac.authorization.k8s.io/v1
15+
kind: RoleBinding
16+
metadata:
17+
name: ack-configmaps-cache-route53-controller
18+
namespace: {{ .Release.Namespace }}
19+
roleRef:
20+
kind: Role
21+
apiGroup: rbac.authorization.k8s.io
22+
name: ack-configmaps-cache-route53-controller
23+
subjects:
24+
- kind: ServiceAccount
25+
name: ack-route53-controller
26+
namespace: {{ .Release.Namespace }}

‎helm/templates/caches-role.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: ack-namespaces-cache-route53-controller
5+
rules:
6+
- apiGroups:
7+
- ""
8+
resources:
9+
- namespaces
10+
verbs:
11+
- get
12+
- list
13+
- watch
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: Role
17+
metadata:
18+
name: ack-configmaps-cache-route53-controller
19+
namespace: {{ .Release.Namespace }}
20+
rules:
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- configmaps
25+
verbs:
26+
- get
27+
- list
28+
- watch

‎helm/templates/cluster-role-binding.yaml

+21-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
1-
apiVersion: rbac.authorization.k8s.io/v1
21
{{ if eq .Values.installScope "cluster" }}
2+
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: {{ include "app.fullname" . }}
66
roleRef:
77
kind: ClusterRole
8-
{{ else }}
8+
apiGroup: rbac.authorization.k8s.io
9+
name: ack-route53-controller
10+
subjects:
11+
- kind: ServiceAccount
12+
name: {{ include "service-account.name" . }}
13+
namespace: {{ .Release.Namespace }}
14+
{{ else if .Values.watchNamespace }}
15+
{{ $namespaces := split "," .Values.watchNamespace }}
16+
{{ $fullname := include "app.fullname" . }}
17+
{{ $releaseNamespace := .Release.Namespace }}
18+
{{ $serviceAccountName := include "service-account.name" . }}
19+
{{ range $namespaces }}
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
922
kind: RoleBinding
1023
metadata:
11-
name: {{ include "app.fullname" . }}
12-
namespace: {{ .Release.Namespace }}
24+
name: {{ $fullname }}
25+
namespace: {{ . }}
1326
roleRef:
1427
kind: Role
15-
{{ end }}
1628
apiGroup: rbac.authorization.k8s.io
1729
name: ack-route53-controller
1830
subjects:
1931
- kind: ServiceAccount
20-
name: {{ include "service-account.name" . }}
21-
namespace: {{ .Release.Namespace }}
32+
name: {{ $serviceAccountName }}
33+
namespace: {{ $releaseNamespace }}
34+
{{ end }}
35+
{{ end }}

‎helm/templates/cluster-role-controller.yaml

+14-114
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,28 @@
1-
apiVersion: rbac.authorization.k8s.io/v1
1+
{{ $labels := .Values.role.labels }}
2+
{{ $rules := include "controller-role-rules" . }}
23
{{ if eq .Values.installScope "cluster" }}
4+
apiVersion: rbac.authorization.k8s.io/v1
35
kind: ClusterRole
46
metadata:
5-
creationTimestamp: null
67
name: ack-route53-controller
78
labels:
8-
{{- range $key, $value := .Values.role.labels }}
9+
{{- range $key, $value := $labels }}
910
{{ $key }}: {{ $value | quote }}
1011
{{- end }}
11-
{{ else }}
12+
{{- $rules }}
13+
{{ else if .Values.watchNamespace }}
14+
{{ $namespaces := split "," .Values.watchNamespace }}
15+
{{ range $namespaces }}
16+
---
17+
apiVersion: rbac.authorization.k8s.io/v1
1218
kind: Role
1319
metadata:
14-
creationTimestamp: null
1520
name: ack-route53-controller
21+
namespace: {{ . }}
1622
labels:
17-
{{- range $key, $value := .Values.role.labels }}
23+
{{- range $key, $value := $labels }}
1824
{{ $key }}: {{ $value | quote }}
1925
{{- end }}
20-
namespace: {{ .Release.Namespace }}
26+
{{- $rules }}
2127
{{ end }}
22-
rules:
23-
- apiGroups:
24-
- ""
25-
resources:
26-
- configmaps
27-
verbs:
28-
- get
29-
- list
30-
- patch
31-
- watch
32-
- apiGroups:
33-
- ""
34-
resources:
35-
- namespaces
36-
verbs:
37-
- get
38-
- list
39-
- watch
40-
- apiGroups:
41-
- ""
42-
resources:
43-
- secrets
44-
verbs:
45-
- get
46-
- list
47-
- patch
48-
- watch
49-
- apiGroups:
50-
- route53.services.k8s.aws
51-
resources:
52-
- hostedzones
53-
verbs:
54-
- create
55-
- delete
56-
- get
57-
- list
58-
- patch
59-
- update
60-
- watch
61-
- apiGroups:
62-
- route53.services.k8s.aws
63-
resources:
64-
- hostedzones/status
65-
verbs:
66-
- get
67-
- patch
68-
- update
69-
- apiGroups:
70-
- route53.services.k8s.aws
71-
resources:
72-
- recordsets
73-
verbs:
74-
- create
75-
- delete
76-
- get
77-
- list
78-
- patch
79-
- update
80-
- watch
81-
- apiGroups:
82-
- route53.services.k8s.aws
83-
resources:
84-
- recordsets/status
85-
verbs:
86-
- get
87-
- patch
88-
- update
89-
- apiGroups:
90-
- services.k8s.aws
91-
resources:
92-
- adoptedresources
93-
verbs:
94-
- create
95-
- delete
96-
- get
97-
- list
98-
- patch
99-
- update
100-
- watch
101-
- apiGroups:
102-
- services.k8s.aws
103-
resources:
104-
- adoptedresources/status
105-
verbs:
106-
- get
107-
- patch
108-
- update
109-
- apiGroups:
110-
- services.k8s.aws
111-
resources:
112-
- fieldexports
113-
verbs:
114-
- create
115-
- delete
116-
- get
117-
- list
118-
- patch
119-
- update
120-
- watch
121-
- apiGroups:
122-
- services.k8s.aws
123-
resources:
124-
- fieldexports/status
125-
verbs:
126-
- get
127-
- patch
128-
- update
28+
{{ end }}

‎helm/templates/role-writer.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ rules:
1010
- route53.services.k8s.aws
1111
resources:
1212
- hostedzones
13-
1413
- recordsets
15-
1614
verbs:
1715
- create
1816
- delete

‎helm/values.yaml

+2-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.9
7+
tag: 0.0.10
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -107,6 +107,7 @@ installScope: cluster
107107

108108
# Set the value of the "namespace" to be watched by the controller
109109
# This value is only used when the `installScope` is set to "namespace". If left empty, the default value is the release namespace for the chart.
110+
# You can set multiple namespaces by providing a comma separated list of namespaces. e.g "namespace1,namespace2"
110111
watchNamespace: ""
111112

112113
resourceTags:

0 commit comments

Comments
 (0)
Please sign in to comment.