Merge pull request #772 from solarwinds/enable-arm-ebpf

Enable ARM Network-Collector + bump to 0.10.3
solarwinds · Oct 29, 2024 · 292dd45 · 292dd45
2 parents ff06304 + 95aad6b
commit 292dd45
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 19 deletions.
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 4.2.0-alpha.6
+version: 4.2.0-alpha.7
 appVersion: 0.11.7
 description: SolarWinds Kubernetes Integration
 keywords:
@@ -27,14 +27,14 @@ annotations:
   artifacthub.io/license: Apache-2.0
   artifacthub.io/images: |
     - name: ebpf-kernelCollector
-      image: solarwinds/opentelemetry-ebpf-kernel-collector:v0.10.2
+      image: solarwinds/opentelemetry-ebpf-kernel-collector:v0.10.3
       whitelisted: true
     - name: ebpf-k8sCollectorWatcher
-      image: solarwinds/opentelemetry-ebpf-k8s-watcher:v0.10.2
+      image: solarwinds/opentelemetry-ebpf-k8s-watcher:v0.10.3
       whitelisted: true
     - name: ebpf-k8sCollectorRelay
-      image: solarwinds/opentelemetry-ebpf-k8s-relay:v0.10.2
+      image: solarwinds/opentelemetry-ebpf-k8s-relay:v0.10.3
       whitelisted: true
     - name: ebpf-reducer
-      image: solarwinds/opentelemetry-ebpf-reducer:v0.10.2
+      image: solarwinds/opentelemetry-ebpf-reducer:v0.10.3
       whitelisted: true
diff --git a/deploy/helm/templates/network/k8s-collector-deployment.yaml b/deploy/helm/templates/network/k8s-collector-deployment.yaml
@@ -26,7 +26,6 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml .Values.imagePullSecrets | nindent 8 }}

diff --git a/deploy/helm/templates/network/kernel-collector-daemonset.yaml b/deploy/helm/templates/network/kernel-collector-daemonset.yaml
@@ -48,7 +48,6 @@ spec:
       {{ toYaml .Values.ebpfNetworkMonitoring.kernelCollector.nodeSelector | nindent 8 }}
       {{- end }}
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml .Values.imagePullSecrets | nindent 8 }}

diff --git a/deploy/helm/templates/network/reducer-deployment.yaml b/deploy/helm/templates/network/reducer-deployment.yaml
@@ -23,7 +23,6 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: amd64
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml .Values.imagePullSecrets | nindent 8 }}

diff --git a/deploy/helm/tests/__snapshot__/k8s-collector-deployment_test.yaml.snap b/deploy/helm/tests/__snapshot__/k8s-collector-deployment_test.yaml.snap
@@ -4,7 +4,7 @@ Deployment spec should match snapshot when ebpfNetworkMonitoring is enabled:
       - args:
           - --log-console
           - --log-level=warning
-        image: solarwinds/opentelemetry-ebpf-k8s-watcher:v0.10.2
+        image: solarwinds/opentelemetry-ebpf-k8s-watcher:v0.10.3
         imagePullPolicy: IfNotPresent
         name: k8s-watcher
       - args:
@@ -21,7 +21,7 @@ Deployment spec should match snapshot when ebpfNetworkMonitoring is enabled:
             value: RELEASE-NAME-swo-k8s-collector-metrics-collector
           - name: EBPF_NET_CRASH_METRIC_PORT
             value: "4317"
-        image: solarwinds/opentelemetry-ebpf-k8s-relay:v0.10.2
+        image: solarwinds/opentelemetry-ebpf-k8s-relay:v0.10.3
         imagePullPolicy: IfNotPresent
         name: k8s-relay
         volumeMounts:
@@ -41,7 +41,6 @@ Deployment spec should match snapshot when ebpfNetworkMonitoring is enabled:
         imagePullPolicy: IfNotPresent
         name: wait-for-reducer
     nodeSelector:
-      kubernetes.io/arch: amd64
       kubernetes.io/os: linux
     securityContext: {}
     serviceAccountName: RELEASE-NAME-swo-k8s-collector

diff --git a/deploy/helm/tests/__snapshot__/kernel-collector-daemonset_test.yaml.snap b/deploy/helm/tests/__snapshot__/kernel-collector-daemonset_test.yaml.snap
@@ -31,7 +31,7 @@ DaemonSet spec should match snapshot when ebpfNetworkMonitoring is enabled:
             value: "4317"
           - name: BCC_PROBE_SUFFIX
             value: <CLUSTER_NAME>
-        image: solarwinds/opentelemetry-ebpf-kernel-collector:v0.10.2
+        image: solarwinds/opentelemetry-ebpf-kernel-collector:v0.10.3
         imagePullPolicy: IfNotPresent
         name: swi-kernel-collector
         resources:
@@ -66,7 +66,6 @@ DaemonSet spec should match snapshot when ebpfNetworkMonitoring is enabled:
         imagePullPolicy: IfNotPresent
         name: wait-for-reducer
     nodeSelector:
-      kubernetes.io/arch: amd64
       kubernetes.io/os: linux
     securityContext:
       fsGroup: 0

diff --git a/deploy/helm/tests/__snapshot__/reducer-deployment_test.yaml.snap b/deploy/helm/tests/__snapshot__/reducer-deployment_test.yaml.snap
@@ -19,7 +19,7 @@ Deployment spec should match snapshot when ebpfNetworkMonitoring is enabled:
             value: RELEASE-NAME-swo-k8s-collector-metrics-collector
           - name: EBPF_NET_CRASH_METRIC_PORT
             value: "4317"
-        image: solarwinds/opentelemetry-ebpf-reducer:v0.10.2
+        image: solarwinds/opentelemetry-ebpf-reducer:v0.10.3
         imagePullPolicy: IfNotPresent
         name: reducer
         ports:
@@ -52,6 +52,5 @@ Deployment spec should match snapshot when ebpfNetworkMonitoring is enabled:
         imagePullPolicy: IfNotPresent
         name: wait-for-metrics-collector
     nodeSelector:
-      kubernetes.io/arch: amd64
       kubernetes.io/os: linux
     volumes: null
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -671,7 +671,7 @@ ebpfNetworkMonitoring:
 
     image:
       repository: "solarwinds/opentelemetry-ebpf-kernel-collector"
-      tag: "v0.10.2"
+      tag: "v0.10.3"
       pullPolicy: IfNotPresent
 
     resources:
@@ -697,13 +697,13 @@ ebpfNetworkMonitoring:
     watcher:
       image:
         repository: "solarwinds/opentelemetry-ebpf-k8s-watcher"
-        tag: "v0.10.2"
+        tag: "v0.10.3"
         pullPolicy: IfNotPresent
 
     relay:
       image:
         repository: "solarwinds/opentelemetry-ebpf-k8s-relay"
-        tag: "v0.10.2"
+        tag: "v0.10.3"
         pullPolicy: IfNotPresent
   reducer:
     disableMetrics: []
@@ -731,7 +731,7 @@ ebpfNetworkMonitoring:
 
     image:
       repository: "solarwinds/opentelemetry-ebpf-reducer"
-      tag: "v0.10.2"
+      tag: "v0.10.3"
       pullPolicy: IfNotPresent
 # DEPRECATED: Prometheus is deployed only in case opencost section is enabled. Otherwise this section can be ignored.
 # prometheus: