Merge pull request kubernetes-sigs#2076 from alekseysen/cleanupLabel

k8s-ci-robot · web-flow · commit 37c0dc20ae79 · 2025-04-18T03:53:08.000-07:00
Control post-delete hook
diff --git a/deployment/helm/node-feature-discovery/templates/post-delete-job.yaml b/deployment/helm/node-feature-discovery/templates/post-delete-job.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.postDeleteCleanup }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -96,3 +97,5 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}
+
diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -15,6 +15,8 @@ featureGates:
 
 priorityClassName: ""
 
+postDeleteCleanup: true
+
 master:
   enable: true
   extraArgs: []
diff --git a/docs/deployment/helm.md b/docs/deployment/helm.md
@@ -164,6 +164,7 @@ Chart parameters are available.
 | `prometheus.labels`                                 | dict   | {}                                                  | Specifies labels for use with the prometheus operator to control how it is selected                                                                                                                                                                                                 |
 | `prometheus.scrapeInterval`                         | string | 10s                                                 | Specifies the interval by which metrics are scraped                                                                                                                                                                                                                                 |
 | `priorityClassName`                                 | string |                                                     | The name of the PriorityClass to be used for the NFD pods.                                                                                                                                                                                                                          |
+| `postDeleteCleanup`                                 | bool   | true                                                | Controls behavior of post-delete hook.                                                                                                                                                                                                                                              |
 
 Metrics are configured to be exposed using prometheus operator API's by
 default. If you want to expose metrics using the prometheus operator
