set GOMEMLIMIT and GOMAXPROCS dynamically from resources

Signed-off-by: Matthias Bertschy <[email protected]>
kubescape · Aug 27, 2024 · f98d1b4 · f98d1b4
1 parent 44eb372
commit f98d1b4
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 51 deletions.
diff --git a/charts/kubescape-operator/templates/gateway/deployment.yaml b/charts/kubescape-operator/templates/gateway/deployment.yaml
@@ -74,7 +74,13 @@ spec:
 {{ toYaml .Values.gateway.resources | indent 12 }}
           env:
             - name: GOMEMLIMIT
-              value: "{{ .Values.gateway.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/kollector/statefulset.yaml b/charts/kubescape-operator/templates/kollector/statefulset.yaml
@@ -66,7 +66,13 @@ spec:
 {{ toYaml .Values.kollector.resources | indent 12 }}
           env:
             - name: GOMEMLIMIT
-              value: "{{ .Values.kollector.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/kubescape/deployment.yaml b/charts/kubescape-operator/templates/kubescape/deployment.yaml
@@ -76,7 +76,13 @@ spec:
           periodSeconds: 3
         env:
         - name: GOMEMLIMIT
-          value: "{{ .Values.kubescape.resources.requests.memory }}B"
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
         - name: KS_LOGGER_LEVEL
           value: "{{ .Values.logger.level }}"
         - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/kubevuln/deployment.yaml b/charts/kubescape-operator/templates/kubevuln/deployment.yaml
@@ -65,7 +65,13 @@ spec:
 {{ toYaml .Values.kubevuln.resources | indent 12 }}
           env:
             - name: GOMEMLIMIT
-              value: "{{ .Values.kubevuln.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/node-agent/daemonset.yaml b/charts/kubescape-operator/templates/node-agent/daemonset.yaml
@@ -130,7 +130,13 @@ spec:
 {{ toYaml .Values.nodeAgent.resources | indent 12 }}
           env:
             - name: GOMEMLIMIT
-              value: "{{ .Values.nodeAgent.gomemlimit }}"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: HOST_ROOT
               value: "/host"
             - name: KS_LOGGER_LEVEL

diff --git a/charts/kubescape-operator/templates/operator/deployment.yaml b/charts/kubescape-operator/templates/operator/deployment.yaml
@@ -85,7 +85,13 @@ spec:
             - name: HELM_RELEASE
               value: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
             - name: GOMEMLIMIT
-              value: "{{ .Values.operator.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/otel-collector/deployment.yaml b/charts/kubescape-operator/templates/otel-collector/deployment.yaml
@@ -64,7 +64,13 @@ spec:
               name: {{ .Values.global.cloudConfig }}
               key: metrics
         - name: GOMEMLIMIT
-          value: "{{ .Values.otelCollector.resources.requests.memory }}B"
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
         - name: GOGC
           value: "80"
         {{- if ne .Values.global.httpsProxy "" }}

diff --git a/charts/kubescape-operator/templates/prometheus-exporter/deployment.yaml b/charts/kubescape-operator/templates/prometheus-exporter/deployment.yaml
@@ -52,7 +52,13 @@ spec:
 {{ toYaml .Values.prometheusExporter.resources | indent 12 }}
           env:
             - name: GOMEMLIMIT
-              value: "{{ .Values.prometheusExporter.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/storage/deployment.yaml b/charts/kubescape-operator/templates/storage/deployment.yaml
@@ -51,8 +51,14 @@ spec:
         env:
           - name: "CLEANUP_INTERVAL"
             value: "{{ .Values.storage.cleanupInterval }}"
-          - name: "GOMEMLIMIT"
-            value: "{{ .Values.storage.gomemlimit }}"
+          - name: GOMEMLIMIT
+            valueFrom:
+              resourceFieldRef:
+                resource: limits.memory
+          - name: GOMAXPROCS
+            valueFrom:
+              resourceFieldRef:
+                resource: limits.cpu
           - name: KS_LOGGER_LEVEL
             value: "{{ .Values.logger.level }}"
           - name: KS_LOGGER_NAME

diff --git a/charts/kubescape-operator/templates/synchronizer/deployment.yaml b/charts/kubescape-operator/templates/synchronizer/deployment.yaml
@@ -62,7 +62,13 @@ spec:
             - name: HELM_RELEASE
               value: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
             - name: GOMEMLIMIT
-              value: "{{ .Values.synchronizer.resources.requests.memory }}B"
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
             - name: KS_LOGGER_LEVEL
               value: "{{ .Values.logger.level }}"
             - name: KS_LOGGER_NAME