feat(opentelemetry-operator): Adding extraEnv

Signed-off-by: Jiri Tyr <jiri.tyr@gmail.com>
open-telemetry · Dec 9, 2024 · c47d6a2 · c47d6a2
1 parent 11361d7
commit c47d6a2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml
@@ -84,13 +84,14 @@ spec:
             {{-  end  }}
           command:
             - /manager
-          {{- if or .Values.manager.env .Values.manager.createRbacPermissions }}
+          {{- if or .Values.manager.env .Values.manager.extraEnv .Values.manager.createRbacPermissions }}
           env:
-            {{- if .Values.manager.env }}
             {{- range $name, $value := .Values.manager.env }}
             - name: {{ $name }}
-              value: {{ $value | quote -}}
+              value: {{ $value | quote }}
             {{- end }}
+            {{- with .Values.manager.extraEnv }}
+              {{- . | toYaml | nindent 12 }}
             {{- end }}
             {{- if .Values.manager.createRbacPermissions }}
             - name: SERVICE_ACCOUNT_NAME

diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -132,6 +132,7 @@
                 "featureGates",
                 "ports",
                 "env",
+                "extraEnv",
                 "serviceAccount",
                 "serviceMonitor",
                 "deploymentAnnotations",
@@ -720,6 +721,20 @@
                         "ENABLE_WEBHOOKS": "true"
                     }]
                 },
+                "extraEnv": {
+                    "type": "array",
+                    "default": [],
+                    "title": "Extra definitions of environment variables",
+                    "examples": [{
+                      "name": "GOMEMLIMIT",
+                      "valueFrom": {
+                        "resourceFieldRef": {
+                          "containerName": "manager",
+                          "resource": "limits.memory"
+                        }
+                      }
+                    }]
+                },
                 "serviceAccount": {
                     "type": "object",
                     "default": {},

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -104,6 +104,14 @@ manager:
   env:
     ENABLE_WEBHOOKS: "true"
 
+  # Extra definitions of environment variables.
+  extraEnv: []
+    # - name: GOMEMLIMIT
+    #   valueFrom:
+    #     resourceFieldRef:
+    #       containerName: manager
+    #       resource: limits.memory
+
   # -- Create the manager ServiceAccount
   serviceAccount:
     create: true