Skip to content

Commit ccef1e2

Browse files
authored
Update to ACK runtime v0.19.0, code-generator v0.19.0 (#42)
### Update to ACK runtime `v0.19.0`, code-generator `v0.19.0` ---------- * ACK code-generator `v0.19.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.19.0) * ACK runtime `v0.19.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.19.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.16` to `v0.0.17` Once this PR is merged, release `v0.0.17` 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.17 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.
1 parent 11f14d9 commit ccef1e2

File tree

12 files changed

+123
-22
lines changed

12 files changed

+123
-22
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2022-03-31T20:20:45Z"
3-
build_hash: c4516f46370293aa38f56d01393b7216f5902886
2+
build_date: "2022-06-13T17:01:05Z"
3+
build_hash: a133935a9a93591a9e1ba9d5ca940cb83a1353b4
44
go_version: go1.17.5
5-
version: v0.18.2
5+
version: v0.19.0
66
api_directory_checksum: 3e29a195961c3174ff9a0d00ade5f66d90e8e6bb
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0

cmd/controller/main.go

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- name: ACK_LOG_LEVEL
6767
value: "info"
6868
- name: ACK_RESOURCE_TAGS
69-
value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
69+
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
7070
securityContext:
7171
allowPrivilegeEscalation: false
7272
privileged: false

config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/mq-controller
9-
newTag: v0.0.16
9+
newTag: v0.0.17

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/mq-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.18.1
6+
github.com/aws-controllers-k8s/runtime v0.19.0
77
github.com/aws/aws-sdk-go v1.42.0
88
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5
@@ -15,6 +15,7 @@ require (
1515

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
18+
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
1819
github.com/cespare/xxhash/v2 v2.1.1 // indirect
1920
github.com/davecgh/go-spew v1.1.1 // indirect
2021
github.com/evanphx/json-patch v4.12.0+incompatible // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
6565
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
67-
github.com/aws-controllers-k8s/runtime v0.18.1 h1:eHmW7ObuGqnz/QpOKnZqHY2QuZmk8uROyXOvqKc7WjY=
68-
github.com/aws-controllers-k8s/runtime v0.18.1/go.mod h1:pK+LlQRxxWKC9mRHnGz8/WRI8Dcvjg4ZGmK8rVwb51Y=
67+
github.com/aws-controllers-k8s/runtime v0.19.0 h1:+O5a6jBSBAd8XTNMrVCIYu4G+ZUPZe/G5eopVFO18Dc=
68+
github.com/aws-controllers-k8s/runtime v0.19.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
6969
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
7070
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -79,6 +79,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
7979
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
8080
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
8181
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
82+
github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
83+
github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
8284
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
8385
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
8486
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=

helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: mq-chart
33
description: A Helm chart for the ACK service controller for Amazon MQ (MQ)
4-
version: v0.0.16
5-
appVersion: v0.0.16
4+
version: v0.0.17
5+
appVersion: v0.0.17
66
home: https://github.com/aws-controllers-k8s/mq-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:v0.0.16".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:v0.0.17".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/mq-controller
7-
tag: v0.0.16
7+
tag: v0.0.17
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -64,9 +64,8 @@ installScope: cluster
6464
resourceTags:
6565
# Configures the ACK service controller to always set key/value pairs tags on
6666
# resources that it manages.
67-
- services.k8s.aws/managed=true
68-
- services.k8s.aws/created=%UTCNOW%
69-
- services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%
67+
- services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%
68+
- services.k8s.aws/namespace=%K8S_NAMESPACE%
7069

7170
serviceAccount:
7271
# Specifies whether a service account should be created

pkg/resource/broker/manager.go

Lines changed: 34 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)