Skip to content

Commit 78d2363

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

13 files changed

+53
-16
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-08-02T05:55:50Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
4-
go_version: go1.22.4
5-
version: v0.35.0
2+
build_date: "2024-08-06T02:52:29Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
4+
go_version: go1.22.5
5+
version: v0.36.0
66
api_directory_checksum: 619ff4b8739eb9cbf1a2d71d97046be2cb8e1587
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.158

‎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/kafka-controller
9-
newTag: 0.0.10
9+
newTag: 0.0.11

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

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
type: array

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.35.0
8+
github.com/aws-controllers-k8s/runtime v0.36.0
99
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7
1010
github.com/aws/aws-sdk-go v1.49.0
1111
github.com/go-logr/logr v1.4.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
2-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
1+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
2+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
33
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7 h1:b+RT3ilVlahCSskt91YU784Bj0bF/hff4KaqmVCbisQ=
44
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7/go.mod h1:jVR+yHku29dFDsWDx0NaCfmoSQ0MdT6tiOydxZjAYyc=
55
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=

‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: kafka-chart
33
description: A Helm chart for the ACK service controller for Amazon Managed Streaming for Apache Kafka (MSK)
4-
version: 0.0.10
5-
appVersion: 0.0.10
4+
version: 0.0.11
5+
appVersion: 0.0.11
66
home: https://github.com/aws-controllers-k8s/kafka-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

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

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
type: array

‎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/kafka-controller:0.0.10".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/kafka-controller:0.0.11".
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
@@ -171,4 +171,13 @@ rules:
171171
- get
172172
- patch
173173
- update
174-
{{- end }}
174+
{{- end }}
175+
176+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
177+
{{- define "ack-kafka-controller.feature-gates" -}}
178+
{{- $list := list -}}
179+
{{- range $k, $v := .Values.featureGates -}}
180+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
181+
{{- end -}}
182+
{{ join "," $list }}
183+
{{- 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-kafka-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

+7
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,13 @@
268268
"type": "object"
269269
}
270270
},
271+
"featureGates": {
272+
"description": "Feature gates settings",
273+
"type": "object",
274+
"additionalProperties": {
275+
"type": "boolean"
276+
}
277+
},
271278
"required": [
272279
"image",
273280
"deployment",

‎helm/values.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/kafka-controller
7-
tag: 0.0.10
7+
tag: 0.0.11
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -153,3 +153,10 @@ leaderElection:
153153
# will attempt to use the namespace of the service account mounted to the Controller
154154
# pod.
155155
namespace: ""
156+
157+
# Configuration for feature gates. These are optional controller features that
158+
# can be individually enabled ("true") or disabled ("false") by adding key/value
159+
# pairs below.
160+
featureGates: {}
161+
# featureGate1: true
162+
# featureGate2: false

‎pkg/resource/cluster/references.go

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)