openstack/magnum-capi-helm-charts
Code Issues Proposed changes

Switch to PruneLast for templates

Browse Source
This commit is contained in:
Matt Pryor 2023-01-31 20:59:19 +00:00
parent af636bbc9d
commit 718b613266
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml
View File

@ -47,10 +47,10 @@ metadata:
labels: {{ include "openstack-cluster.componentLabels" (list . "control-plane") | nindent 4 }}
annotations:
{{ .Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.controlplane.mt.checksum" . }}
# We let Cluster API clean up the cluster resources
# Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions
# Cluster API complains when old templates disappear before it has rolled all the machines over
# When deploying with Helm, leave the resource behind and let Cluster API clean it up
helm.sh/resource-policy: keep
# Same, but for Argo
argocd.argoproj.io/sync-options: Prune=false
# For Argo, we can do better and make sure it is removed only once the cluster becomes healthy again
argocd.argoproj.io/sync-options: PruneLast=true
spec:
{{- include "openstack-cluster.controlplane.mt.spec" . | nindent 2 }}

8
charts/openstack-cluster/templates/node-group/kubeadm-config-template.yaml
View File

@ -40,11 +40,11 @@ metadata:
{{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }}
annotations:
{{ $.Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.nodegroup.kct.checksum" (list $ $nodeGroup) }}
# We let Cluster API clean up the cluster resources
# Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions
# Cluster API complains when old templates disappear before it has rolled all the machines over
# When deploying with Helm, leave the resource behind and let Cluster API clean it up
helm.sh/resource-policy: keep
# Same, but for Argo
argocd.argoproj.io/sync-options: Prune=false
# For Argo, we can do better and make sure it is removed only once the cluster becomes healthy again
argocd.argoproj.io/sync-options: PruneLast=true
spec:
template:
spec: {{ include "openstack-cluster.nodegroup.kct.spec" (list $ $nodeGroup) | nindent 6 }}

8
charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml
View File

@ -56,10 +56,10 @@ metadata:
{{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }}
annotations:
{{ $.Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.nodegroup.mt.checksum" (list $ $nodeGroup) }}
# We let Cluster API clean up the cluster resources
# Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions
# Cluster API complains when old templates disappear before it has rolled all the machines over
# When deploying with Helm, leave the resource behind and let Cluster API clean it up
helm.sh/resource-policy: keep
# Same, but for Argo
argocd.argoproj.io/sync-options: Prune=false
# For Argo, we can do better and make sure it is removed only once the cluster becomes healthy again
argocd.argoproj.io/sync-options: PruneLast=true
spec: {{ include "openstack-cluster.nodegroup.mt.spec" (list $ $nodeGroup) | nindent 2 }}
{{- end }}