Change container and image name patching host logs directories (#535)

signalfx · Sep 14, 2022 · e1767ec · e1767ec
1 parent 35bd06c
commit e1767ec
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+### Added
+
+- A way to provide a custom image for init container patching host log directories (#534, #535)
+
 ## [0.58.0] - 2022-08-24
 
 ### Changed

diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl
@@ -210,10 +210,10 @@ Create the opentelemetry collector image name.
 {{- end -}}
 
 {{/*
-Create the chown image name.
+Create the patch-log-dirs image name.
 */}}
-{{- define "splunk-otel-collector.image.chown" -}}
-{{- printf "%s:%s" .Values.image.chown.repository (.Values.image.chown.tag | default "latest") -}}
+{{- define "splunk-otel-collector.image.initPatchLogDirs" -}}
+{{- printf "%s:%s" .Values.image.initPatchLogDirs.repository .Values.image.initPatchLogDirs.tag | trimSuffix ":" -}}
 {{- end -}}
 
 {{/*

diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -135,8 +135,9 @@ spec:
               mountPath: /var/lib/docker/containers
         {{- end }}
         {{- if and $agent.securityContext.runAsUser $agent.securityContext.runAsGroup }}
-        - name: chown
-          image: {{ template "splunk-otel-collector.image.chown" . }}
+        - name: patch-log-dirs
+          image: {{ template "splunk-otel-collector.image.initPatchLogDirs" . }}
+          imagePullPolicy: {{ .Values.image.initPatchLogDirs.pullPolicy }}
           command: ['sh', '-c', '
           mkdir -p {{ .Values.logsCollection.checkpointPath }};
           chown -Rv {{ $agent.securityContext.runAsUser | default 20000 }}:{{ $agent.securityContext.runAsGroup | default 20000 }} {{ .Values.logsCollection.checkpointPath }};

diff --git a/helm-charts/splunk-otel-collector/values.schema.json b/helm-charts/splunk-otel-collector/values.schema.json
@@ -1009,7 +1009,7 @@
             }
           }
         },
-         "chown": {
+         "initPatchLogDirs": {
           "type": "object",
           "additionalProperties": false,
           "properties": {

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -835,7 +835,7 @@ image:
 
   # Image to be used by init container that patches log directories on the host, so the collector can read from them as a non-root user.
   # Effective only if `agent.securityContext.runAsUser` and `agent.securityContext.runAsGroup` are set to non-zero values.
-  chown:
+  initPatchLogDirs:
     # The registry and name of the Universal Base Image 9 image to pull
     repository: registry.access.redhat.com/ubi9/ubi
     # The tag of the Universal Base Image 9, default value is latest