Update ACK runtime to v0.16.4 (#32)

### Update ACK runtime to `v0.16.4` ---------- * ACK code-generator `v0.16.4` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.16.4) * ACK runtime `v0.16.4` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.16.4) ---------- NOTE: This PR increments the release version of service controller from `v0.0.10` to `v0.0.11` Once this PR is merged, release `v0.0.11` will be automatically created for `mq-controller` **Please close this PR, if you do not want the new patch release for `mq-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building mq-controller ==== Copying common custom resource definitions into mq Building Kubernetes API objects for mq Generating deepcopy code for mq Generating custom resource definitions for mq Building service controller for mq Generating RBAC manifests for mq Running gofmt against generated code for mq Updating additional GitHub repository maintenance files ==== building mq-controller release artifacts ==== Building release artifacts for mq-v0.0.11 Generating common custom resource definitions Generating custom resource definitions for mq Generating RBAC manifests for mq ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Feb 4, 2022 · cae0a5f · cae0a5f
1 parent 99cba5a
commit cae0a5f
Show file tree

Hide file tree

Showing 18 changed files with 178 additions and 78 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,11 +1,11 @@
 ack_generate_info:
-  build_date: "2022-01-24T20:28:05Z"
-  build_hash: cccec82a27ddd880095383360df1fdc8f530842f
+  build_date: "2022-02-02T21:37:59Z"
+  build_hash: 8f02d7700eaa65a51e99c37d296056def0b70647
   go_version: go1.17.5
-  version: v0.16.3
-api_directory_checksum: f41af9c64ad2f9436486daf87a125f07fca220e8
+  version: v0.16.4
+api_directory_checksum: 3e29a195961c3174ff9a0d00ade5f66d90e8e6bb
 api_version: v1alpha1
-aws_sdk_go_version: v1.37.10
+aws_sdk_go_version: v1.42.0
 generator_config_info:
   file_checksum: db889711567c0f434fa07a6cad1cfeaf0f6a08d6
   original_file_name: generator.yaml

diff --git a/apis/v1alpha1/broker.go b/apis/v1alpha1/broker.go
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -61,6 +61,7 @@ spec:
             drop:
               - ALL
       terminationGracePeriodSeconds: 10
+      serviceAccountName: ack-mq-controller
       hostIPC: false
       hostNetwork: false
       hostPID: false
diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
@@ -5,5 +5,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ack-mq-controller
-  newTag: latest
+  newName: public.ecr.aws/aws-controllers-k8s/mq-controller
+  newTag: v0.0.11
diff --git a/config/crd/bases/mq.services.k8s.aws_brokers.yaml b/config/crd/bases/mq.services.k8s.aws_brokers.yaml
@@ -41,8 +41,8 @@ spec:
               autoMinorVersionUpgrade:
                 type: boolean
               configuration:
-                description: A list of information about the configuration. Does not
-                  apply to RabbitMQ brokers.
+                description: "A list of information about the configuration. \n Does
+                  not apply to RabbitMQ brokers."
                 properties:
                   id:
                     type: string
@@ -55,7 +55,8 @@ spec:
               deploymentMode:
                 type: string
               encryptionOptions:
-                description: Encryption options for the broker.
+                description: "Does not apply to RabbitMQ brokers. \n Encryption options
+                  for the broker."
                 properties:
                   kmsKeyID:
                     type: string
@@ -69,9 +70,9 @@ spec:
               hostInstanceType:
                 type: string
               ldapServerMetadata:
-                description: The metadata of the LDAP server used to authenticate
-                  and authorize connections to the broker. Currently not supported
-                  for RabbitMQ engine type.
+                description: "Optional. The metadata of the LDAP server used to authenticate
+                  and authorize connections to the broker. \n Does not apply to RabbitMQ
+                  brokers."
                 properties:
                   hosts:
                     items:
@@ -138,7 +139,11 @@ spec:
                 type: object
               users:
                 items:
-                  description: A user associated with the broker.
+                  description: A user associated with the broker. For RabbitMQ brokers,
+                    one and only one administrative user is accepted and created when
+                    a broker is first provisioned. All subsequent broker users are
+                    created by making RabbitMQ API calls directly to brokers or via
+                    the RabbitMQ web console.
                   properties:
                     consoleAccess:
                       type: boolean
@@ -168,6 +173,15 @@ spec:
                       type: string
                   type: object
                 type: array
+            required:
+            - autoMinorVersionUpgrade
+            - deploymentMode
+            - engineType
+            - engineVersion
+            - hostInstanceType
+            - name
+            - publiclyAccessible
+            - users
             type: object
           status:
             description: BrokerStatus defines the observed state of Broker

diff --git a/config/rbac/cluster-role-binding.yaml b/config/rbac/cluster-role-binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: ack-mq-controller
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: ack-mq-controller
   namespace: ack-system
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -3,3 +3,5 @@ resources:
 - cluster-role-controller.yaml
 - role-reader.yaml
 - role-writer.yaml
+- service-account.yaml
+
diff --git a/config/rbac/service-account.yaml b/config/rbac/service-account.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: ack-mq-controller
+  namespace: ack-system
diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/aws-controllers-k8s/mq-controller
 go 1.17
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.16.3
-	github.com/aws/aws-sdk-go v1.37.10
+	github.com/aws-controllers-k8s/runtime v0.16.4
+	github.com/aws/aws-sdk-go v1.42.0
 	github.com/go-logr/logr v1.2.0
 	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.23.0

diff --git a/go.sum b/go.sum
@@ -64,10 +64,10 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws-controllers-k8s/runtime v0.16.3 h1:AaufF1pkfX3M3G4WK6m9OTcI6yEzKnFsffpuWTIy5wY=
-github.com/aws-controllers-k8s/runtime v0.16.3/go.mod h1:DHwPczqO/nK4L1kqWlmng5GuIQuX5MSSWbTQMuL4LnM=
-github.com/aws/aws-sdk-go v1.37.10 h1:LRwl+97B4D69Z7tz+eRUxJ1C7baBaIYhgrn5eLtua+Q=
-github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws-controllers-k8s/runtime v0.16.4 h1:gV8jT09PwaCQWaC46NEnaEggqPm8Lxke6G0f7SxVsys=
+github.com/aws-controllers-k8s/runtime v0.16.4/go.mod h1:9c2CL3w0BlVkse+foHlP1SkJRqYWLs9H+4X/z+2kE3w=
+github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
+github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -592,6 +592,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

diff --git 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: v0.0.10
-appVersion: v0.0.10
+version: v0.0.11
+appVersion: v0.0.11
 home: https://github.com/aws-controllers-k8s/mq-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources: