fix: EBPF_NET_CRASH_METRIC_PORT container env in EBPF chart not being quoted issue. (#1347)

hyfj44255 · web-flow · commit 623c98775c53 · 2024-09-25T12:12:54.000-06:00
* test: Add CI scenarios for eBPF Chart. #964 Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted issue. Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted issue. Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> --------- Signed-off-by: Yang, Robin <Robin.Yang@fmr.com>
diff --git a/charts/opentelemetry-ebpf/Chart.yaml b/charts/opentelemetry-ebpf/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-ebpf
-version: 0.1.2
+version: 0.1.3
 description: OpenTelemetry eBPF Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml
@@ -9,5 +9,3 @@ log:
 
 debug:
   enabled: true
-  storeMinidump: true
-  sendUnplannedExitMetric: false
diff --git a/charts/opentelemetry-ebpf/ci/send-unplanned-exit-metric-values.yaml b/charts/opentelemetry-ebpf/ci/send-unplanned-exit-metric-values.yaml
@@ -0,0 +1,11 @@
+# OTLP gRPC endpoint to send the collected metrics
+endpoint:
+  address: "example-opentelemetry-collector.default"
+
+debug:
+  enabled: true
+  storeMinidump: true
+  # This will send a metric when the collector exits unexpectedly, useful to detect crashes and restarts
+  # The metric will be sent to the address and port defined in the endpoint section
+  # The port is defined as integer, but it should be quoted since it will be put to containers' env
+  sendUnplannedExitMetric: true
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-ebpf-cloud-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml
@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example-opentelemetry-ebpf-cloud-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml
@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
   name: example-opentelemetry-ebpf-config
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml
@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-ebpf-k8s-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-ebpf-k8s-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml
@@ -10,7 +10,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-ebpf-k8s-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
@@ -30,7 +30,7 @@ spec:
       annotations:
         # This is here to allow us to do "zero-downtime" updates without an image change.
         rollingUpdateVersion: "1"
-        charts.flowmill.com/version: 0.1.2
+        charts.flowmill.com/version: 0.1.3
       labels:
         app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector
         app.kubernetes.io/instance: example
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml
@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example-opentelemetry-ebpf-k8s-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml
@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-ebpf-kernel-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-ebpf-kernel-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml
@@ -9,7 +9,7 @@ kind: DaemonSet
 metadata:
   name: example-opentelemetry-ebpf-kernel-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        charts.flowmill.com/version: 0.1.2
+        charts.flowmill.com/version: 0.1.3
       labels:
         app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector
         app.kubernetes.io/instance: example
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml
@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: example-opentelemetry-ebpf-kernel-collector
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   name: example-opentelemetry-ebpf-reducer
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml
@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-opentelemetry-ebpf-reducer
   labels:
-    helm.sh/chart: opentelemetry-ebpf-0.1.2
+    helm.sh/chart: opentelemetry-ebpf-0.1.3
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "v0.10.2"
diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml
@@ -119,7 +119,7 @@ spec:
           - name: "EBPF_NET_CRASH_METRIC_HOST"
             value: {{ .Values.endpoint.address }}
           - name: "EBPF_NET_CRASH_METRIC_PORT"
-            value: {{ .Values.endpoint.port }}
+            value: {{ .Values.endpoint.port | quote }}
 {{- end }}
 {{- if .Values.k8sCollector.relay.env }}
 {{ toYaml .Values.k8sCollector.relay.env | indent 10 }}
diff --git a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml
@@ -113,7 +113,7 @@ spec:
             - name: "EBPF_NET_CRASH_METRIC_HOST"
               value: {{ .Values.endpoint.address }}
             - name: "EBPF_NET_CRASH_METRIC_PORT"
-              value: {{ .Values.endpoint.port }}
+              value: {{ .Values.endpoint.port | quote }}
 {{- end }}
 {{- if .Values.kernelCollector.env }}
 {{ toYaml .Values.kernelCollector.env | indent 12 }}
diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: "EBPF_NET_CRASH_METRIC_HOST"
               value: {{ .Values.endpoint.address }}
             - name: "EBPF_NET_CRASH_METRIC_PORT"
-              value: {{ .Values.endpoint.port }}
+              value: {{ .Values.endpoint.port | quote }}
             {{- end }}
           {{- end }}
           ports:
