Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2025-09-20T19:29:14Z"
build_hash: 5bf1e456e1dfc638d47ab492376335f528c0f455
go_version: go1.25.0
version: v0.52.0-1-g5bf1e45
build_date: "2025-11-12T23:09:32Z"
build_hash: c833f2d14f4fe8953663ff92f4661ae5fb01b8c8
go_version: go1.25.4
version: v0.53.1
api_directory_checksum: 83a6f2d33e6781954a317da21e666cd5195403b7
api_version: v1alpha1
aws_sdk_go_version: v1.32.6
Expand Down
3 changes: 3 additions & 0 deletions config/controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ spec:
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
- --feature-gates
- "$(FEATURE_GATES)"
- --enable-carm=$(ENABLE_CARM)
image: controller:latest
name: controller
ports:
Expand Down Expand Up @@ -80,6 +81,8 @@ spec:
value: "1"
- name: "FEATURE_GATES"
value: ""
- name: "ENABLE_CARM"
value: "true"
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/kafka-controller
newTag: 1.2.1
newTag: 1.2.2
2 changes: 1 addition & 1 deletion config/crd/bases/kafka.services.k8s.aws_clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: clusters.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: configurations.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: serverlessclusters.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion config/crd/common/bases/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down
90 changes: 90 additions & 0 deletions config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
name: iamroleselectors.services.k8s.aws
spec:
group: services.k8s.aws
names:
kind: IAMRoleSelector
listKind: IAMRoleSelectorList
plural: iamroleselectors
singular: iamroleselector
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: IAMRoleSelector is the schema for the IAMRoleSelector API.
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
properties:
arn:
type: string
x-kubernetes-validations:
- message: Value is immutable once set
rule: self == oldSelf
namespaceSelector:
description: IAMRoleSelectorSpec defines the desired state of IAMRoleSelector
properties:
labelSelector:
description: LabelSelector is a label query over a set of resources.
properties:
matchLabels:
additionalProperties:
type: string
type: object
required:
- matchLabels
type: object
names:
items:
type: string
type: array
required:
- names
type: object
resourceTypeSelector:
items:
properties:
group:
type: string
kind:
type: string
version:
type: string
required:
- group
- kind
- version
type: object
type: array
required:
- arn
type: object
status:
type: object
type: object
served: true
storage: true
subresources:
status: {}
2 changes: 1 addition & 1 deletion config/crd/common/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- bases/services.k8s.aws_adoptedresources.yaml
- bases/services.k8s.aws_iamroleselectors.yaml
- bases/services.k8s.aws_fieldexports.yaml
4 changes: 2 additions & 2 deletions config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources
- fieldexports
- iamroleselectors
verbs:
- create
- delete
Expand All @@ -70,8 +70,8 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
- fieldexports/status
- iamroleselectors/status
verbs:
- get
- patch
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.0
toolchain go1.24.1

require (
github.com/aws-controllers-k8s/runtime v0.52.0
github.com/aws-controllers-k8s/runtime v0.53.1
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7
github.com/aws/aws-sdk-go v1.49.0
github.com/aws/aws-sdk-go-v2 v1.35.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
github.com/aws-controllers-k8s/runtime v0.51.0 h1:ZKu1DXPG7+CsvbEPLMCGqWFdfK37kSbceLzYf9lRZbw=
github.com/aws-controllers-k8s/runtime v0.51.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
github.com/aws-controllers-k8s/runtime v0.52.0 h1:Q5UIAn6SSBr60t/DiU/zr6NLBlUuK2AG3yy2ma/9gDU=
github.com/aws-controllers-k8s/runtime v0.52.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
github.com/aws-controllers-k8s/runtime v0.53.1 h1:l9MkR1KfZW8H8icT5rrRK3pdnVVA4io/eINVe5aspWs=
github.com/aws-controllers-k8s/runtime v0.53.1/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7 h1:b+RT3ilVlahCSskt91YU784Bj0bF/hff4KaqmVCbisQ=
github.com/aws-controllers-k8s/secretsmanager-controller v0.0.7/go.mod h1:jVR+yHku29dFDsWDx0NaCfmoSQ0MdT6tiOydxZjAYyc=
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: kafka-chart
description: A Helm chart for the ACK service controller for Amazon Managed Streaming for Apache Kafka (MSK)
version: 1.2.1
appVersion: 1.2.1
version: 1.2.2
appVersion: 1.2.2
home: https://github.com/aws-controllers-k8s/kafka-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/kafka.services.k8s.aws_clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: clusters.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/kafka.services.k8s.aws_configurations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: configurations.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/kafka.services.k8s.aws_serverlessclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: serverlessclusters.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.19.0
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down
90 changes: 90 additions & 0 deletions helm/crds/services.k8s.aws_iamroleselectors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
name: iamroleselectors.services.k8s.aws
spec:
group: services.k8s.aws
names:
kind: IAMRoleSelector
listKind: IAMRoleSelectorList
plural: iamroleselectors
singular: iamroleselector
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: IAMRoleSelector is the schema for the IAMRoleSelector API.
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
properties:
arn:
type: string
x-kubernetes-validations:
- message: Value is immutable once set
rule: self == oldSelf
namespaceSelector:
description: IAMRoleSelectorSpec defines the desired state of IAMRoleSelector
properties:
labelSelector:
description: LabelSelector is a label query over a set of resources.
properties:
matchLabels:
additionalProperties:
type: string
type: object
required:
- matchLabels
type: object
names:
items:
type: string
type: array
required:
- names
type: object
resourceTypeSelector:
items:
properties:
group:
type: string
kind:
type: string
version:
type: string
required:
- group
- kind
- version
type: object
type: array
required:
- arn
type: object
status:
type: object
type: object
served: true
storage: true
subresources:
status: {}
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/kafka-controller:1.2.1".
This chart deploys "public.ecr.aws/aws-controllers-k8s/kafka-controller:1.2.2".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources
- fieldexports
- iamroleselectors
verbs:
- create
- delete
Expand All @@ -117,8 +117,8 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
- fieldexports/status
- iamroleselectors/status
verbs:
- get
- patch
Expand Down
6 changes: 4 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/kafka-controller
tag: 1.2.1
tag: 1.2.2
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down Expand Up @@ -183,4 +183,6 @@ featureGates:
# Enable ReadOnlyResources feature/annotation.
ReadOnlyResources: true
# Enable ResourceAdoption feature/annotation.
ResourceAdoption: true
ResourceAdoption: true
# Enable IAMRoleSelector, a multirole feature, replacing CARM. See https://github.com/aws-controllers-k8s/community/pull/2628
IAMRoleSelector: false
Loading