diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c029f6b0..39e741161a 100644 --- 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 index 1ecfb6723c..53f60a2a9d 100644 --- 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 index f3a37318af..fe5cfd4ea1 100644 --- 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[\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 index 0d06e7748d..34e0edbb5f 100644 --- 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 index c79f130e8c..d3bcb9b12d 100644 --- 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[\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 }}