rename field in values file, remove references to pod security policy

hashicorp · Oct 21, 2024 · 681eee1 · 681eee1
1 parent bde9f05
commit 681eee1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/charts/consul/templates/sync-catalog-cleanup-on-uninstall-job.yaml b/charts/consul/templates/sync-catalog-cleanup-on-uninstall-job.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.syncCatalog.purgeServicesOnDisable }}
+{{- if .Values.syncCatalog.cleanupNodeOnRemoval }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -98,9 +98,7 @@ spec:
             -metrics-port={{ .Values.syncCatalog.metrics.port }} \
             {{- end }}
             -prometheus-retention-time={{ .Values.global.metrics.agentMetricsRetentionTime }} \
-            {{- if .Release.IsUpgrade }}
             -purge-k8s-services-from-node
-            {{- end }}
       {{- if .Values.global.acls.tolerations }}
       tolerations:
         {{ tpl .Values.global.acls.tolerations . | indent 8 | trim }}

diff --git a/charts/consul/templates/sync-catalog-cleanup-on-upgrade-job.yaml b/charts/consul/templates/sync-catalog-cleanup-on-upgrade-job.yaml
@@ -1,5 +1,5 @@
 {{- $syncCatalogEnabled := (or (and (ne (.Values.syncCatalog.enabled | toString) "-") .Values.syncCatalog.enabled) (and (eq (.Values.syncCatalog.enabled | toString) "-") .Values.global.enabled)) }}
-{{- if and (not $syncCatalogEnabled) .Values.syncCatalog.purgeServicesOnDisable }}
+{{- if and (not $syncCatalogEnabled) .Values.syncCatalog.cleanupNodeOnRemoval }}
 apiVersion: batch/v1
 kind: Job
 metadata:

diff --git a/charts/consul/templates/sync-catalog-cleanup-podsecuritypolicy.yaml b/charts/consul/templates/sync-catalog-cleanup-podsecuritypolicy.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.syncCatalog.purgeServicesOnDisable .Values.global.enablePodSecurityPolicies }}
+{{- if and .Values.syncCatalog.cleanupNodeOnRemoval }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

diff --git a/charts/consul/templates/sync-catalog-cleanup-serviceaccount.yaml b/charts/consul/templates/sync-catalog-cleanup-serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.syncCatalog.purgeServicesOnDisable }}
+{{- if .Values.syncCatalog.cleanupNodeOnRemoval }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -2092,7 +2092,7 @@ syncCatalog:
 
   # True if you want to deregister all services in this cluster from consul that have been registered by the catalog sync when the `enabled` flag is set to false.
   # @type: boolean
-  purgeServicesOnDisable: false
+  cleanupNodeOnRemoval: false
 
   # The name of the Docker image (including any tag) for consul-k8s-control-plane
   # to run the sync program.