feat(chart): introduce extraEnv variable for all components

oujonny · oujonny · commit 8708001fe106 · 2026-01-08T21:33:42.000+01:00
Signed-off-by: oujonny &lt;jonny@immerda.ch&gt;
diff --git a/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml b/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml
@@ -182,6 +182,9 @@ spec:
             value: "{{- .Values.features.ENABLE_BIND_LOCAL_IP }}"
           - name: DBUS_SYSTEM_BUS_ADDRESS
             value: "unix:path=/host/var/run/dbus/system_bus_socket"
+          {{- with .Values.agent.extraEnv }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
         volumeMounts:
           - name: usr-local-sbin
             mountPath: /usr/local/sbin
diff --git a/charts/kube-ovn-v2/templates/central/central-deployment.yaml b/charts/kube-ovn-v2/templates/central/central-deployment.yaml
@@ -132,6 +132,9 @@ spec:
               value: "{{ .Values.networking.enableCompact }}"
             - name: OVN_VERSION_COMPATIBILITY
               value: '{{ include "kubeovn.ovn.versionCompatibility" . }}'
+            {{- with .Values.central.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- with .Values.central.resources }}
           resources:
             {{- toYaml . | trim | nindent 12 }}
diff --git a/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml b/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml
@@ -193,6 +193,9 @@ spec:
                   fieldPath: status.podIPs
             - name: ENABLE_BIND_LOCAL_IP
               value: "{{- .Values.features.ENABLE_BIND_LOCAL_IP }}"
+            {{- with .Values.controller.extraEnv }}
+              {{- toYaml . | nindent 18 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /etc/localtime
               name: localtime
diff --git a/charts/kube-ovn-v2/templates/ic/ic-controller-deploy.yaml b/charts/kube-ovn-v2/templates/ic/ic-controller-deploy.yaml
@@ -94,6 +94,9 @@ spec:
                   fieldPath: metadata.namespace
             - name: OVN_DB_IPS
               value: "{{ include "kubeovn.masterNodes" . | default (include "kubeovn.nodeIPs" .) }}"
+            {{- with .Values.ic.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: 300m
diff --git a/charts/kube-ovn-v2/templates/monitor/monitor-deployment.yaml b/charts/kube-ovn-v2/templates/monitor/monitor-deployment.yaml
@@ -120,6 +120,9 @@ spec:
                   fieldPath: status.podIPs
             - name: ENABLE_BIND_LOCAL_IP
               value: "{{- .Values.features.ENABLE_BIND_LOCAL_IP }}"
+            {{- with .Values.monitor.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- with .Values.monitor.resources }}
           resources:
             {{- toYaml . | trim | nindent 12 }}
diff --git a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml
@@ -140,6 +140,9 @@ spec:
               value: "{{ .Values.ovsOvn.ovnRemoteProbeInterval }}"
             - name: OVN_REMOTE_OPENFLOW_INTERVAL
               value: "{{ .Values.ovsOvn.ovnRemoteOpenflowInterval }}"
+            {{- with .Values.ovsOvn.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /usr/local/sbin
               name: usr-local-sbin
diff --git a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-dpdk-daemonset.yaml b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-dpdk-daemonset.yaml
@@ -79,6 +79,9 @@ spec:
               value: "{{ .Values.ovsOvn.ovnRemoteProbeInterval }}"
             - name: OVN_REMOTE_OPENFLOW_INTERVAL
               value: "{{ .Values.ovsOvn.ovnRemoteOpenflowInterval }}"
+            {{- with .Values.ovsOvn.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /opt/ovs-config
               name: host-config-ovs
diff --git a/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml b/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml
@@ -125,6 +125,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- with .Values.pinger.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /var/run/openvswitch
               name: host-run-ovs
diff --git a/charts/kube-ovn-v2/templates/speaker/speaker.yaml b/charts/kube-ovn-v2/templates/speaker/speaker.yaml
@@ -81,6 +81,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            {{- with .Values.bgpSpeaker.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- with .Values.bgpSpeaker.resources }}
           resources:
             {{- toYaml . | trim | nindent 12 }}
diff --git a/charts/kube-ovn-v2/templates/webhook/webhook-deployment.yaml b/charts/kube-ovn-v2/templates/webhook/webhook-deployment.yaml
@@ -63,6 +63,9 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: status.podIP
+            {{- with .Values.validatingWebhook.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
diff --git a/charts/kube-ovn-v2/values.yaml b/charts/kube-ovn-v2/values.yaml
@@ -285,6 +285,11 @@ validatingWebhook:
   # -- Labels to be added to kube-ovn-webhook pods.
   # @section -- Validating webhook configuration
   podLabels: {}
+  # -- Extra environment variables to be added to kube-ovn-webhook pods.
+  # @section -- Validating webhook configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
 
 # -- Configuration for the NAT gateways.
 # @section -- NAT gateways configuration
@@ -387,6 +392,12 @@ ovsOvn:
   # @section -- OVS/OVN daemons configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to ovs-ovn pods.
+  # @section -- OVS/OVN daemons configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- ovs-ovn resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- OVS/OVN daemons configuration
@@ -470,6 +481,12 @@ bgpSpeaker:
   # @section -- BGP speaker configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to kube-ovn-speaker pods.
+  # @section -- BGP speaker configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- kube-ovn-speaker resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- BGP speaker configuration
@@ -509,6 +526,12 @@ pinger:
   # @section -- Ping daemon configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to kube-ovn-pinger pods.
+  # @section -- Ping daemon configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- kube-ovn-pinger resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- Ping daemon configuration
@@ -571,6 +594,12 @@ monitor:
   # @section -- OVN monitoring daemon configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to kube-ovn-monitor pods.
+  # @section -- OVN monitoring daemon configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- kube-ovn-monitor resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- OVN monitoring daemon configuration
@@ -630,6 +659,12 @@ controller:
   # @section -- Kube-OVN controller configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to kube-ovn-controller pods.
+  # @section -- Kube-OVN controller configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- kube-ovn-controller resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- Kube-OVN controller configuration
@@ -689,6 +724,12 @@ central:
   # @section -- OVN-central daemon configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to ovn-central pods.
+  # @section -- OVN-central daemon configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- ovn-central resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- OVN-central daemon configuration
@@ -761,6 +802,12 @@ ic:
     # --     - antarctica-west1
     requiredDuringSchedulingIgnoredDuringExecution: []
 
+  # -- Extra environment variables to be added to ovn-ic-controller pods.
+  # @section -- OVN IC controller configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
 # -- Configuration for kube-ovn-cni, the agent responsible for handling CNI requests from the CRI.
 # @section -- CNI agent configuration
 # @default -- "{}"
@@ -778,6 +825,12 @@ agent:
   # @section -- CNI agent configuration
   podLabels: {}
 
+  # -- Extra environment variables to be added to kube-ovn-cni pods.
+  # @section -- CNI agent configuration
+  extraEnv: []
+  #  - name: CUSTOM_ENV_VAR
+  #    value: "custom-value"
+
   # -- Agent daemon resource limits & requests.
   # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
   # @section -- CNI agent configuration
