From 29b4cafce1c63848789ed80e6e781170d6136e91 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 12 Nov 2025 23:03:01 +0000 Subject: [PATCH] Update to ACK runtime `v0.53.1`, code-generator `v0.53.1` --- apis/v1alpha1/ack-generate-metadata.yaml | 8 +- config/controller/deployment.yaml | 3 + config/controller/kustomization.yaml | 2 +- .../bases/services.k8s.aws_fieldexports.yaml | 2 +- .../services.k8s.aws_iamroleselectors.yaml | 90 +++++++++++++++++++ config/crd/common/kustomization.yaml | 2 +- config/rbac/cluster-role-controller.yaml | 4 +- go.mod | 2 +- go.sum | 4 +- helm/Chart.yaml | 4 +- .../services.k8s.aws_iamroleselectors.yaml | 90 +++++++++++++++++++ helm/templates/NOTES.txt | 2 +- helm/templates/_helpers.tpl | 4 +- helm/values.yaml | 6 +- pkg/resource/registry.go | 4 +- 15 files changed, 206 insertions(+), 21 deletions(-) create mode 100644 config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml create mode 100644 helm/crds/services.k8s.aws_iamroleselectors.yaml diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 56c43bf..7c8d84d 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-09-29T19:41:37Z" - build_hash: ef6e2f362a0f93d4a063b0a2b416f7ab0a156843 - go_version: go1.25.0 - version: v0.52.0-4-gef6e2f3 + build_date: "2025-11-12T23:02:15Z" + build_hash: c833f2d14f4fe8953663ff92f4661ae5fb01b8c8 + go_version: go1.25.4 + version: v0.53.1 api_directory_checksum: 524e0af3e7ceea86a3153c12c06091ea924d3410 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index a986681..7da8ffd 100644 --- a/config/controller/deployment.yaml +++ b/config/controller/deployment.yaml @@ -43,6 +43,7 @@ spec: - "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)" - --feature-gates - "$(FEATURE_GATES)" + - --enable-carm=$(ENABLE_CARM) image: controller:latest name: controller ports: @@ -80,6 +81,8 @@ spec: value: "1" - name: "FEATURE_GATES" value: "" + - name: "ENABLE_CARM" + value: "true" securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 74eb482..9e34351 100644 --- 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/mq-controller - newTag: 1.1.2 + newTag: 1.1.3 diff --git a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml index 49b4f38..6e2c61e 100644 --- a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml +++ b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml @@ -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 diff --git a/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml b/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml new file mode 100644 index 0000000..9477c90 --- /dev/null +++ b/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml @@ -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: {} diff --git a/config/crd/common/kustomization.yaml b/config/crd/common/kustomization.yaml index 96349f6..8165534 100644 --- a/config/crd/common/kustomization.yaml +++ b/config/crd/common/kustomization.yaml @@ -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 diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml index 68258a2..0c9bad4 100644 --- a/config/rbac/cluster-role-controller.yaml +++ b/config/rbac/cluster-role-controller.yaml @@ -55,8 +55,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -68,8 +68,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources/status - fieldexports/status + - iamroleselectors/status verbs: - get - patch diff --git a/go.mod b/go.mod index 43ca19c..6036ed1 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.1 require ( github.com/aws-controllers-k8s/ec2-controller v0.0.21 - github.com/aws-controllers-k8s/runtime v0.52.0 + github.com/aws-controllers-k8s/runtime v0.53.1 github.com/aws/aws-sdk-go v1.49.0 github.com/aws/aws-sdk-go-v2 v1.34.0 github.com/aws/aws-sdk-go-v2/service/mq v1.27.13 diff --git a/go.sum b/go.sum index cf631f8..1a8c563 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1Ix5V1UxYEgDKAhvFhPJQ= github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M= -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/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/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 3f19a24..02e3cae 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: mq-chart description: A Helm chart for the ACK service controller for Amazon MQ (MQ) -version: 1.1.2 -appVersion: 1.1.2 +version: 1.1.3 +appVersion: 1.1.3 home: https://github.com/aws-controllers-k8s/mq-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/services.k8s.aws_iamroleselectors.yaml b/helm/crds/services.k8s.aws_iamroleselectors.yaml new file mode 100644 index 0000000..9477c90 --- /dev/null +++ b/helm/crds/services.k8s.aws_iamroleselectors.yaml @@ -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: {} diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index 534f4f7..b7fe78a 100644 --- 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/mq-controller:1.1.2". +This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:1.1.3". 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 index cc50b37..494216c 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -102,8 +102,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -115,8 +115,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources/status - fieldexports/status + - iamroleselectors/status verbs: - get - patch diff --git a/helm/values.yaml b/helm/values.yaml index 209bae1..0ba5cd2 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/mq-controller - tag: 1.1.2 + tag: 1.1.3 pullPolicy: IfNotPresent pullSecrets: [] @@ -181,4 +181,6 @@ featureGates: # Enable ReadOnlyResources feature/annotation. ReadOnlyResources: true # Enable ResourceAdoption feature/annotation. - ResourceAdoption: true \ No newline at end of file + ResourceAdoption: true + # Enable IAMRoleSelector, a multirole feature, replacing CARM. See https://github.com/aws-controllers-k8s/community/pull/2628 + IAMRoleSelector: false \ No newline at end of file diff --git a/pkg/resource/registry.go b/pkg/resource/registry.go index 3f3aa28..969531d 100644 --- a/pkg/resource/registry.go +++ b/pkg/resource/registry.go @@ -20,8 +20,8 @@ import ( acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" ) -// +kubebuilder:rbac:groups=services.k8s.aws,resources=adoptedresources,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=services.k8s.aws,resources=adoptedresources/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=services.k8s.aws,resources=iamroleselectors,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=services.k8s.aws,resources=iamroleselectors/status,verbs=get;update;patch // +kubebuilder:rbac:groups=services.k8s.aws,resources=fieldexports,verbs=get;list;watch;create;update;patch;delete // +kubebuilder:rbac:groups=services.k8s.aws,resources=fieldexports/status,verbs=get;update;patch // +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch