aws-controllers-k8s · ack-bot · Nov 5, 2022 · Nov 4, 2022
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-10-25T17:58:30Z"
-  build_hash: 9727031b415481d9ac28bb94cac9f1e73336401d
+  build_date: "2022-11-04T23:25:04Z"
+  build_hash: 7cd74c3a855e38ea3fb5e1cf40b26fbe96283870
   go_version: go1.19
-  version: v0.19.3-9-g9727031
-api_directory_checksum: e2da75eafa3ab7fe7cc4c8c26ba01e495e31d494
+  version: v0.19.3-15-g7cd74c3-dirty
+api_directory_checksum: f01a03847a7bb58e935fdca90ecfb910f645ea61
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: 1328b65627cf7280ef4df6c1b0435653e99fe62f
+  file_checksum: 8c3d1a125902512d09de13f6ff4337e07a5518f0
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/event_source_mapping.go b/apis/v1alpha1/event_source_mapping.go
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -97,6 +97,11 @@ resources:
       ignore: true
   EventSourceMapping:
     fields:
+      Queues:
+        references:
+          resource: Broker
+          path: Status.BrokerID
+          service_name: mq
       UUID:
         is_primary_key: true
       FunctionName:

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/config/crd/bases/lambda.services.k8s.aws_eventsourcemappings.yaml b/config/crd/bases/lambda.services.k8s.aws_eventsourcemappings.yaml
@@ -155,6 +155,22 @@ spec:
                   each shard concurrently.
                 format: int64
                 type: integer
+              queueRefs:
+                items:
+                  description: 'AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using ''from'' field Ex: APIIDRef: from: name:
+                    my-api'
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               queues:
                 description: (MQ) The name of the Amazon MQ broker destination queue
                   to consume.

diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml
@@ -173,6 +173,20 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - mq.services.k8s.aws
+  resources:
+  - brokers
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - mq.services.k8s.aws
+  resources:
+  - brokers/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - s3.services.k8s.aws
   resources:

diff --git a/generator.yaml b/generator.yaml
@@ -97,6 +97,11 @@ resources:
       ignore: true
   EventSourceMapping:
     fields:
+      Queues:
+        references:
+          resource: Broker
+          path: Status.BrokerID
+          service_name: mq
       UUID:
         is_primary_key: true
       FunctionName:

diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/aws-controllers-k8s/ec2-controller v0.0.21
 	github.com/aws-controllers-k8s/kms-controller v0.1.2
+	github.com/aws-controllers-k8s/mq-controller v0.0.22
 	github.com/aws-controllers-k8s/runtime v0.20.1
 	github.com/aws-controllers-k8s/s3-controller v0.1.5
 	github.com/aws/aws-sdk-go v1.44.93

diff --git a/go.sum b/go.sum
@@ -68,6 +68,8 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1
 github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M=
 github.com/aws-controllers-k8s/kms-controller v0.1.2 h1:9lb98jspqOpFpmIFHOJ6pRnOkC8kDEPIgTAb5QnVGZo=
 github.com/aws-controllers-k8s/kms-controller v0.1.2/go.mod h1:6CoV0UMFd03EUF9dXgOTTScGdBhJzsWn9W0dw2n0kA4=
+github.com/aws-controllers-k8s/mq-controller v0.0.22 h1:XxFSQL9yaaiiuZ6E/fh/+Y9C+3DG2c5oXWG/4ZNwd1w=
+github.com/aws-controllers-k8s/mq-controller v0.0.22/go.mod h1:p+YVFjpwlgRC+1cPeCabk1xTB1hTCU+RwYtFzrTnJmE=
 github.com/aws-controllers-k8s/runtime v0.20.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
 github.com/aws-controllers-k8s/runtime v0.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
 github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=

diff --git a/helm/crds/lambda.services.k8s.aws_eventsourcemappings.yaml b/helm/crds/lambda.services.k8s.aws_eventsourcemappings.yaml
@@ -155,6 +155,22 @@ spec:
                   each shard concurrently.
                 format: int64
                 type: integer
+              queueRefs:
+                items:
+                  description: 'AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using ''from'' field Ex: APIIDRef: from: name:
+                    my-api'
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               queues:
                 description: (MQ) The name of the Amazon MQ broker destination queue
                   to consume.

diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml
@@ -4,11 +4,19 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: ack-lambda-controller
+  labels:
+  {{- range $key, $value := .Values.role.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 {{ else }}
 kind: Role
 metadata:
   creationTimestamp: null
   name: ack-lambda-controller
+  labels:
+  {{- range $key, $value := .Values.role.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   namespace: {{ .Release.Namespace }}
 {{ end }}
 rules:
@@ -180,6 +188,20 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - mq.services.k8s.aws
+  resources:
+  - brokers
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - mq.services.k8s.aws
+  resources:
+  - brokers/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - s3.services.k8s.aws
   resources:

diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -65,6 +65,14 @@
       ],
       "type": "object"
     },
+    "role": {
+      "description": "Role settings",
+      "properties": {
+        "labels": {
+	  "type": "object"
+	}
+      }
+    },
     "metrics": {
       "description": "Metrics settings",
       "properties": {

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -28,6 +28,10 @@ deployment:
   # Which priorityClassName to set?
   # See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
   priorityClassName: ""
+
+# If "installScope: cluster" then these labels will be applied to ClusterRole
+role:
+ labels: {}
 
 metrics:
   service:

diff --git a/pkg/resource/event_source_mapping/delta.go b/pkg/resource/event_source_mapping/delta.go
diff --git a/pkg/resource/event_source_mapping/references.go b/pkg/resource/event_source_mapping/references.go
diff --git a/pkg/resource/function/references.go b/pkg/resource/function/references.go