Merge pull request #489 from solarwinds/feature/NH-42143-fix

NH-42143: Removing sha256 from image pulls as it does not allow multi arch images
solarwinds · Dec 1, 2023 · 88c106e · 88c106e
2 parents e17b1dd + b273a6e
commit 88c106e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/deploy/helm/CHANGELOG.md b/deploy/helm/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [3.2.0-alpha.4] - 2023-11-30
+
+### Fixed
+- Removing sha256 from image pulls as it does not allow multi arch images
+
 ## [3.1.1] - 2023-11-30
 
 ### Fixed

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 3.2.0-alpha.3
+version: 3.2.0-alpha.4
 appVersion: "0.8.12"
 description: SolarWinds Kubernetes Integration
 keywords:

diff --git a/deploy/helm/templates/network/k8s-collector-deployment.yaml b/deploy/helm/templates/network/k8s-collector-deployment.yaml
@@ -31,7 +31,7 @@ spec:
       {{- end }}
       initContainers:
         - name: wait-for-reducer
-          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43" }}"
+          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1" }}"
           imagePullPolicy: {{ .Values.otel.init_images.busy_box.pullPolicy }}
           command: ['sh', '-c', 'until nc -zv $EBPF_NET_INTAKE_HOST $EBPF_NET_INTAKE_PORT; do echo "Waiting for reducer endpoint..."; sleep 5; done;']
           env:

diff --git a/deploy/helm/templates/network/kernel-collector-daemonset.yaml b/deploy/helm/templates/network/kernel-collector-daemonset.yaml
@@ -54,7 +54,7 @@ spec:
       {{- end }}
       initContainers:
         - name: wait-for-reducer
-          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43" }}"
+          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1" }}"
           imagePullPolicy: {{ .Values.otel.init_images.busy_box.pullPolicy }}
           command: ['sh', '-c', 'until nc -zv $EBPF_NET_INTAKE_HOST $EBPF_NET_INTAKE_PORT; do echo "Waiting for reducer endpoint..."; sleep 5; done;']
           env:

diff --git a/deploy/helm/templates/network/reducer-deployment.yaml b/deploy/helm/templates/network/reducer-deployment.yaml
@@ -28,7 +28,7 @@ spec:
       {{- end }}
       initContainers:
         - name: wait-for-metrics-collector
-          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43" }}"
+          image: "{{ .Values.otel.init_images.busy_box.repository | default "busybox" }}:{{ .Values.otel.init_images.busy_box.tag | default "1.36.1" }}"
           imagePullPolicy: {{ .Values.otel.init_images.busy_box.pullPolicy }}
           command: ['sh', '-c', 'until nc -zv $METRICS_COLLECTOR_HOST $METRICS_COLLECTOR_PORT; do echo "Waiting for metrics collector endpoint..."; sleep 5; done;']
           env:

diff --git a/deploy/helm/tests/__snapshot__/k8s-collector-deployment_test.yaml.snap b/deploy/helm/tests/__snapshot__/k8s-collector-deployment_test.yaml.snap
@@ -37,7 +37,7 @@ K8s Collector spec should match snapshot when using default values:
             value: RELEASE-NAME-swo-k8s-collector-network-k8s-reducer
           - name: EBPF_NET_INTAKE_PORT
             value: "7000"
-        image: busybox:1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43
+        image: busybox:1.36.1
         imagePullPolicy: IfNotPresent
         name: wait-for-reducer
     nodeSelector:

diff --git a/deploy/helm/tests/__snapshot__/kernel-collector-daemonset_test.yaml.snap b/deploy/helm/tests/__snapshot__/kernel-collector-daemonset_test.yaml.snap
@@ -62,7 +62,7 @@ DaemonSet spec should match snapshot when ebpfNetworkMonitoring is enabled:
             value: RELEASE-NAME-swo-k8s-collector-network-k8s-reducer
           - name: EBPF_NET_INTAKE_PORT
             value: "7000"
-        image: busybox:1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43
+        image: busybox:1.36.1
         imagePullPolicy: IfNotPresent
         name: wait-for-reducer
     nodeSelector:

diff --git a/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap
@@ -24,7 +24,7 @@ Fargate logging ConfigMap spec should include additional filters when they are c
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.2.0-alpha.3"
+          Add sw.k8s.agent.manifest.version "3.2.0-alpha.4"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]
@@ -64,7 +64,7 @@ Fargate logging ConfigMap spec should match snapshot when Fargate logging is ena
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.2.0-alpha.3"
+          Add sw.k8s.agent.manifest.version "3.2.0-alpha.4"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]

diff --git a/deploy/helm/tests/__snapshot__/reducer-deployment_test.yaml.snap b/deploy/helm/tests/__snapshot__/reducer-deployment_test.yaml.snap
@@ -48,7 +48,7 @@ Reducer spec should match snapshot when using default values:
             value: RELEASE-NAME-swo-k8s-collector-metrics-collector
           - name: METRICS_COLLECTOR_PORT
             value: "4317"
-        image: busybox:1.36.1@sha256:5cd3db04b8be5773388576a83177aff4f40a03457a63855f4b9cbe30542b9a43
+        image: busybox:1.36.1
         imagePullPolicy: IfNotPresent
         name: wait-for-metrics-collector
     nodeSelector: