diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 62462a3..96acd91 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-19T23:41:06Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.5 - version: v0.52.0 + build_date: "2025-11-12T22:38:18Z" + build_hash: c833f2d14f4fe8953663ff92f4661ae5fb01b8c8 + go_version: go1.25.4 + version: v0.53.1 api_directory_checksum: 90b0d1adcc91f4a1b1f1b436e3ac0c30d9271678 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index 7a61d68..c3c5dc1 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 a12defd..3394494 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/rds-controller - newTag: 1.6.2 + newTag: 1.6.3 diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusterendpoints.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusterendpoints.yaml index 7ad9259..0028150 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbclusterendpoints.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbclusterendpoints.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: dbclusterendpoints.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.yaml index f5b8323..925cfc8 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.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: dbclusterparametergroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml index baaac26..85130f5 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbclusters.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: dbclusters.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbclustersnapshots.yaml b/config/crd/bases/rds.services.k8s.aws_dbclustersnapshots.yaml index f6ce1ad..b6e7dfc 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbclustersnapshots.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbclustersnapshots.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: dbclustersnapshots.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml b/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml index 1d4c7a8..7ec99dd 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbinstances.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: dbinstances.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbparametergroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbparametergroups.yaml index 474239c..7d7b64a 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbparametergroups.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbparametergroups.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: dbparametergroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbproxies.yaml b/config/crd/bases/rds.services.k8s.aws_dbproxies.yaml index e7dfb4b..68fa17c 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbproxies.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbproxies.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: dbproxies.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbsnapshots.yaml b/config/crd/bases/rds.services.k8s.aws_dbsnapshots.yaml index 2a17d32..955d7f3 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbsnapshots.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbsnapshots.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: dbsnapshots.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.yaml index 8c81e68..64c70aa 100644 --- a/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.yaml +++ b/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.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: dbsubnetgroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/config/crd/bases/rds.services.k8s.aws_globalclusters.yaml b/config/crd/bases/rds.services.k8s.aws_globalclusters.yaml index 54dfa72..ac553e2 100644 --- a/config/crd/bases/rds.services.k8s.aws_globalclusters.yaml +++ b/config/crd/bases/rds.services.k8s.aws_globalclusters.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: globalclusters.rds.services.k8s.aws spec: group: rds.services.k8s.aws 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 e540ee2..8c84ac7 100644 --- a/config/rbac/cluster-role-controller.yaml +++ b/config/rbac/cluster-role-controller.yaml @@ -81,8 +81,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -94,8 +94,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 65c27a6..619cb43 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.24.1 require ( github.com/aws-controllers-k8s/ec2-controller v1.1.2 github.com/aws-controllers-k8s/kms-controller v1.0.8 - 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/rds v1.93.8 diff --git a/go.sum b/go.sum index 1daf73c..a93fd3d 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.1.2 h1:Bry62L279S7mJofk0sS4o7T7 github.com/aws-controllers-k8s/ec2-controller v1.1.2/go.mod h1:XZOZcSk0tzplY+A0dADqD4NK4a8g8Jqwf/Ouv2Sz/eQ= github.com/aws-controllers-k8s/kms-controller v1.0.8 h1:nDPYQhsgD2s14rEMNmGCwkm+e0Emjo/Usl3is7e9EFk= github.com/aws-controllers-k8s/kms-controller v1.0.8/go.mod h1:HjSBjtiljNL1yFzrOizxeQe2+88tW3mHD5fnEGwVYGE= -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 12aba5b..2fccb89 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: rds-chart description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS) -version: 1.6.2 -appVersion: 1.6.2 +version: 1.6.3 +appVersion: 1.6.3 home: https://github.com/aws-controllers-k8s/rds-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/rds.services.k8s.aws_dbclusterendpoints.yaml b/helm/crds/rds.services.k8s.aws_dbclusterendpoints.yaml index 59c94bf..7abc853 100644 --- a/helm/crds/rds.services.k8s.aws_dbclusterendpoints.yaml +++ b/helm/crds/rds.services.k8s.aws_dbclusterendpoints.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: dbclusterendpoints.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbclusterparametergroups.yaml b/helm/crds/rds.services.k8s.aws_dbclusterparametergroups.yaml index ffec4e3..0c68f2a 100644 --- a/helm/crds/rds.services.k8s.aws_dbclusterparametergroups.yaml +++ b/helm/crds/rds.services.k8s.aws_dbclusterparametergroups.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: dbclusterparametergroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbclusters.yaml b/helm/crds/rds.services.k8s.aws_dbclusters.yaml index c397543..8429894 100644 --- a/helm/crds/rds.services.k8s.aws_dbclusters.yaml +++ b/helm/crds/rds.services.k8s.aws_dbclusters.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: dbclusters.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbclustersnapshots.yaml b/helm/crds/rds.services.k8s.aws_dbclustersnapshots.yaml index 7669a09..a7e9127 100644 --- a/helm/crds/rds.services.k8s.aws_dbclustersnapshots.yaml +++ b/helm/crds/rds.services.k8s.aws_dbclustersnapshots.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: dbclustersnapshots.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbinstances.yaml b/helm/crds/rds.services.k8s.aws_dbinstances.yaml index e39fd5a..4272ca1 100644 --- a/helm/crds/rds.services.k8s.aws_dbinstances.yaml +++ b/helm/crds/rds.services.k8s.aws_dbinstances.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: dbinstances.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbparametergroups.yaml b/helm/crds/rds.services.k8s.aws_dbparametergroups.yaml index c68fbc4..e47d884 100644 --- a/helm/crds/rds.services.k8s.aws_dbparametergroups.yaml +++ b/helm/crds/rds.services.k8s.aws_dbparametergroups.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: dbparametergroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbproxies.yaml b/helm/crds/rds.services.k8s.aws_dbproxies.yaml index e7dfb4b..68fa17c 100644 --- a/helm/crds/rds.services.k8s.aws_dbproxies.yaml +++ b/helm/crds/rds.services.k8s.aws_dbproxies.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: dbproxies.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbsnapshots.yaml b/helm/crds/rds.services.k8s.aws_dbsnapshots.yaml index 5ad87ea..b3a1635 100644 --- a/helm/crds/rds.services.k8s.aws_dbsnapshots.yaml +++ b/helm/crds/rds.services.k8s.aws_dbsnapshots.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: dbsnapshots.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_dbsubnetgroups.yaml b/helm/crds/rds.services.k8s.aws_dbsubnetgroups.yaml index e27d4c8..47a551a 100644 --- a/helm/crds/rds.services.k8s.aws_dbsubnetgroups.yaml +++ b/helm/crds/rds.services.k8s.aws_dbsubnetgroups.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: dbsubnetgroups.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/rds.services.k8s.aws_globalclusters.yaml b/helm/crds/rds.services.k8s.aws_globalclusters.yaml index f7488d7..00d5768 100644 --- a/helm/crds/rds.services.k8s.aws_globalclusters.yaml +++ b/helm/crds/rds.services.k8s.aws_globalclusters.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: globalclusters.rds.services.k8s.aws spec: group: rds.services.k8s.aws diff --git a/helm/crds/services.k8s.aws_fieldexports.yaml b/helm/crds/services.k8s.aws_fieldexports.yaml index 49b4f38..6e2c61e 100644 --- a/helm/crds/services.k8s.aws_fieldexports.yaml +++ b/helm/crds/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/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 fe488c6..0450d78 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/rds-controller:1.6.2". +This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:1.6.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 d1e3323..4753920 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -128,8 +128,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -141,8 +141,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 26a7908..9096cdb 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/rds-controller - tag: 1.6.2 + tag: 1.6.3 pullPolicy: IfNotPresent pullSecrets: [] @@ -190,4 +190,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