Skip to content

Commit bf597b4

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.24.0, code-generator v0.24.2 (aws-controllers-k8s#56)
### Update to ACK runtime `v0.24.0`, code-generator `v0.24.2` ---------- * ACK code-generator `v0.24.2` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.24.2) * ACK runtime `v0.24.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.24.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.25` to `v0.0.26` Once this PR is merged, release `v0.0.26` 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.26 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 bd3ed73 commit bf597b4

File tree

12 files changed

+67
-28
lines changed

12 files changed

+67
-28
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: "2023-02-02T17:40:19Z"
3-
build_hash: b55ae8752ece381c383ffe5b388ed2147c6b30d8
2+
build_date: "2023-02-09T23:56:17Z"
3+
build_hash: d0f3d78cbea8061f822cbceac3786128f091efe6
44
go_version: go1.19
5-
version: v0.23.1
5+
version: v0.24.2
66
api_directory_checksum: 4f7fb701a99ba2779fc1f32a9038e16d190b07ff
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

‎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.25
9+
newTag: v0.0.26

‎config/crd/bases/mq.services.k8s.aws_brokers.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ spec:
124124
type: boolean
125125
securityGroupRefs:
126126
items:
127-
description: 'AWSResourceReferenceWrapper provides a wrapper around
127+
description: "AWSResourceReferenceWrapper provides a wrapper around
128128
*AWSResourceReference type to provide more user friendly syntax
129-
for references using ''from'' field Ex: APIIDRef: from: name:
130-
my-api'
129+
for references using 'from' field Ex: APIIDRef: \n from: name:
130+
my-api"
131131
properties:
132132
from:
133133
description: AWSResourceReference provides all the values necessary
@@ -150,10 +150,10 @@ spec:
150150
type: array
151151
subnetRefs:
152152
items:
153-
description: 'AWSResourceReferenceWrapper provides a wrapper around
153+
description: "AWSResourceReferenceWrapper provides a wrapper around
154154
*AWSResourceReference type to provide more user friendly syntax
155-
for references using ''from'' field Ex: APIIDRef: from: name:
156-
my-api'
155+
for references using 'from' field Ex: APIIDRef: \n from: name:
156+
my-api"
157157
properties:
158158
from:
159159
description: AWSResourceReference provides all the values necessary

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/aws-controllers-k8s/ec2-controller v0.0.21
7-
github.com/aws-controllers-k8s/runtime v0.23.0
7+
github.com/aws-controllers-k8s/runtime v0.24.0
88
github.com/aws/aws-sdk-go v1.44.93
99
github.com/go-logr/logr v1.2.0
1010
github.com/spf13/pflag v1.0.5
@@ -43,9 +43,11 @@ require (
4343
github.com/prometheus/client_model v0.2.0 // indirect
4444
github.com/prometheus/common v0.28.0 // indirect
4545
github.com/prometheus/procfs v0.6.0 // indirect
46+
github.com/samber/lo v1.37.0 // indirect
4647
go.uber.org/atomic v1.7.0 // indirect
4748
go.uber.org/multierr v1.6.0 // indirect
4849
go.uber.org/zap v1.19.1 // indirect
50+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
4951
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
5052
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
5153
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
6767
github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1Ix5V1UxYEgDKAhvFhPJQ=
6868
github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M=
69-
github.com/aws-controllers-k8s/runtime v0.23.0 h1:xM/zKyFzqbSr4gN9/cMRyjUUEEezHB0inpcsSV5clkg=
70-
github.com/aws-controllers-k8s/runtime v0.23.0/go.mod h1:vBsKxMSP7Ya2Mv5KPGadu6OuIESTX+YIZB/2dOV7gXo=
69+
github.com/aws-controllers-k8s/runtime v0.24.0 h1:F53HtC1YDHXcjtlRl2Q1xU0/7TRFvy9IlMFp0rTYeWE=
70+
github.com/aws-controllers-k8s/runtime v0.24.0/go.mod h1:vBfkfwxAIULdvjHCfJNi6Pj3/QJJCrh+8uH3/ZfewVU=
7171
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7272
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
7373
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -415,6 +415,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
415415
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
416416
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
417417
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
418+
github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw=
419+
github.com/samber/lo v1.37.0/go.mod h1:9vaz2O4o8oOnK23pd2TrXufcbdbJIa3b6cstBWKpopA=
418420
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
419421
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
420422
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -524,6 +526,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
524526
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
525527
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
526528
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
529+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
530+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
527531
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
528532
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
529533
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

‎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.25
5-
appVersion: v0.0.25
4+
version: v0.0.26
5+
appVersion: v0.0.26
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/crds/mq.services.k8s.aws_brokers.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ spec:
124124
type: boolean
125125
securityGroupRefs:
126126
items:
127-
description: 'AWSResourceReferenceWrapper provides a wrapper around
127+
description: "AWSResourceReferenceWrapper provides a wrapper around
128128
*AWSResourceReference type to provide more user friendly syntax
129-
for references using ''from'' field Ex: APIIDRef: from: name:
130-
my-api'
129+
for references using 'from' field Ex: APIIDRef: \n from: name:
130+
my-api"
131131
properties:
132132
from:
133133
description: AWSResourceReference provides all the values necessary
@@ -150,10 +150,10 @@ spec:
150150
type: array
151151
subnetRefs:
152152
items:
153-
description: 'AWSResourceReferenceWrapper provides a wrapper around
153+
description: "AWSResourceReferenceWrapper provides a wrapper around
154154
*AWSResourceReference type to provide more user friendly syntax
155-
for references using ''from'' field Ex: APIIDRef: from: name:
156-
my-api'
155+
for references using 'from' field Ex: APIIDRef: \n from: name:
156+
my-api"
157157
properties:
158158
from:
159159
description: AWSResourceReference provides all the values necessary

‎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.25".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:v0.0.26".
33

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

‎helm/templates/deployment.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ spec:
5656
- "$(ACK_WATCH_NAMESPACE)"
5757
- --deletion-policy
5858
- "$(DELETION_POLICY)"
59+
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
60+
- --reconcile-default-resync-seconds
61+
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
62+
{{- end }}
63+
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
64+
- --reconcile-resource-resync-seconds
65+
- "$(RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }})"
66+
{{- end }}
5967
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
6068
imagePullPolicy: {{ .Values.image.pullPolicy }}
6169
name: controller
@@ -83,6 +91,14 @@ spec:
8391
value: {{ .Values.log.level | quote }}
8492
- name: ACK_RESOURCE_TAGS
8593
value: {{ join "," .Values.resourceTags | quote }}
94+
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
95+
- name: RECONCILE_DEFAULT_RESYNC_SECONDS
96+
value: {{ .Values.reconcile.defaultResyncPeriod | quote }}
97+
{{- end }}
98+
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
99+
- name: RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }}
100+
value: {{ $key }}={{ $value }}
101+
{{- end }}
86102
{{- if .Values.aws.credentials.secretName }}
87103
- name: AWS_SHARED_CREDENTIALS_FILE
88104
value: {{ include "aws.credentials.path" . }}

‎helm/values.schema.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,18 @@
207207
"type": "string",
208208
"enum": ["delete", "retain"]
209209
},
210+
"reconcile": {
211+
"description": "Reconcile resync settings. Parameters to tune the controller's drift remediation period.",
212+
"properties": {
213+
"defaultResyncPeriod": {
214+
"type": "number"
215+
},
216+
"resourceResyncPeriods": {
217+
"type": "object"
218+
}
219+
},
220+
"type": "object"
221+
},
210222
"serviceAccount": {
211223
"description": "ServiceAccount settings",
212224
"properties": {

‎helm/values.yaml

Lines changed: 8 additions & 1 deletion
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.25
7+
tag: v0.0.26
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -83,6 +83,13 @@ resourceTags:
8383
# before the K8s resource is removed.
8484
deletionPolicy: delete
8585

86+
# controller reconciliation configurations
87+
reconcile:
88+
# The default duration, in seconds, to wait before resyncing desired state of custom resources.
89+
defaultResyncPeriod: 0
90+
# An object representing the reconcile resync configuration for each specific resource.
91+
resourceResyncPeriods: {}
92+
8693
serviceAccount:
8794
# Specifies whether a service account should be created
8895
create: true

‎pkg/resource/broker/delta.go

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

0 commit comments

Comments
 (0)