Skip to content

Commit 88e45cd

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.32.0, code-generator v0.32.1 (#117)
### Update to ACK runtime `v0.32.0`, code-generator `v0.32.1` ---------- * ACK code-generator `v0.32.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.32.1) * ACK runtime `v0.32.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.32.0) ---------- NOTE: This PR increments the release version of service controller from `v1.0.11` to `v1.0.12` Once this PR is merged, release `v1.0.12` 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.12 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 717a2e4 commit 88e45cd

File tree

11 files changed

+48
-15
lines changed

11 files changed

+48
-15
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: "2024-02-22T15:37:42Z"
3-
build_hash: c2165b65565ab3a094cfb474c4396f4d14c7ef1e
2+
build_date: "2024-03-06T21:29:35Z"
3+
build_hash: a5ba3c851434263128a1464a2c41e528779eeefa
44
go_version: go1.22.0
5-
version: v0.31.0
5+
version: v0.32.1
66
api_directory_checksum: 4064c75a2b25943f3824149c2f4f31013738113e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

‎config/controller/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ spec:
3939
- --enable-leader-election=$(ENABLE_LEADER_ELECTION)
4040
- --leader-election-namespace
4141
- "$(LEADER_ELECTION_NAMESPACE)"
42+
- --reconcile-default-max-concurrent-syncs
43+
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
4244
image: controller:latest
4345
name: controller
4446
ports:
@@ -72,6 +74,8 @@ spec:
7274
value: "false"
7375
- name: LEADER_ELECTION_NAMESPACE
7476
value: "ack-system"
77+
- name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS"
78+
value: "1"
7579
securityContext:
7680
allowPrivilegeEscalation: false
7781
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/applicationautoscaling-controller
9-
newTag: 1.0.11
9+
newTag: 1.0.12

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21
55
toolchain go1.21.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.31.0
8+
github.com/aws-controllers-k8s/runtime v0.32.0
99
github.com/aws/aws-sdk-go v1.49.0
1010
github.com/ghodss/yaml v1.0.0
1111
github.com/go-logr/logr v1.4.1

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.31.0 h1:/N5u2x9jB1JD8tGYe6P2rihA/ratHc5b8Au0YRjneyo=
2-
github.com/aws-controllers-k8s/runtime v0.31.0/go.mod h1:6qr9ULkjOHo0fTwEUkE+48IxHqNbHxvvf/9JzGoR8pM=
1+
github.com/aws-controllers-k8s/runtime v0.32.0 h1:R0dQs8vRlK50KZ7rgdExqExdlUgFSAzDT8q1HCxc1uc=
2+
github.com/aws-controllers-k8s/runtime v0.32.0/go.mod h1:6qr9ULkjOHo0fTwEUkE+48IxHqNbHxvvf/9JzGoR8pM=
33
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
44
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
55
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎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: 1.0.11
5-
appVersion: 1.0.11
4+
version: 1.0.12
5+
appVersion: 1.0.12
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:1.0.11".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/applicationautoscaling-controller:1.0.12".
33

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

‎helm/templates/_helpers.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ If release name contains chart name it will be used as a full name.
4444

4545
{{/* The path the shared credentials file is mounted */}}
4646
{{- define "ack-applicationautoscaling-controller.aws.credentials.path" -}}
47-
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
47+
{{ $secret_mount_path := include "ack-applicationautoscaling-controller.aws.credentials.secret_mount_path" . }}
48+
{{- printf "%s/%s" $secret_mount_path .Values.aws.credentials.secretKey -}}
4849
{{- end -}}
4950

5051
{{/* The rules a of ClusterRole or Role */}}

‎helm/templates/deployment.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,21 @@ spec:
6464
- --leader-election-namespace
6565
- "$(LEADER_ELECTION_NAMESPACE)"
6666
{{- end }}
67-
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
67+
{{- if gt (int .Values.reconcile.defaultResyncPeriod) 0 }}
6868
- --reconcile-default-resync-seconds
6969
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
7070
{{- end }}
7171
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
7272
- --reconcile-resource-resync-seconds
7373
- "$(RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }})"
74+
{{- end }}
75+
{{- if gt (int .Values.reconcile.defaultMaxConcurrentSyncs) 0 }}
76+
- --reconcile-default-max-concurrent-syncs
77+
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
78+
{{- end }}
79+
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
80+
- --reconcile-resource-max-concurrent-syncs
81+
- "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
7482
{{- end }}
7583
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
7684
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -99,13 +107,21 @@ spec:
99107
value: {{ .Values.log.level | quote }}
100108
- name: ACK_RESOURCE_TAGS
101109
value: {{ join "," .Values.resourceTags | quote }}
102-
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
110+
{{- if gt (int .Values.reconcile.defaultResyncPeriod) 0 }}
103111
- name: RECONCILE_DEFAULT_RESYNC_SECONDS
104112
value: {{ .Values.reconcile.defaultResyncPeriod | quote }}
105113
{{- end }}
106114
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
107115
- name: RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }}
108116
value: {{ $key }}={{ $value }}
117+
{{- end }}
118+
{{- if gt (int .Values.reconcile.defaultMaxConcurrentSyncs) 0 }}
119+
- name: RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS
120+
value: {{ .Values.reconcile.defaultMaxConcurrentSyncs | quote }}
121+
{{- end }}
122+
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
123+
- name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
124+
value: {{ $key }}={{ $value }}
109125
{{- end }}
110126
{{- if .Values.aws.credentials.secretName }}
111127
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,19 @@
223223
"enum": ["delete", "retain"]
224224
},
225225
"reconcile": {
226-
"description": "Reconcile resync settings. Parameters to tune the controller's drift remediation period.",
226+
"description": "Reconcile settings. This is used to configure the controller's reconciliation behavior. e.g resyncPeriod and maxConcurrentSyncs",
227227
"properties": {
228228
"defaultResyncPeriod": {
229229
"type": "number"
230230
},
231231
"resourceResyncPeriods": {
232232
"type": "object"
233+
},
234+
"defaultMaxConcurentSyncs": {
235+
"type": "number"
236+
},
237+
"resourceMaxConcurrentSyncs": {
238+
"type": "object"
233239
}
234240
},
235241
"type": "object"

0 commit comments

Comments
 (0)