diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 85507d0..de3687d 100644 --- 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-19T16:50:09Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.6 - version: v0.52.0 + build_date: "2025-11-12T22:44:07Z" + build_hash: c833f2d14f4fe8953663ff92f4661ae5fb01b8c8 + go_version: go1.25.4 + version: v0.53.1 api_directory_checksum: d82f4d79382f6fe41728ddbdfb5ec025b658575f api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index bb58166..1a61bf2 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 6db10e5..155f821 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/apigateway-controller - newTag: 1.3.1 + newTag: 1.3.2 diff --git a/config/crd/bases/apigateway.services.k8s.aws_apiintegrationresponses.yaml b/config/crd/bases/apigateway.services.k8s.aws_apiintegrationresponses.yaml index baa28a0..6859d4e 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_apiintegrationresponses.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_apiintegrationresponses.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: apiintegrationresponses.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_apikeys.yaml b/config/crd/bases/apigateway.services.k8s.aws_apikeys.yaml index 8b3d61c..5b63362 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_apikeys.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_apikeys.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: apikeys.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_apimethodresponses.yaml b/config/crd/bases/apigateway.services.k8s.aws_apimethodresponses.yaml index 9ca5858..0d0ab15 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_apimethodresponses.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_apimethodresponses.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: apimethodresponses.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_authorizers.yaml b/config/crd/bases/apigateway.services.k8s.aws_authorizers.yaml index f1e612b..60cd9da 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_authorizers.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_authorizers.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: authorizers.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_deployments.yaml b/config/crd/bases/apigateway.services.k8s.aws_deployments.yaml index dd957e1..4e21af2 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_deployments.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_deployments.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: deployments.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_integrations.yaml b/config/crd/bases/apigateway.services.k8s.aws_integrations.yaml index d1f5d11..32dbc94 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_integrations.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_integrations.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: integrations.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_methods.yaml b/config/crd/bases/apigateway.services.k8s.aws_methods.yaml index 261f2f6..5d4633d 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_methods.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_methods.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: methods.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_resources.yaml b/config/crd/bases/apigateway.services.k8s.aws_resources.yaml index f60f756..c18d233 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_resources.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_resources.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: resources.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_restapis.yaml b/config/crd/bases/apigateway.services.k8s.aws_restapis.yaml index 8be2bbe..576c8a0 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_restapis.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_restapis.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: restapis.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_stages.yaml b/config/crd/bases/apigateway.services.k8s.aws_stages.yaml index c2a99cc..666d718 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_stages.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_stages.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: stages.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/config/crd/bases/apigateway.services.k8s.aws_vpclinks.yaml b/config/crd/bases/apigateway.services.k8s.aws_vpclinks.yaml index e25a383..42ca364 100644 --- a/config/crd/bases/apigateway.services.k8s.aws_vpclinks.yaml +++ b/config/crd/bases/apigateway.services.k8s.aws_vpclinks.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: vpclinks.apigateway.services.k8s.aws spec: group: apigateway.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 415c5fe..3c3db97 100644 --- a/config/rbac/cluster-role-controller.yaml +++ b/config/rbac/cluster-role-controller.yaml @@ -73,8 +73,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -86,8 +86,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 9668d29..842ddd9 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.1 require ( github.com/aws-controllers-k8s/ec2-controller v1.2.15 - 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.55.0 github.com/aws/aws-sdk-go-v2 v1.36.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.10 diff --git a/go.sum b/go.sum index 0f7e198..7bba195 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.15 h1:Cij1ho3w0NxCJZOLG3ggUp8DnP/fvj43f0DSIRnySpM= github.com/aws-controllers-k8s/ec2-controller v1.2.15/go.mod h1:G27V4zTX8qoNQBm5TlEn1IxJSzB8XdFEYJiXPVgjcvE= -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.55.0 h1:hVALKPjXz33kP1R9nTyJpUK7qF59dO2mleQxUW9mCVE= github.com/aws/aws-sdk-go v1.55.0/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index d267e9c..55112da 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: apigateway-chart description: A Helm chart for the ACK service controller for Amazon API Gateway (apigateway) -version: 1.3.1 -appVersion: 1.3.1 +version: 1.3.2 +appVersion: 1.3.2 home: https://github.com/aws-controllers-k8s/apigateway-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/apigateway.services.k8s.aws_apiintegrationresponses.yaml b/helm/crds/apigateway.services.k8s.aws_apiintegrationresponses.yaml index baa28a0..6859d4e 100644 --- a/helm/crds/apigateway.services.k8s.aws_apiintegrationresponses.yaml +++ b/helm/crds/apigateway.services.k8s.aws_apiintegrationresponses.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: apiintegrationresponses.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_apikeys.yaml b/helm/crds/apigateway.services.k8s.aws_apikeys.yaml index 8b3d61c..5b63362 100644 --- a/helm/crds/apigateway.services.k8s.aws_apikeys.yaml +++ b/helm/crds/apigateway.services.k8s.aws_apikeys.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: apikeys.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_apimethodresponses.yaml b/helm/crds/apigateway.services.k8s.aws_apimethodresponses.yaml index 9ca5858..0d0ab15 100644 --- a/helm/crds/apigateway.services.k8s.aws_apimethodresponses.yaml +++ b/helm/crds/apigateway.services.k8s.aws_apimethodresponses.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: apimethodresponses.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_authorizers.yaml b/helm/crds/apigateway.services.k8s.aws_authorizers.yaml index f1e612b..60cd9da 100644 --- a/helm/crds/apigateway.services.k8s.aws_authorizers.yaml +++ b/helm/crds/apigateway.services.k8s.aws_authorizers.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: authorizers.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_deployments.yaml b/helm/crds/apigateway.services.k8s.aws_deployments.yaml index dd957e1..4e21af2 100644 --- a/helm/crds/apigateway.services.k8s.aws_deployments.yaml +++ b/helm/crds/apigateway.services.k8s.aws_deployments.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: deployments.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_integrations.yaml b/helm/crds/apigateway.services.k8s.aws_integrations.yaml index d1f5d11..32dbc94 100644 --- a/helm/crds/apigateway.services.k8s.aws_integrations.yaml +++ b/helm/crds/apigateway.services.k8s.aws_integrations.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: integrations.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_methods.yaml b/helm/crds/apigateway.services.k8s.aws_methods.yaml index 261f2f6..5d4633d 100644 --- a/helm/crds/apigateway.services.k8s.aws_methods.yaml +++ b/helm/crds/apigateway.services.k8s.aws_methods.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: methods.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_resources.yaml b/helm/crds/apigateway.services.k8s.aws_resources.yaml index f60f756..c18d233 100644 --- a/helm/crds/apigateway.services.k8s.aws_resources.yaml +++ b/helm/crds/apigateway.services.k8s.aws_resources.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: resources.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_restapis.yaml b/helm/crds/apigateway.services.k8s.aws_restapis.yaml index 8be2bbe..576c8a0 100644 --- a/helm/crds/apigateway.services.k8s.aws_restapis.yaml +++ b/helm/crds/apigateway.services.k8s.aws_restapis.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: restapis.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_stages.yaml b/helm/crds/apigateway.services.k8s.aws_stages.yaml index c2a99cc..666d718 100644 --- a/helm/crds/apigateway.services.k8s.aws_stages.yaml +++ b/helm/crds/apigateway.services.k8s.aws_stages.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: stages.apigateway.services.k8s.aws spec: group: apigateway.services.k8s.aws diff --git a/helm/crds/apigateway.services.k8s.aws_vpclinks.yaml b/helm/crds/apigateway.services.k8s.aws_vpclinks.yaml index e25a383..42ca364 100644 --- a/helm/crds/apigateway.services.k8s.aws_vpclinks.yaml +++ b/helm/crds/apigateway.services.k8s.aws_vpclinks.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: vpclinks.apigateway.services.k8s.aws spec: group: apigateway.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 cdeb4b5..19d6fff 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/apigateway-controller:1.3.1". +This chart deploys "public.ecr.aws/aws-controllers-k8s/apigateway-controller:1.3.2". 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 d43477a..80f7e5f 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -120,8 +120,8 @@ rules: - apiGroups: - services.k8s.aws resources: - - adoptedresources - fieldexports + - iamroleselectors verbs: - create - delete @@ -133,8 +133,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 d14d5f3..5de43ab 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/apigateway-controller - tag: 1.3.1 + tag: 1.3.2 pullPolicy: IfNotPresent pullSecrets: [] @@ -191,4 +191,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/integration/sdk.go b/pkg/resource/integration/sdk.go index 97d86a4..2c44fae 100644 --- a/pkg/resource/integration/sdk.go +++ b/pkg/resource/integration/sdk.go @@ -397,7 +397,7 @@ func (rm *resourceManager) newCreateRequestPayload( if r.ko.Spec.TimeoutInMillis != nil { timeoutInMillisCopy0 := *r.ko.Spec.TimeoutInMillis if timeoutInMillisCopy0 > math.MaxInt32 || timeoutInMillisCopy0 < math.MinInt32 { - return nil, fmt.Errorf("error: field timeoutInMillis is of type int32") + return nil, fmt.Errorf("error: field TimeoutInMillis is of type int32") } timeoutInMillisCopy := int32(timeoutInMillisCopy0) res.TimeoutInMillis = &timeoutInMillisCopy 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 diff --git a/pkg/resource/rest_api/sdk.go b/pkg/resource/rest_api/sdk.go index 49fbed7..b037c91 100644 --- a/pkg/resource/rest_api/sdk.go +++ b/pkg/resource/rest_api/sdk.go @@ -355,7 +355,7 @@ func (rm *resourceManager) newCreateRequestPayload( if r.ko.Spec.MinimumCompressionSize != nil { minimumCompressionSizeCopy0 := *r.ko.Spec.MinimumCompressionSize if minimumCompressionSizeCopy0 > math.MaxInt32 || minimumCompressionSizeCopy0 < math.MinInt32 { - return nil, fmt.Errorf("error: field minimumCompressionSize is of type int32") + return nil, fmt.Errorf("error: field MinimumCompressionSize is of type int32") } minimumCompressionSizeCopy := int32(minimumCompressionSizeCopy0) res.MinimumCompressionSize = &minimumCompressionSizeCopy