Skip to content

Commit 5506452

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.24.0, code-generator v0.24.2 (#96)
### 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 `v1.0.0` to `v1.0.1` Once this PR is merged, release `v1.0.1` will be automatically created for `applicationautoscaling-controller` **Please close this PR, if you do not want the new patch release for `applicationautoscaling-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building applicationautoscaling-controller ==== Copying common custom resource definitions into applicationautoscaling Building Kubernetes API objects for applicationautoscaling Generating deepcopy code for applicationautoscaling Generating custom resource definitions for applicationautoscaling Building service controller for applicationautoscaling Generating RBAC manifests for applicationautoscaling Running gofmt against generated code for applicationautoscaling Updating additional GitHub repository maintenance files ==== building applicationautoscaling-controller release artifacts ==== Building release artifacts for applicationautoscaling-v1.0.1 Generating common custom resource definitions Generating custom resource definitions for applicationautoscaling Generating RBAC manifests for applicationautoscaling ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 8161a24 commit 5506452

File tree

11 files changed

+57
-12
lines changed

11 files changed

+57
-12
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2023-02-03T20:53:35Z"
3-
build_hash: ef775017fc8021baf85ad3ff2ec115df7a543568
4-
go_version: go1.19.1
5-
version: v0.23.1-1-gef77501
2+
build_date: "2023-02-09T23:05:20Z"
3+
build_hash: d0f3d78cbea8061f822cbceac3786128f091efe6
4+
go_version: go1.19
5+
version: v0.24.2
66
api_directory_checksum: 81d152c4602b014d435a9ba3d716ed5112273013
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/applicationautoscaling-controller
9-
newTag: v1.0.0
9+
newTag: v1.0.1

‎go.mod

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

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.23.0
6+
github.com/aws-controllers-k8s/runtime v0.24.0
77
github.com/aws/aws-sdk-go v1.44.93
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-logr/logr v1.2.0
@@ -46,9 +46,11 @@ require (
4646
github.com/prometheus/client_model v0.2.0 // indirect
4747
github.com/prometheus/common v0.28.0 // indirect
4848
github.com/prometheus/procfs v0.6.0 // indirect
49+
github.com/samber/lo v1.37.0 // indirect
4950
github.com/stretchr/objx v0.2.0 // indirect
5051
go.uber.org/atomic v1.7.0 // indirect
5152
go.uber.org/multierr v1.6.0 // indirect
53+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
5254
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
5355
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
5456
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
@@ -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.23.0 h1:xM/zKyFzqbSr4gN9/cMRyjUUEEezHB0inpcsSV5clkg=
68-
github.com/aws-controllers-k8s/runtime v0.23.0/go.mod h1:vBsKxMSP7Ya2Mv5KPGadu6OuIESTX+YIZB/2dOV7gXo=
67+
github.com/aws-controllers-k8s/runtime v0.24.0 h1:F53HtC1YDHXcjtlRl2Q1xU0/7TRFvy9IlMFp0rTYeWE=
68+
github.com/aws-controllers-k8s/runtime v0.24.0/go.mod h1:vBfkfwxAIULdvjHCfJNi6Pj3/QJJCrh+8uH3/ZfewVU=
6969
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7070
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -414,6 +414,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
414414
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
415415
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
416416
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
417+
github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw=
418+
github.com/samber/lo v1.37.0/go.mod h1:9vaz2O4o8oOnK23pd2TrXufcbdbJIa3b6cstBWKpopA=
417419
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
418420
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
419421
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: applicationautoscaling-chart
33
description: A Helm chart for the ACK service controller for AWS Auto Scaling (AutoScaling)
4-
version: v1.0.0
5-
appVersion: v1.0.0
4+
version: v1.0.1
5+
appVersion: v1.0.1
66
home: https://github.com/aws-controllers-k8s/applicationautoscaling-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/applicationautoscaling-controller:v1.0.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/applicationautoscaling-controller:v1.0.1".
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/applicationautoscaling-controller
7-
tag: v1.0.0
7+
tag: v1.0.1
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/scalable_target/delta.go

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

‎pkg/resource/scaling_policy/delta.go

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

0 commit comments

Comments
 (0)