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.
aws-controllers-k8s · Aug 7, 2024 · 1afb0be · 1afb0be
1 parent 561399e
commit 1afb0be
Show file tree

Hide file tree

Showing 31 changed files with 196 additions and 53 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2024-07-19T23:06:51Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:47:26Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
+  version: v0.36.0
 api_directory_checksum: 626700f8799840e0470b1ff7ef3dbb32665b9f9d
 api_version: v1alpha1
 aws_sdk_go_version: v1.49.13

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/eks-controller
-  newTag: 1.4.3
+  newTag: 1.4.4
diff --git a/config/crd/bases/eks.services.k8s.aws_accessentries.yaml b/config/crd/bases/eks.services.k8s.aws_accessentries.yaml
@@ -101,6 +101,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               kubernetesGroups:

diff --git a/config/crd/bases/eks.services.k8s.aws_addons.yaml b/config/crd/bases/eks.services.k8s.aws_addons.yaml
@@ -94,6 +94,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               configurationValues:
@@ -162,6 +164,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               tags:

diff --git a/config/crd/bases/eks.services.k8s.aws_clusters.yaml b/config/crd/bases/eks.services.k8s.aws_clusters.yaml
@@ -98,6 +98,8 @@ spec:
                               properties:
                                 name:
                                   type: string
+                                namespace:
+                                  type: string
                               type: object
                           type: object
                       type: object
@@ -209,6 +211,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -231,6 +235,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -256,6 +262,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               tags:

diff --git a/config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml b/config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml
@@ -81,6 +81,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               name:
@@ -108,6 +110,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               selectors:
@@ -141,6 +145,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

diff --git a/config/crd/bases/eks.services.k8s.aws_identityproviderconfigs.yaml b/config/crd/bases/eks.services.k8s.aws_identityproviderconfigs.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               oidc:

diff --git a/config/crd/bases/eks.services.k8s.aws_nodegroups.yaml b/config/crd/bases/eks.services.k8s.aws_nodegroups.yaml
@@ -110,6 +110,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               diskSize:
@@ -191,6 +193,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               releaseVersion:
@@ -237,6 +241,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -274,6 +280,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

diff --git a/config/crd/bases/eks.services.k8s.aws_podidentityassociations.yaml b/config/crd/bases/eks.services.k8s.aws_podidentityassociations.yaml
@@ -91,6 +91,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               namespace:
@@ -118,6 +120,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               serviceAccount:

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/aws-controllers-k8s/ec2-controller v1.1.0
 	github.com/aws-controllers-k8s/iam-controller v1.3.1
 	github.com/aws-controllers-k8s/kms-controller v1.0.9
-	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.13
 	github.com/go-logr/logr v1.4.1
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/aws-controllers-k8s/iam-controller v1.3.1 h1:/3yH3tAtSVAAt2ulIqsmutjW
 github.com/aws-controllers-k8s/iam-controller v1.3.1/go.mod h1:7nZzMtEN8xEL5fYhL9FKkBhqoP4QMmMp5x5dXDGwfYM=
 github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
 github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
-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.13 h1:f4mGztsgnx2dR9r8FQYa9YW/RsKb+N7bgef4UGrOW1Y=
 github.com/aws/aws-sdk-go v1.49.13/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: eks-chart
 description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
-version: 1.4.3
-appVersion: 1.4.3
+version: 1.4.4
+appVersion: 1.4.4
 home: https://github.com/aws-controllers-k8s/eks-controller
 icon: https://github.com/raw/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/helm/crds/eks.services.k8s.aws_accessentries.yaml b/helm/crds/eks.services.k8s.aws_accessentries.yaml
@@ -101,6 +101,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               kubernetesGroups:

diff --git a/helm/crds/eks.services.k8s.aws_addons.yaml b/helm/crds/eks.services.k8s.aws_addons.yaml
@@ -94,6 +94,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               configurationValues:
@@ -162,6 +164,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               tags:

diff --git a/helm/crds/eks.services.k8s.aws_clusters.yaml b/helm/crds/eks.services.k8s.aws_clusters.yaml
@@ -98,6 +98,8 @@ spec:
                               properties:
                                 name:
                                   type: string
+                                namespace:
+                                  type: string
                               type: object
                           type: object
                       type: object
@@ -209,6 +211,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -231,6 +235,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -256,6 +262,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               tags:

diff --git a/helm/crds/eks.services.k8s.aws_fargateprofiles.yaml b/helm/crds/eks.services.k8s.aws_fargateprofiles.yaml
@@ -81,6 +81,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               name:
@@ -108,6 +110,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               selectors:
@@ -141,6 +145,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

diff --git a/helm/crds/eks.services.k8s.aws_identityproviderconfigs.yaml b/helm/crds/eks.services.k8s.aws_identityproviderconfigs.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               oidc:

diff --git a/helm/crds/eks.services.k8s.aws_nodegroups.yaml b/helm/crds/eks.services.k8s.aws_nodegroups.yaml
@@ -110,6 +110,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               diskSize:
@@ -191,6 +193,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               releaseVersion:
@@ -237,6 +241,8 @@ spec:
                           properties:
                             name:
                               type: string
+                            namespace:
+                              type: string
                           type: object
                       type: object
                     type: array
@@ -274,6 +280,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

diff --git a/helm/crds/eks.services.k8s.aws_podidentityassociations.yaml b/helm/crds/eks.services.k8s.aws_podidentityassociations.yaml
@@ -91,6 +91,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               namespace:
@@ -118,6 +120,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               serviceAccount:

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/eks-controller:1.4.3".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-controller:1.4.4".
 
 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
@@ -313,4 +313,13 @@ rules:
   - get
   - patch
   - update
-{{- end }}
+{{- end }}
+
+{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
+{{- define "ack-eks-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-eks-controller.feature-gates" . }}
 {{- end }}
         {{- if .Values.aws.credentials.secretName }}
         - name: AWS_SHARED_CREDENTIALS_FILE