Skip to content

Complete support for resource-specific resync periods and default drift remediation period #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 7, 2023
Merged

Complete support for resource-specific resync periods and default drift remediation period #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e81a8a0
Complete support for resource-specific resync periods and default dri…
a-hilaly Feb 3, 2023
70b55da
Address @RedbackThomson comments
a-hilaly Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions templates/config/controller/deployment.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ spec:
- "$(ACK_RESOURCE_TAGS)"
- --watch-namespace
- "$(ACK_WATCH_NAMESPACE)"
- --reconcile-default-resync-seconds
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
- --reconcile-resource-resync-seconds
- "$(RECONCILE_RESOURCE_RESYNC_SECONDS)"
image: controller:latest
name: controller
ports:
Expand Down Expand Up @@ -66,6 +70,10 @@ spec:
value: "info"
- name: ACK_RESOURCE_TAGS
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
- name: RECONCILE_DEFAULT_RESYNC_SECONDS
value: "0"
- name: RECONCILE_RESOURCE_RESYNC_SECONDS
value: ""
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand Down
16 changes: 16 additions & 0 deletions templates/helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ spec:
- "$(ACK_WATCH_NAMESPACE)"
- --deletion-policy
- "$(DELETION_POLICY)"
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
- --reconcile-default-resync-seconds
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
{{- end }}
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
- --reconcile-resource-resync-seconds
- "$(RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }})"
{{- end }}
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: controller
Expand Down Expand Up @@ -83,6 +91,14 @@ spec:
value: {{ .Values.log.level | quote }}
- name: ACK_RESOURCE_TAGS
value: {{ join "," .Values.resourceTags | quote }}
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
- name: RECONCILE_DEFAULT_RESYNC_SECONDS
value: {{ .Values.reconcile.defaultResyncPeriod | quote }}
{{- end }}
{{- range $key, $value := .Values.reconcile.resourceResyncPeriods }}
- name: RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }}
value: {{ $key }}={{ $value }}
{{- end }}
{{- if .Values.aws.credentials.secretName }}
- name: AWS_SHARED_CREDENTIALS_FILE
value: {{ include "aws.credentials.path" . }}
Expand Down
12 changes: 12 additions & 0 deletions templates/helm/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,18 @@
"type": "string",
"enum": ["delete", "retain"]
},
"reconcile": {
"description": "Reconcile resync settings. Parameters to tune the controller's drift remediation period.",
"properties": {
"defaultResyncPeriod": {
"type": "number"
},
"resourceResyncPeriods": {
"type": "object"
}
},
"type": "object"
},
"serviceAccount": {
"description": "ServiceAccount settings",
"properties": {
Expand Down
7 changes: 7 additions & 0 deletions templates/helm/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ resourceTags:
# before the K8s resource is removed.
deletionPolicy: delete

# controller reconciliation configurations
reconcile:
# The default duration, in seconds, to wait before resyncing desired state of custom resources.
defaultResyncPeriod: 0
# An object representing the reconcile resync configuration for each specific resource.
resourceResyncPeriods: {}

serviceAccount:
# Specifies whether a service account should be created
create: true
Expand Down