Skip to content

Commit a265dd5

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

File tree

12 files changed

+95
-19
lines changed

12 files changed

+95
-19
lines changed
 

Diff for: ‎apis/v1alpha1/ack-generate-metadata.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ack_generate_info:
2-
build_date: "2024-02-14T04:00:58Z"
3-
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
2+
build_date: "2024-03-06T21:26:19Z"
3+
build_hash: a5ba3c851434263128a1464a2c41e528779eeefa
44
go_version: go1.22.0
5-
version: v0.30.0
6-
api_directory_checksum: e2b940445088453d2b6df0487da46046b254fe50
5+
version: v0.32.1
6+
api_directory_checksum: 0bcf58c929c084655d281b5a9e8be5becc904fb8
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0
99
generator_config_info:

Diff for: ‎cmd/controller/main.go

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎config/controller/deployment.yaml

+16
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,13 +74,27 @@ 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
7882
runAsNonRoot: true
7983
capabilities:
8084
drop:
8185
- ALL
86+
livenessProbe:
87+
httpGet:
88+
path: /healthz
89+
port: 8081
90+
initialDelaySeconds: 15
91+
periodSeconds: 20
92+
readinessProbe:
93+
httpGet:
94+
path: /readyz
95+
port: 8081
96+
initialDelaySeconds: 5
97+
periodSeconds: 10
8298
securityContext:
8399
seccompProfile:
84100
type: RuntimeDefault

Diff for: ‎config/controller/kustomization.yaml

+1-1
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/dynamodb-controller
9-
newTag: 1.2.8
9+
newTag: 1.2.9

Diff for: ‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ go 1.21
55
toolchain go1.21.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.30.0
8+
github.com/aws-controllers-k8s/runtime v0.32.0
99
github.com/aws/aws-sdk-go v1.49.0
1010
github.com/go-logr/logr v1.4.1
1111
github.com/spf13/pflag v1.0.5
1212
github.com/stretchr/testify v1.8.4
1313
k8s.io/api v0.29.0
1414
k8s.io/apimachinery v0.29.0
1515
k8s.io/client-go v0.29.0
16-
sigs.k8s.io/controller-runtime v0.17.0
16+
sigs.k8s.io/controller-runtime v0.17.2
1717
)
1818

1919
require (

Diff for: ‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.30.0 h1:AibYRdi/7xUA3t8BA0u8g+J+OioaTAT6R4Vq8hxLiYw=
2-
github.com/aws-controllers-k8s/runtime v0.30.0/go.mod h1:Pv1ozlUaO11KO2mwPN/HzhAtZ70ZDE9UP24mjsbkul0=
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=
@@ -215,8 +215,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
215215
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
216216
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
217217
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
218-
sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s=
219-
sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
218+
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
219+
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
220220
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
221221
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
222222
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

Diff for: ‎helm/Chart.yaml

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

Diff for: ‎helm/templates/NOTES.txt

+1-1
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/dynamodb-controller:1.2.8".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.2.9".
33

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

Diff for: ‎helm/templates/_helpers.tpl

+2-1
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-dynamodb-controller.aws.credentials.path" -}}
47-
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
47+
{{ $secret_mount_path := include "ack-dynamodb-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 */}}

Diff for: ‎helm/templates/deployment.yaml

+30-2
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
@@ -132,6 +148,18 @@ spec:
132148
capabilities:
133149
drop:
134150
- ALL
151+
livenessProbe:
152+
httpGet:
153+
path: /healthz
154+
port: 8081
155+
initialDelaySeconds: 15
156+
periodSeconds: 20
157+
readinessProbe:
158+
httpGet:
159+
path: /readyz
160+
port: 8081
161+
initialDelaySeconds: 5
162+
periodSeconds: 10
135163
securityContext:
136164
seccompProfile:
137165
type: RuntimeDefault

Diff for: ‎helm/values.schema.json

+7-1
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"

Diff for: ‎helm/values.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/dynamodb-controller
7-
tag: 1.2.8
7+
tag: 1.2.9
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -128,6 +128,12 @@ reconcile:
128128
# An object representing the reconcile resync configuration for each specific resource.
129129
resourceResyncPeriods: {}
130130

131+
# The default number of concurrent syncs that a reconciler can perform.
132+
defaultMaxConcurrentSyncs: 1
133+
# An object representing the reconcile max concurrent syncs configuration for each specific
134+
# resource.
135+
resourceMaxConcurrentSyncs: {}
136+
131137
serviceAccount:
132138
# Specifies whether a service account should be created
133139
create: true

0 commit comments

Comments
 (0)
Please sign in to comment.