fix!: Support init on ARM64 and update groundnuty/k8s-wait-for (#346)

* fix: added value for schema-migrator image * fix: updated groundnuty/k8s-wait-for to v2.0 which fixes deployment on ARM64 BREAKING CHANGE: groundnuty/k8s-wait-for v2.0 deprecates K8s ver less than v1.23 * fix: correctly use schemaMigrator values * fix: moved k8s-wait-for to init container * Revert "fix: moved k8s-wait-for to init container" This reverts commit 2af2c4d. * fix: moved k8s-wait-for to init container * fix: renamed k8s-wait-for to wait init container * fix: added tpl func for wait init container name * chore: bump helm chart ver to 0.30.6
SigNoz · Nov 29, 2023 · 281ba2e · 281ba2e
1 parent b713289
commit 281ba2e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/charts/signoz/Chart.yaml b/charts/signoz/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: signoz
-version: 0.30.5
+version: 0.30.6
 appVersion: "0.34.3"
 description: SigNoz Observability Platform Helm Chart
 type: application

diff --git a/charts/signoz/templates/_helpers.tpl b/charts/signoz/templates/_helpers.tpl
@@ -381,7 +381,21 @@ Return the initContainers image name
 {{- end -}}
 
 {{/*
-Return the schema migrator's initContainer image name
+Return the schema migrator's wait initContainer image name
+*/}}
+{{- define "schemaMigrator.initContainers.wait.image" -}}
+{{- $registryName := default .Values.schemaMigrator.initContainers.wait.image.registry .Values.global.imageRegistry -}}
+{{- $repositoryName := .Values.schemaMigrator.initContainers.wait.image.repository -}}
+{{- $tag := .Values.schemaMigrator.initContainers.wait.image.tag | toString -}}
+{{- if $registryName -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+    {{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the schema migrator's init initContainer image name
 */}}
 {{- define "schemaMigrator.initContainers.init.image" -}}
 {{- $registryName := default .Values.schemaMigrator.initContainers.init.image.registry .Values.global.imageRegistry -}}

diff --git a/charts/signoz/templates/otel-collector-metrics/deployment.yaml b/charts/signoz/templates/otel-collector-metrics/deployment.yaml
@@ -53,8 +53,8 @@ spec:
       initContainers:
         {{- if .Values.schemaMigrator.enabled }}
         - name: "{{ include "otelCollectorMetrics.fullname" . }}-migrate-init"
-          image: "groundnuty/k8s-wait-for:v1.5.1"
-          imagePullPolicy: {{ .Values.otelCollectorMetrics.image.pullPolicy }}
+          image: {{ include "schemaMigrator.initContainers.wait.image" . }}
+          imagePullPolicy: {{ .Values.schemaMigrator.initContainers.wait.image.pullPolicy }}
           args: 
           - "job"
           - "{{ include "schemaMigrator.fullname" . }}"

diff --git a/charts/signoz/templates/otel-collector/deployment.yaml b/charts/signoz/templates/otel-collector/deployment.yaml
@@ -60,8 +60,8 @@ spec:
       initContainers:
         {{- if .Values.schemaMigrator.enabled }}
         - name: "{{ include "otelCollector.fullname" . }}-migrate-init"
-          image: "groundnuty/k8s-wait-for:v1.5.1"
-          imagePullPolicy: {{ .Values.otelCollector.image.pullPolicy }}
+          image: {{ include "schemaMigrator.initContainers.wait.image" . }}
+          imagePullPolicy: {{ .Values.schemaMigrator.initContainers.wait.image.pullPolicy }}
           args: 
           - "job"
           - "{{ include "schemaMigrator.fullname" . }}"

diff --git a/charts/signoz/values.yaml b/charts/signoz/values.yaml
@@ -1123,7 +1123,14 @@ alertmanager:
 schemaMigrator:
   enabled: true
   name: "schema-migrator"
+
   initContainers:
+    wait:
+      image:
+        registry: docker.io
+        repository: groundnuty/k8s-wait-for
+        tag: v2.0
+        pullPolicy: IfNotPresent
     init:
       enabled: true
       image: