chore(otellogs): move adding imagePullSecrets to ServiceAccount

SumoLogic · Apr 14, 2023 · 0cb180b · 0cb180b
1 parent a0a8129
commit 0cb180b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 9 deletions.
diff --git a/.changelog/2984.fixed.txt b/.changelog/2984.fixed.txt
@@ -1 +1 @@
-fix(otellogs): configure imagePullSecrets for otellogs daemonset
+fix(otellogs): configure imagePullSecrets for otellogs
diff --git a/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml b/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml
@@ -67,10 +67,6 @@ spec:
       {{- else }}
       priorityClassName: {{ include "sumologic.metadata.name.priorityclass" $ctx | quote }}
       {{- end }}
-{{- if $.Values.sumologic.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml $.Values.sumologic.pullSecrets | indent 8 }}
-{{- end }}
       containers:
       - args:
         - --config=/etc/otelcol/config.yaml

diff --git a/deploy/helm/sumologic/templates/logs/collector/otelcol/serviceaccount.yaml b/deploy/helm/sumologic/templates/logs/collector/otelcol/serviceaccount.yaml
@@ -7,3 +7,7 @@ metadata:
     app: {{ template "sumologic.labels.app.logs.collector.serviceaccount" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 {{- end }}
+{{- if .Values.sumologic.pullSecrets }}
+imagePullSecrets:
+{{ toYaml .Values.sumologic.pullSecrets | indent 2 }}
+{{- end }}
diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.input.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.input.yaml
@@ -3,8 +3,6 @@ sumologic:
     collector:
       otelcol:
         enabled: true
-  pullSecrets:
-    - name: myRegistryKeySecretName
 
 fluent-bit:
   enabled: false

diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml
@@ -41,8 +41,6 @@ spec:
         runAsGroup: 0
         runAsUser: 0
       priorityClassName: "prio"
-      imagePullSecrets:
-        - name: myRegistryKeySecretName
       containers:
         - args:
             - --config=/etc/otelcol/config.yaml

diff --git a/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/basic.input.yaml b/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/basic.input.yaml
diff --git a/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/basic.output.yaml
@@ -0,0 +1,10 @@
+# Source: sumologic/templates/logs/collector/otelcol/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: RELEASE-NAME-sumologic-otelcol-logs-collector
+  labels:
+    app: RELEASE-NAME-sumologic-otelcol-logs-collector
+    chart: "sumologic-%CURRENT_CHART_VERSION%"
+    release: "RELEASE-NAME"
+    heritage: "Helm"
diff --git a/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/image_pull_secrets.input.yaml b/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/image_pull_secrets.input.yaml
@@ -0,0 +1,3 @@
+sumologic:
+  pullSecrets:
+    - name: myRegistryKeySecretName
diff --git a/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/image_pull_secrets.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_serviceaccount/image_pull_secrets.output.yaml
@@ -0,0 +1,12 @@
+# Source: sumologic/templates/logs/collector/otelcol/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: RELEASE-NAME-sumologic-otelcol-logs-collector
+  labels:
+    app: RELEASE-NAME-sumologic-otelcol-logs-collector
+    chart: "sumologic-%CURRENT_CHART_VERSION%"
+    release: "RELEASE-NAME"
+    heritage: "Helm"
+imagePullSecrets:
+  - name: myRegistryKeySecretName
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fix(otellogs): configure imagePullSecrets for otellogs daemonset
		fix(otellogs): configure imagePullSecrets for otellogs