Update charts/opentelemetry-ebpf/Chart.yaml

Co-authored-by: Tyler Helmuth <[email protected]>

Makefile

@@ -1,5 +1,5 @@
 TMP_DIRECTORY = ./tmp
-CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo
+CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf
 
 .PHONY: generate-examples
 generate-examples:

charts/opentelemetry-ebpf/Chart.yaml

@@ -5,10 +5,9 @@ description: OpenTelemetry eBPF Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
 sources:
-  - https://github.com/open-telemetry/opentelemetry-collector
-  - https://github.com/open-telemetry/opentelemetry-collector-contrib
   - https://github.com/open-telemetry/opentelemetry-ebpf
 maintainers:
   - name: dmitryax
+  - name: TylerHelmuth
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
-appVersion: 0.10.0
+appVersion: v0.10.0

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   progressDeadlineSeconds: 600
@@ -27,9 +27,9 @@ spec:
         app.kubernetes.io/instance: example
     spec:
       containers:
-      - image: "otel/opentelemetry-ebpf-cloud-collector:v0.10.0"
+      - name: cloud-collector
+        image: "otel/opentelemetry-ebpf-cloud-collector:v0.10.0"
         imagePullPolicy: IfNotPresent
-        name: cloud-collector
         args:
           - --warning
         env:

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml

@@ -8,5 +8,5 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 data:
   config.yaml: |

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml

@@ -13,7 +13,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   progressDeadlineSeconds: 600
@@ -36,16 +36,16 @@ spec:
         app.kubernetes.io/instance: example
     spec:
       containers:
-      - image: "otel/opentelemetry-ebpf-k8s-watcher:v0.10.0"
+      - name: k8s-watcher
+        image: "otel/opentelemetry-ebpf-k8s-watcher:v0.10.0"
         imagePullPolicy: IfNotPresent
-        name: k8s-watcher
         args:
           - --log-console
           - --log-level=warning
       # k8s-relay, which is a service that the k8s-watcher talks to.
       # Currently not configurable, has to be reachable on localhost:8172, so must
       # share a pod with the k8s-watcher above.
-      - image: "otel/opentelemetry-ebpf-k8s-relay:v0.10.0"
+      - image: "otel/opentelemetry-ebpf-k8s-relay:"
         imagePullPolicy: IfNotPresent
         name: k8s-relay
         args:

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml

@@ -8,5 +8,5 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml

@@ -12,7 +12,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -22,7 +22,6 @@ spec:
   template:
     metadata:
       annotations:
-        release_number: "3"
         charts.flowmill.com/version: 0.1.0
       labels:
         app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml

@@ -8,5 +8,5 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml

@@ -8,15 +8,22 @@ metadata:
     helm.sh/chart: opentelemetry-ebpf-0.1.0
     app.kubernetes.io/name: opentelemetry-ebpf
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.10.0"
+    app.kubernetes.io/version: "v0.10.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
   selector:
     app.kubernetes.io/name: example-opentelemetry-ebpf-reducer
     app.kubernetes.io/instance: example
   ports:
+
+    - name: stats
+      port: 7001
+      targetPort: 7001
+      protocol: TCP
+      appProtocol: http
     - name: telemetry
       port: 7000
-      targetPort: telemetry
+      targetPort: 7000
       protocol: TCP
+      appProtocol: http

charts/opentelemetry-ebpf/examples/cloud-collector/values.yaml

@@ -1,5 +1,5 @@
 cloudCollector:
   enabled: true
 
-otelCollector:
+endpoint:
   address: example-opentelemetry-collector

charts/opentelemetry-ebpf/templates/_helpers.tpl

@@ -135,4 +135,34 @@ Fully qualified app name for the reducer deployment.
 {{- else -}}
 {{- printf "%s-%s-reducer" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+
+{{/* Build the list of port for service */}}
+{{- define "opentelemetry-collector-reducer.servicePortsConfig" -}}
+{{- $ports := deepCopy .Values.reducer.service.ports }}
+{{- range $key, $port := $ports }}
+{{- if $port.enabled }}
+- name: {{ $key }}
+  port: {{ $port.servicePort }}
+  targetPort: {{ $port.containerPort }}
+  protocol: {{ $port.protocol }}
+  {{- if $port.appProtocol }}
+  appProtocol: {{ $port.appProtocol }}
+  {{- end }}
+{{- if $port.nodePort }}
+  nodePort: {{ $port.nodePort }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Return the appropriate apiVersion for podDisruptionBudget.
+*/}}
+{{- define "podSecurityPolicy.apiVersion" -}}
+  {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}}
+    {{- print "policy/v1" -}}
+  {{- else -}}
+    {{- print "policy/v1beta1" -}}
+  {{- end -}}
 {{- end -}}

charts/opentelemetry-ebpf/templates/cloud-collector-deployment.yaml

@@ -28,9 +28,13 @@ spec:
 {{- end }}
 {{- end }}
       containers:
-      - image: "{{ default .Values.images.repository .Values.cloudCollector.image.repository }}/{{ .Values.cloudCollector.image.name }}:{{ default .Values.images.tag .Values.cloudCollector.image.tag }}"
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        name: cloud-collector
+      - name: cloud-collector
+        {{- if .Values.cloudCollector.image.tag }}
+        image: "{{ default .Values.image.registry .Values.cloudCollector.image.registry }}/{{ .Values.cloudCollector.image.name }}:{{ .Values.cloudCollector.image.tag }}"
+        {{- else }}
+        image: "{{ default .Values.image.registry .Values.cloudCollector.image.registry }}/{{ .Values.cloudCollector.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        {{- end }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
 {{- if hasKey .Values.cloudCollector "resources" }}
         resources:
 {{ toYaml .Values.cloudCollector.resources | indent 10 }}
@@ -74,7 +78,7 @@ spec:
           - name: "EBPF_NET_INTAKE_HOST"
             value: {{ include "opentelemetry-collector-reducer.fullname" . }}
           - name: "EBPF_NET_INTAKE_PORT"
-            value: "{{ default 7000 .Values.reducer.telemetryPort }}"
+            value: "{{ default 7000 .Values.reducer.service.ports.telemetry.port }}"
 {{- if hasKey .Values "debug" }}
 {{- if (default false .Values.debug.storeMinidump) }}
           - name: "EBPF_NET_MINIDUMP_DIR"

charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml

@@ -37,9 +37,13 @@ spec:
 {{- end }}
 {{- end }}
       containers:
-      - image: "{{ default .Values.images.repository .Values.k8sCollector.watcher.image.repository }}/{{ .Values.k8sCollector.watcher.image.name }}:{{ default .Values.images.tag .Values.k8sCollector.watcher.image.tag }}"
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        name: k8s-watcher
+      - name: k8s-watcher 
+        {{- if .Values.k8sCollector.watcher.image.tag }}
+        image: "{{ default .Values.image.registry .Values.k8sCollector.watcher.image.repository }}/{{ .Values.k8sCollector.watcher.image.name }}:{{ .Values.k8sCollector.watcher.image.tag }}"
+        {{- else }}
+        image: "{{ default .Values.image.registry .Values.k8sCollector.watcher.image.repository }}/{{ .Values.k8sCollector.watcher.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        {{- end }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
 {{- if hasKey .Values.k8sCollector.watcher "resources" }}
         resources:
 {{ toYaml .Values.k8sCollector.watcher.resources | indent 10 }}
@@ -52,9 +56,14 @@ spec:
       # k8s-relay, which is a service that the k8s-watcher talks to.
       # Currently not configurable, has to be reachable on localhost:8172, so must
       # share a pod with the k8s-watcher above.
-      - image: "{{ default .Values.images.repository .Values.k8sCollector.relay.image.repository }}/{{ .Values.k8sCollector.relay.image.name }}:{{ default .Values.images.tag .Values.k8sCollector.relay.image.tag }}"
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        name: k8s-relay
+      - name: k8s-relay
+        {{- if .Values.k8sCollector.relay.image.tag }}
+        image: "{{ default .Values.image.registry .Values.k8sCollector.relay.image.registry }}/{{ .Values.k8sCollector.relay.image.name }}:{{ .Values.k8sCollector.relay.image.tag }}"
+        {{- else }}
+        image: "{{ default .Values.image.registry .Values.k8sCollector.relay.image.registry }}/{{ .Values.k8sCollector.relay.image.name }}:{{ default .Chart.AppVersion .Values.k8sCollector.relay.image.tag }}"
+        {{- end }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+
 {{- if hasKey .Values.k8sCollector.relay "resources" }}
         resources:
 {{ toYaml .Values.k8sCollector.relay.resources | indent 10 }}
@@ -99,7 +108,7 @@ spec:
           - name: "EBPF_NET_INTAKE_HOST"
             value: {{ include "opentelemetry-collector-reducer.fullname" . }}
           - name: "EBPF_NET_INTAKE_PORT"
-            value: "{{ default 7000 .Values.reducer.telemetryPort }}"
+            value: "{{ default 7000 .Values.reducer.service.ports.telemetry.port }}"
 {{- if hasKey .Values "debug" }}
 {{- if (default false .Values.debug.storeMinidump) }}
           - name: "EBPF_NET_MINIDUMP_DIR"
@@ -108,9 +117,9 @@ spec:
 {{- end }}
 {{- if and .Values.debug.enabled .Values.debug.sendUnplannedExitMetric }}
           - name: "EBPF_NET_CRASH_METRIC_HOST"
-            value: {{ .Values.otelCollector.address }}
+            value: {{ .Values.endpoint.address }}
           - name: "EBPF_NET_CRASH_METRIC_PORT"
-            value: {{ .Values.otelCollector.port | default 4317 }}
+            value: {{ .Values.endpoint.port | default 4317 }}
 {{- end }}
 {{- if .Values.k8sCollector.relay.env }}
 {{ toYaml .Values.k8sCollector.relay.env | indent 10 }}

charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml

@@ -17,7 +17,6 @@ spec:
   template:
     metadata:
       annotations:
-        release_number: "3"
         charts.flowmill.com/version: {{ .Chart.Version }}
       labels:
         app.kubernetes.io/name: {{ include "opentelemetry-collector-kernel-collector.fullname" . }}
@@ -31,8 +30,12 @@ spec:
 {{- end }}
       containers:
         - name: kernel-collector
-          image: "{{ default .Values.images.repository .Values.kernelCollector.image.repository }}/{{ .Values.kernelCollector.image.name }}:{{ default .Values.images.tag .Values.kernelCollector.image.tag }}"
-          imagePullPolicy: {{ .Values.images.pullPolicy }}
+          {{- if .Values.kernelCollector.image.tag }}
+          image: "{{ default .Values.image.registry .Values.kernelCollector.image.registry }}/{{ .Values.kernelCollector.image.name }}:{{ .Values.kernelCollector.image.tag }}"
+          {{- else }}
+          image: "{{ default .Values.image.registry .Values.kernelCollector.image.registry }}/{{ .Values.kernelCollector.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --config-file=/etc/network-explorer/config.yaml
 {{- if .Values.kernelCollector.bpfDumpFile }}
@@ -93,7 +96,7 @@ spec:
             - name: "EBPF_NET_INTAKE_HOST"
               value: {{ include "opentelemetry-collector-reducer.fullname" . }}
             - name: "EBPF_NET_INTAKE_PORT"
-              value: "{{ default 7000 .Values.reducer.telemetryPort }}"
+              value: "{{ default 7000 .Values.reducer.service.ports.telemetry.port }}"
 {{- if .Values.kernelCollector.exportBpfSrcFile }}
             - name: "EBPF_NET_EXPORT_BPF_SRC_FILE"
               value: {{ quote .Values.kernelCollector.exportBpfSrcFile }}
@@ -108,9 +111,9 @@ spec:
 {{- end }}
 {{- if and .Values.debug.enabled .Values.debug.sendUnplannedExitMetric }}
             - name: "EBPF_NET_CRASH_METRIC_HOST"
-              value: {{ .Values.otelCollector.address }}
+              value: {{ .Values.endpoint.address }}
             - name: "EBPF_NET_CRASH_METRIC_PORT"
-              value: {{ .Values.otelCollector.port | default 4317 }}
+              value: {{ .Values.endpoint.port | default 4317 }}
 {{- end }}
 {{- if .Values.kernelCollector.env }}
 {{ toYaml .Values.kernelCollector.env | indent 12 }}