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

### 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.0.14` to `v1.0.15` Once this PR is merged, release `v1.0.15` will be automatically created for `kms-controller` **Please close this PR, if you do not want the new patch release for `kms-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building kms-controller ==== Copying common custom resource definitions into kms Building Kubernetes API objects for kms Generating deepcopy code for kms Generating custom resource definitions for kms Building service controller for kms Generating RBAC manifests for kms Running gofmt against generated code for kms Updating additional GitHub repository maintenance files ==== building kms-controller release artifacts ==== Building release artifacts for kms-v1.0.15 Generating common custom resource definitions Generating custom resource definitions for kms Generating RBAC manifests for kms ``` ---------- 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 6, 2024 · 7647ccd · 7647ccd
1 parent d384e25
commit 7647ccd
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 18 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:03:00Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:49:02Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
+  version: v0.36.0
 api_directory_checksum: ccee1b4810828db7457ca421f6bab5f087ce5b5c
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93

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/kms-controller
-  newTag: 1.0.14
+  newTag: 1.0.15
diff --git a/config/crd/bases/kms.services.k8s.aws_aliases.yaml b/config/crd/bases/kms.services.k8s.aws_aliases.yaml
@@ -91,6 +91,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             required:

diff --git a/config/crd/bases/kms.services.k8s.aws_grants.yaml b/config/crd/bases/kms.services.k8s.aws_grants.yaml
@@ -143,6 +143,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               name:

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: kms-chart
 description: A Helm chart for the ACK service controller for AWS Key Management Service (KMS)
-version: 1.0.14
-appVersion: 1.0.14
+version: 1.0.15
+appVersion: 1.0.15
 home: https://github.com/aws-controllers-k8s/kms-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/helm/crds/kms.services.k8s.aws_aliases.yaml b/helm/crds/kms.services.k8s.aws_aliases.yaml
@@ -91,6 +91,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             required:

diff --git a/helm/crds/kms.services.k8s.aws_grants.yaml b/helm/crds/kms.services.k8s.aws_grants.yaml
@@ -143,6 +143,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               name:

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/kms-controller:1.0.14".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/kms-controller:1.0.15".
 
 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-kms-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-kms-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/kms-controller
-  tag: 1.0.14
+  tag: 1.0.15
   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/alias/references.go b/pkg/resource/alias/references.go
diff --git a/pkg/resource/grant/references.go b/pkg/resource/grant/references.go