Update otel-collector dependencies and fix otel proxy configuration env var naming (#503)

Author: MickaelAlliel

.buildkite/tests/values_capabilities_proxy_test.py

@@ -168,6 +168,10 @@ def test_proxy_envroinment_vars_are_set(
         if container["name"] == "metrics":
             assert "KOMODOR_HTTP_PROXY" in env_vars
             continue
+        if container["name"] == "otel-collector":
+            assert "HTTP_PROXY" in env_vars
+            assert "HTTPS_PROXY" in env_vars
+            continue
 
         for env_name, expected_value in expected_env_vars.items():
 

charts/komodor-agent/README.md

@@ -332,7 +332,7 @@ The command removes all the Kubernetes components associated with the chart and
 | components.komodorDaemon.nodeEnricher.resources | object | `{"limits":{"cpu":"10m","memory":"100Mi"},"requests":{"cpu":"1m","memory":"10Mi"}}` | Set custom resources to the komodor agent node enricher container |
 | components.komodorDaemon.nodeEnricher.extraEnvVars | list | `[]` | List of additional environment variables, Each entry is a key-value pair |
 | components.komodorDaemon.opentelemetry | object | See sub-values | Configure the komodor daemon OpenTelemetry collector components |
-| components.komodorDaemon.opentelemetry.image | object | `{"name":"komodor-otel-collector","tag":"0.1.6"}` | Override the OpenTelemetry collector image name or tag. |
+| components.komodorDaemon.opentelemetry.image | object | `{"name":"komodor-otel-collector","tag":"0.1.7"}` | Override the OpenTelemetry collector image name or tag. |
 | components.komodorDaemon.opentelemetry.resources | object | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | Set custom resources to the OpenTelemetry collector container |
 | components.komodorDaemon.opentelemetry.extraEnvVars | list | `[]` | List of additional environment variables, Each entry is a key-value pair |
 | components.komodorDaemon.opentelemetry.volumes | object | `{"varlibdockercontainers":{"hostPath":{"path":"/var/lib/docker/containers","type":""},"mountPath":"/var/lib/docker/containers"},"varlogpods":{"hostPath":{"path":"/var/log/pods","type":""},"mountPath":"/var/log/pods"}}` | Configure volumes for OpenTelemetry collector |

charts/komodor-agent/templates/_proxy_conf.tpl

@@ -37,4 +37,21 @@
   value: {{ .Values.proxy.no_proxy }}
 {{- end }}
 {{- end }}
+{{- end }}
+
+{{- define "opentelemetry.proxy-conf" -}}
+{{- if .Values.proxy.enabled }}
+{{- if .Values.proxy.http }}
+- name: "HTTP_PROXY"
+  value: {{ .Values.proxy.http }}
+{{- end }}
+{{- if .Values.proxy.https }}
+- name: "HTTPS_PROXY"
+  value: {{ .Values.proxy.https }}
+{{- end }}
+{{- if .Values.proxy.no_proxy }}
+- name: "NO_PROXY"
+  value: {{ .Values.proxy.no_proxy }}
+{{- end }}
+{{- end }}
 {{- end }}

charts/komodor-agent/templates/opentelemetry/_containers.tpl

@@ -44,7 +44,7 @@
     failureThreshold: 3
     successThreshold: 1
   env:
-  {{- include "komodorAgent.proxy-conf" . | indent 2 }}
+  {{- include "opentelemetry.proxy-conf" . | indent 2 }}
   - name: NODE_NAME
     valueFrom:
       fieldRef:

charts/komodor-agent/values.yaml

@@ -603,7 +603,7 @@ components:
       # components.komodorDaemon.opentelemetry.image -- Override the OpenTelemetry collector image name or tag.
       image:
         name: komodor-otel-collector
-        tag: 0.1.6
+        tag: 0.1.7
       # components.komodorDaemon.opentelemetry.resources -- Set custom resources to the OpenTelemetry collector container
       resources:
         limits: