Allow Windows Daemonset resource to be created conditionally (#413)

* Enable configuring whether the Windows Daemonset is enabled or not - default for the configuration is true for backwards compatibility - wrap the daemonset as optional to allow it to be turned off when not required - wrap the exclude paths helper for windows in the same check * fix template --------- Co-authored-by: mirii1994 <[email protected]>
logzio · Jan 10, 2024 · 7594aad · 7594aad
1 parent 6bf709e
commit 7594aad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/charts/fluentd/Chart.yaml b/charts/fluentd/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for shipping Kubernetes logs via Fluentd.
 keywords:
   - logging
   - fluentd
-version: 0.28.0
+version: 0.28.1
 appVersion: 1.5.1
 maintainers:
   - name: Miri Bar

diff --git a/charts/fluentd/README.md b/charts/fluentd/README.md
@@ -115,6 +115,7 @@ helm install -n monitoring \
 | `daemonset.init.containerImage` | Init container image for the fluentd daemonset. | `busybox` |
 | `daemonset.priorityClassName` | Set [priorityClassName](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/) for all DaemonSet pods. | `""` |
 | `daemonset.updateStrategy` | Strategy to use when updating the Daemonset. | `{}` |
+| `windowsDaemonset.enabled` | Enables Fluentd Daemonset for Windows. | `true` |
 | `windowsDaemonset.kubernetesVerifySsl` | Enables to validate SSL certificates (windows). | `true` |
 | `windowsDaemonset.auditLogFormat` | Match Fluentd's format for kube-apiserver audit logs. Set to `audit-json` if your audit logs are in json format. (windows) | `audit` |
 | `windowsDaemonset.containerdRuntime` | **Deprecated from chart version 0.1.0.** Determines whether to use a configuration for a Containerd runtime. Set to `false` if your cluster doesn't use Containerd as CRI. (windows) | `true` |
@@ -300,7 +301,8 @@ If needed, the fluentd image can be changed to support windows server 2022 with
 
 
 ## Change log
-
+ - **0.28.1**:
+   - Added `windowsDaemonset.enabled` customization.
  - **0.28.0**:
    - Added `daemonset.initContainerSecurityContext` customization.
    - Added `daemonset.updateStrategy` customization.

diff --git a/charts/fluentd/templates/_helpers.tpl b/charts/fluentd/templates/_helpers.tpl
@@ -71,12 +71,14 @@ Builds the list for exclude paths in the tail for the containers
 Builds the list for exclude paths in the tail for the containers - windows
 */}}
 {{- define "logzio.windowsExcludePath" }}
+{{- if .Values.windowsDaemonset.enabled }}
 {{- if .Values.windowsDaemonset.extraExclude }}
 {{- cat .Values.windowsDaemonset.excludeFluentdPath "," .Values.windowsDaemonset.extraExclude | nospace }}
 {{- else }}
 {{- print .Values.windowsDaemonset.excludeFluentdPath }}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 
 {{/*

diff --git a/charts/fluentd/templates/daemonset.yaml b/charts/fluentd/templates/daemonset.yaml
@@ -175,6 +175,7 @@ spec:
   updateStrategy: {{ toYaml .Values.daemonset.updateStrategy | nindent 4 }}
   {{- end }}
 
+{{- if .Values.windowsDaemonset.enabled }}
 ---
 apiVersion: {{ .Values.apiVersions.daemonset }}
 kind: DaemonSet
@@ -314,3 +315,4 @@ spec:
   {{- if .Values.windowsDaemonset.updateStrategy }}
   updateStrategy: {{ toYaml .Values.windowsDaemonset.updateStrategy | nindent 4 }}
   {{- end }}
+{{- end }}
diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
@@ -145,6 +145,8 @@ daemonset:
   updateStrategy: {}
 
 windowsDaemonset:
+  # Controls whether the Daemonset is enabled for Windows
+  enabled: true
   # Tolerations for the Daemonset for Windows nodes
   tolerations:
   - key: node-role.kubernetes.io/master