Update default ballast size (#52)

Default ballast is expected to be 50% of the memory limit. Let the agent
compute it by providing the total memory.

Author: jrcamp

helm-charts/splunk-otel-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: splunk-otel-collector
-version: 0.20.2
+version: 0.20.3
 description: Splunk OpenTelemetry Connector for Kubernetes
 type: application
 keywords:

helm-charts/splunk-otel-collector/templates/_helpers.tpl

@@ -133,24 +133,3 @@ Convert memory value from resources.limit to numeric value in MiB to be used by
 {{- div (div ($mem | atoi) 1024) 1024 -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Get otel memory_limiter limit_mib value based on 80% of resources.memory.limit.
-*/}}
-{{- define "splunk-otel-collector.getOtelMemLimitMib" -}}
-{{- div (mul (include "splunk-otel-collector.convertMemToMib" .resources.limits.memory) 80) 100 }}
-{{- end -}}
-
-{{/*
-Get otel memory_limiter spike_limit_mib value based on 25% of resources.memory.limit.
-*/}}
-{{- define "splunk-otel-collector.getOtelMemSpikeLimitMib" -}}
-{{- div (mul (include "splunk-otel-collector.convertMemToMib" .resources.limits.memory) 25) 100 }}
-{{- end -}}
-
-{{/*
-Get otel memory_limiter ballast_size_mib value based on 40% of resources.memory.limit.
-*/}}
-{{- define "splunk-otel-collector.getOtelMemBallastSizeMib" }}
-{{- div (mul (include "splunk-otel-collector.convertMemToMib" .resources.limits.memory) 40) 100 }}
-{{- end -}}

helm-charts/splunk-otel-collector/templates/config/_common.tpl

@@ -6,11 +6,9 @@ memory_limiter:
   # check_interval is the time between measurements of memory usage.
   check_interval: 5s
   # By default limit_mib is set to 80% of container memory limit
-  limit_mib: {{ include "splunk-otel-collector.getOtelMemLimitMib" . | quote }}
-  # By default spike_limit_mib is set to 25% of container memory limit
-  spike_limit_mib: {{ include "splunk-otel-collector.getOtelMemSpikeLimitMib" . | quote }}
-  # By default ballast_size_mib is set to 40% of container memory limit
-  ballast_size_mib: {{ include "splunk-otel-collector.getOtelMemBallastSizeMib" . | quote }}
+  limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
+  # Agent will set this value.
+  ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
 {{- end }}
 
 {{/*

helm-charts/splunk-otel-collector/templates/daemonset.yaml

@@ -48,6 +48,8 @@ spec:
           {{ toYaml .Values.fluentd.securityContext | nindent 10 }}
         {{- end }}
         env:
+          - name: SPLUNK_MEMORY_TOTAL_MIB
+            value: "{{ include "splunk-otel-collector.convertMemToMib" .Values.otelAgent.resources.limits.memory }}"
           - name: K8S_NODE_NAME
             valueFrom:
               fieldRef:
@@ -87,7 +89,6 @@ spec:
         command:
         - /otelcol
         - --config=/conf/relay.yaml
-        - --mem-ballast-size-mib={{ template "splunk-otel-collector.getOtelMemBallastSizeMib" .Values.otelAgent }}
         - --metrics-addr=0.0.0.0:8888
         {{- range .Values.otelAgent.extraArgs }}
         - {{ . }}

helm-charts/splunk-otel-collector/templates/deployment-collector.yaml

@@ -47,14 +47,15 @@ spec:
         command:
         - /otelcol
         - --config=/conf/relay.yaml
-        - --mem-ballast-size-mib={{ template "splunk-otel-collector.getOtelMemBallastSizeMib" .Values.otelCollector }}
         - --metrics-addr=0.0.0.0:8888
         {{- range .Values.otelCollector.extraArgs }}
         - {{ . }}
         {{- end }}
         image: {{ template "splunk-otel-collector.image.otelcol" . }}
         imagePullPolicy: {{ .Values.image.otelcol.pullPolicy }}
         env:
+          - name: SPLUNK_MEMORY_TOTAL_MIB
+            value: "{{ include "splunk-otel-collector.convertMemToMib" .Values.otelCollector.resources.limits.memory }}"
           - name: K8S_NODE_NAME
             valueFrom:
               fieldRef:

helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml

@@ -47,14 +47,15 @@ spec:
         command:
         - /otelcol
         - --config=/conf/relay.yaml
-        - --mem-ballast-size-mib={{ template "splunk-otel-collector.getOtelMemBallastSizeMib" .Values.otelK8sClusterReceiver }}
         - --metrics-addr=0.0.0.0:8888
         {{- range .Values.otelK8sClusterReceiver.extraArgs }}
         - {{ . }}
         {{- end }}
         image: {{ template "splunk-otel-collector.image.otelcol" . }}
         imagePullPolicy: {{ .Values.image.otelcol.pullPolicy }}
         env:
+          - name: SPLUNK_MEMORY_TOTAL_MIB
+            value: "{{ include "splunk-otel-collector.convertMemToMib" .Values.otelK8sClusterReceiver.resources.limits.memory }}"
           - name: K8S_NODE_NAME
             valueFrom:
               fieldRef:

helm-charts/splunk-otel-collector/values.yaml

@@ -527,7 +527,7 @@ image:
     # The name of the opentelemetry collector image to pull
     name: signalfx/splunk-otel-collector
     # The tag of the opentelemetry collector image to pull
-    tag: 0.20.0
+    tag: 0.21.1
     # The policy that specifies when the user wants the opentelemetry collector images to be pulled
     pullPolicy: IfNotPresent