Apply agent resources to init containers (#690)

Azure Defender throws warnings expecting all containers to have resource limits specified, even on init containers. This change applies the same resources to init containers as allocated to the collector agent. The pod effective limits are not affected because init container limits don't adds up, highest value is applied instead.
signalfx · Mar 8, 2023 · 8ffd2b9 · 8ffd2b9
1 parent 45222e0
commit 8ffd2b9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 - Add functional test coverage for Network Explorer metrics ([#684](https://github.com/signalfx/splunk-otel-collector-chart/pull/684)
+- Apply the same resources to init containers as allocated to the otel agent container ([#690](https://github.com/signalfx/splunk-otel-collector-chart/pull/690)
 
 ## [0.71.0] - 2023-03-01
 

diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml
@@ -57,6 +57,10 @@ spec:
           env:
             - name: LOG_FORMAT_TYPE
               value: ""
+          resources:
+            limits:
+              cpu: 200m
+              memory: 500Mi
           volumeMounts:
             - name: varlogdest
               mountPath: /var/lib/docker/containers

diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml
@@ -65,6 +65,10 @@ spec:
             value: "/var/addon/splunk/otel_pos/receiver_journald_"
           - name: JOURNALD_LOG_CAPTURE_REGEX
             value: '\/splunkd\-fluentd\-journald\-(?P<name>[\w0-9-_]+)\.pos\.json'
+          resources:
+            limits:
+              cpu: 200m
+              memory: 500Mi
           volumeMounts:
             - name: checkpoint
               mountPath: /var/addon/splunk/otel_pos

diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml
@@ -57,6 +57,10 @@ spec:
           env:
             - name: LOG_FORMAT_TYPE
               value: ""
+          resources:
+            limits:
+              cpu: 200m
+              memory: 500Mi
           volumeMounts:
             - name: varlogdest
               mountPath: /var/lib/docker/containers

diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -86,6 +86,8 @@ spec:
           env:
             - name: LOG_FORMAT_TYPE
               value: "{{ .Values.fluentd.config.containers.logFormatType }}"
+          resources:
+            {{- toYaml $agent.resources | nindent 12 }}
           volumeMounts:
             - name: varlogdest
               mountPath: {{ .Values.fluentd.config.containers.pathDest }}
@@ -121,6 +123,8 @@ spec:
             value: "/var/addon/splunk/otel_pos/receiver_journald_"
           - name: JOURNALD_LOG_CAPTURE_REGEX
             value: '\/splunkd\-fluentd\-journald\-(?P<name>[\w0-9-_]+)\.pos\.json'
+          resources:
+            {{- toYaml $agent.resources | nindent 12 }}
           volumeMounts:
             - name: checkpoint
               mountPath: /var/addon/splunk/otel_pos
@@ -159,6 +163,8 @@ spec:
           {{- end }}']
           securityContext:
             runAsUser: 0
+          resources:
+            {{- toYaml $agent.resources | nindent 12 }}
           volumeMounts:
             - name: checkpoint
               mountPath: {{ .Values.logsCollection.checkpointPath }}