Made Fluentd pod init container image variable (#182)

signalfx · Aug 4, 2021 · 95db3db · 95db3db
1 parent af2d076
commit 95db3db
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -57,7 +57,8 @@ spec:
       {{- if .Values.logsEnabled }}
       initContainers:
         - name: prepare-fluentd-config
-          image: busybox:1.33
+          image: {{ .Values.image.fluentd.initContainer.image }}
+          imagePullPolicy: {{ .Values.image.fluentd.initContainer.pullPolicy }}
           command: [ "sh", "-c"]
           args:
             - if [ -z "${LOG_FORMAT_TYPE}" ]; then

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -518,6 +518,12 @@ image:
     # The policy that specifies when the user wants the fluentd images to be pulled
     pullPolicy: IfNotPresent
 
+    initContainer:
+      # The image of the container for fluentd init to pull
+      image: busybox:1.33
+      # The policy that specifies when the user wants the fluentd init image to be pulled
+      pullPolicy: IfNotPresent
+
   otelcol:
     # The registry and name of the opentelemetry collector image to pull
     repository: quay.io/signalfx/splunk-otel-collector

diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml
@@ -35,6 +35,7 @@ spec:
       initContainers:
         - name: prepare-fluentd-config
           image: busybox:1.33
+          imagePullPolicy: IfNotPresent
           command: [ "sh", "-c"]
           args:
             - if [ -z "${LOG_FORMAT_TYPE}" ]; then

diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml
@@ -35,6 +35,7 @@ spec:
       initContainers:
         - name: prepare-fluentd-config
           image: busybox:1.33
+          imagePullPolicy: IfNotPresent
           command: [ "sh", "-c"]
           args:
             - if [ -z "${LOG_FORMAT_TYPE}" ]; then