Update to ACK runtime v0.36.0, code-generator v0.36.0

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2024-07-19T23:02:37Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:46:11Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
+  version: v0.36.0
 api_directory_checksum: 99a6a4ef4bef2333c3b5b64bef7d5e7b4cb87e25
 api_version: v1alpha1
 aws_sdk_go_version: v1.49.0

config/controller/kustomization.yaml

@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/cloudwatch-controller
-  newTag: 0.0.9
+  newTag: 0.0.10

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

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=

helm/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: cloudwatch-chart
 description: A Helm chart for the ACK service controller for Amazon CloudWatch (CloudWatch)
-version: 0.0.9
-appVersion: 0.0.9
+version: 0.0.10
+appVersion: 0.0.10
 home: https://github.com/aws-controllers-k8s/cloudwatch-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

helm/templates/NOTES.txt

@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/cloudwatch-controller:0.0.9".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/cloudwatch-controller:0.0.10".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/templates/_helpers.tpl

@@ -137,4 +137,13 @@ rules:
   - get
   - patch
   - update
-{{- end }}
+{{- end }}
+
+{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
+{{- define "ack-cloudwatch-controller.feature-gates" -}}
+{{- $list := list -}}
+{{- range $k, $v := .Values.featureGates -}}
+{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
+{{- end -}}
+{{ join "," $list }}
+{{- end -}}

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-cloudwatch-controller.feature-gates" . }}
 {{- end }}
         {{- if .Values.aws.credentials.secretName }}
         - name: AWS_SHARED_CREDENTIALS_FILE

helm/values.schema.json

@@ -268,6 +268,13 @@
       "type": "object"
     }
   },
+  "featureGates": {
+    "description": "Feature gates settings",
+    "type": "object",
+    "additionalProperties": {
+      "type": "boolean"
+    }
+  },
   "required": [
     "image",
     "deployment",

helm/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/cloudwatch-controller
-  tag: 0.0.9
+  tag: 0.0.10
   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