Skip to content

Commit 1afb0be

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.36.0, code-generator v0.36.0 (#123)
### 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 `v1.4.3` to `v1.4.4` Once this PR is merged, release `v1.4.4` will be automatically created for `eks-controller` **Please close this PR, if you do not want the new patch release for `eks-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building eks-controller ==== Copying common custom resource definitions into eks Building Kubernetes API objects for eks Generating deepcopy code for eks Generating custom resource definitions for eks Building service controller for eks Generating RBAC manifests for eks Running gofmt against generated code for eks Updating additional GitHub repository maintenance files ==== building eks-controller release artifacts ==== Building release artifacts for eks-v1.4.4 Generating common custom resource definitions Generating custom resource definitions for eks Generating RBAC manifests for eks ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 561399e commit 1afb0be

31 files changed

+196
-53
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: "2024-07-19T23:06:51Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:47:26Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: 626700f8799840e0470b1ff7ef3dbb32665b9f9d
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.13

‎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/eks-controller
9-
newTag: 1.4.3
9+
newTag: 1.4.4

‎config/crd/bases/eks.services.k8s.aws_accessentries.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ spec:
101101
properties:
102102
name:
103103
type: string
104+
namespace:
105+
type: string
104106
type: object
105107
type: object
106108
kubernetesGroups:

‎config/crd/bases/eks.services.k8s.aws_addons.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ spec:
9494
properties:
9595
name:
9696
type: string
97+
namespace:
98+
type: string
9799
type: object
98100
type: object
99101
configurationValues:
@@ -162,6 +164,8 @@ spec:
162164
properties:
163165
name:
164166
type: string
167+
namespace:
168+
type: string
165169
type: object
166170
type: object
167171
tags:

‎config/crd/bases/eks.services.k8s.aws_clusters.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ spec:
9898
properties:
9999
name:
100100
type: string
101+
namespace:
102+
type: string
101103
type: object
102104
type: object
103105
type: object
@@ -209,6 +211,8 @@ spec:
209211
properties:
210212
name:
211213
type: string
214+
namespace:
215+
type: string
212216
type: object
213217
type: object
214218
type: array
@@ -231,6 +235,8 @@ spec:
231235
properties:
232236
name:
233237
type: string
238+
namespace:
239+
type: string
234240
type: object
235241
type: object
236242
type: array
@@ -256,6 +262,8 @@ spec:
256262
properties:
257263
name:
258264
type: string
265+
namespace:
266+
type: string
259267
type: object
260268
type: object
261269
tags:

‎config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ spec:
8181
properties:
8282
name:
8383
type: string
84+
namespace:
85+
type: string
8486
type: object
8587
type: object
8688
name:
@@ -108,6 +110,8 @@ spec:
108110
properties:
109111
name:
110112
type: string
113+
namespace:
114+
type: string
111115
type: object
112116
type: object
113117
selectors:
@@ -141,6 +145,8 @@ spec:
141145
properties:
142146
name:
143147
type: string
148+
namespace:
149+
type: string
144150
type: object
145151
type: object
146152
type: array

‎config/crd/bases/eks.services.k8s.aws_identityproviderconfigs.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
oidc:

‎config/crd/bases/eks.services.k8s.aws_nodegroups.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ spec:
110110
properties:
111111
name:
112112
type: string
113+
namespace:
114+
type: string
113115
type: object
114116
type: object
115117
diskSize:
@@ -191,6 +193,8 @@ spec:
191193
properties:
192194
name:
193195
type: string
196+
namespace:
197+
type: string
194198
type: object
195199
type: object
196200
releaseVersion:
@@ -237,6 +241,8 @@ spec:
237241
properties:
238242
name:
239243
type: string
244+
namespace:
245+
type: string
240246
type: object
241247
type: object
242248
type: array
@@ -274,6 +280,8 @@ spec:
274280
properties:
275281
name:
276282
type: string
283+
namespace:
284+
type: string
277285
type: object
278286
type: object
279287
type: array

‎config/crd/bases/eks.services.k8s.aws_podidentityassociations.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ spec:
9191
properties:
9292
name:
9393
type: string
94+
namespace:
95+
type: string
9496
type: object
9597
type: object
9698
namespace:
@@ -118,6 +120,8 @@ spec:
118120
properties:
119121
name:
120122
type: string
123+
namespace:
124+
type: string
121125
type: object
122126
type: object
123127
serviceAccount:

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/aws-controllers-k8s/ec2-controller v1.1.0
99
github.com/aws-controllers-k8s/iam-controller v1.3.1
1010
github.com/aws-controllers-k8s/kms-controller v1.0.9
11-
github.com/aws-controllers-k8s/runtime v0.35.0
11+
github.com/aws-controllers-k8s/runtime v0.36.0
1212
github.com/aws/aws-sdk-go v1.49.13
1313
github.com/go-logr/logr v1.4.1
1414
github.com/spf13/pflag v1.0.5

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/aws-controllers-k8s/iam-controller v1.3.1 h1:/3yH3tAtSVAAt2ulIqsmutjW
44
github.com/aws-controllers-k8s/iam-controller v1.3.1/go.mod h1:7nZzMtEN8xEL5fYhL9FKkBhqoP4QMmMp5x5dXDGwfYM=
55
github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
66
github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
7-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
8-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
7+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
8+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
99
github.com/aws/aws-sdk-go v1.49.13 h1:f4mGztsgnx2dR9r8FQYa9YW/RsKb+N7bgef4UGrOW1Y=
1010
github.com/aws/aws-sdk-go v1.49.13/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
1111
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: eks-chart
33
description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
4-
version: 1.4.3
5-
appVersion: 1.4.3
4+
version: 1.4.4
5+
appVersion: 1.4.4
66
home: https://github.com/aws-controllers-k8s/eks-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/eks.services.k8s.aws_accessentries.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ spec:
101101
properties:
102102
name:
103103
type: string
104+
namespace:
105+
type: string
104106
type: object
105107
type: object
106108
kubernetesGroups:

‎helm/crds/eks.services.k8s.aws_addons.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ spec:
9494
properties:
9595
name:
9696
type: string
97+
namespace:
98+
type: string
9799
type: object
98100
type: object
99101
configurationValues:
@@ -162,6 +164,8 @@ spec:
162164
properties:
163165
name:
164166
type: string
167+
namespace:
168+
type: string
165169
type: object
166170
type: object
167171
tags:

‎helm/crds/eks.services.k8s.aws_clusters.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ spec:
9898
properties:
9999
name:
100100
type: string
101+
namespace:
102+
type: string
101103
type: object
102104
type: object
103105
type: object
@@ -209,6 +211,8 @@ spec:
209211
properties:
210212
name:
211213
type: string
214+
namespace:
215+
type: string
212216
type: object
213217
type: object
214218
type: array
@@ -231,6 +235,8 @@ spec:
231235
properties:
232236
name:
233237
type: string
238+
namespace:
239+
type: string
234240
type: object
235241
type: object
236242
type: array
@@ -256,6 +262,8 @@ spec:
256262
properties:
257263
name:
258264
type: string
265+
namespace:
266+
type: string
259267
type: object
260268
type: object
261269
tags:

‎helm/crds/eks.services.k8s.aws_fargateprofiles.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ spec:
8181
properties:
8282
name:
8383
type: string
84+
namespace:
85+
type: string
8486
type: object
8587
type: object
8688
name:
@@ -108,6 +110,8 @@ spec:
108110
properties:
109111
name:
110112
type: string
113+
namespace:
114+
type: string
111115
type: object
112116
type: object
113117
selectors:
@@ -141,6 +145,8 @@ spec:
141145
properties:
142146
name:
143147
type: string
148+
namespace:
149+
type: string
144150
type: object
145151
type: object
146152
type: array

‎helm/crds/eks.services.k8s.aws_identityproviderconfigs.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
oidc:

‎helm/crds/eks.services.k8s.aws_nodegroups.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ spec:
110110
properties:
111111
name:
112112
type: string
113+
namespace:
114+
type: string
113115
type: object
114116
type: object
115117
diskSize:
@@ -191,6 +193,8 @@ spec:
191193
properties:
192194
name:
193195
type: string
196+
namespace:
197+
type: string
194198
type: object
195199
type: object
196200
releaseVersion:
@@ -237,6 +241,8 @@ spec:
237241
properties:
238242
name:
239243
type: string
244+
namespace:
245+
type: string
240246
type: object
241247
type: object
242248
type: array
@@ -274,6 +280,8 @@ spec:
274280
properties:
275281
name:
276282
type: string
283+
namespace:
284+
type: string
277285
type: object
278286
type: object
279287
type: array

‎helm/crds/eks.services.k8s.aws_podidentityassociations.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ spec:
9191
properties:
9292
name:
9393
type: string
94+
namespace:
95+
type: string
9496
type: object
9597
type: object
9698
namespace:
@@ -118,6 +120,8 @@ spec:
118120
properties:
119121
name:
120122
type: string
123+
namespace:
124+
type: string
121125
type: object
122126
type: object
123127
serviceAccount:

‎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/eks-controller:1.4.3".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-controller:1.4.4".
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
@@ -313,4 +313,13 @@ rules:
313313
- get
314314
- patch
315315
- update
316-
{{- end }}
316+
{{- end }}
317+
318+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
319+
{{- define "ack-eks-controller.feature-gates" -}}
320+
{{- $list := list -}}
321+
{{- range $k, $v := .Values.featureGates -}}
322+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
323+
{{- end -}}
324+
{{ join "," $list }}
325+
{{- 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-eks-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

0 commit comments

Comments
 (0)