fix: place volumes: inside the if condition

airbytehq · Dec 19, 2024 · 9e061ed · 9e061ed
1 parent 7f580c8
commit 9e061ed
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 10 deletions.
diff --git a/charts/airbyte-connector-builder-server/templates/deployment.yaml b/charts/airbyte-connector-builder-server/templates/deployment.yaml
@@ -173,7 +173,7 @@ spec:
         {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      volumes:
       {{- if .Values.extraVolumes }}
+      volumes:
 {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/airbyte-connector-rollout-worker/templates/deployment.yaml b/charts/airbyte-connector-rollout-worker/templates/deployment.yaml
@@ -209,8 +209,8 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      volumes:
       {{- if .Values.extraVolumes }}
+      volumes:
   {{ toYaml .Values.extraVolumes | nindent 6 }}
   {{- end }}
 {{- end }}
diff --git a/charts/airbyte-keycloak/templates/statefulset.yaml b/charts/airbyte-keycloak/templates/statefulset.yaml
@@ -178,8 +178,8 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 8 }}
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 10 }}
-      volumes:
       {{- if .Values.extraVolumes }}
+      volumes:
       {{ toYaml .Values.extraVolumes | nindent 8 }}
       {{- end }}
   volumeClaimTemplates:

diff --git a/charts/airbyte-metrics/templates/deployment.yaml b/charts/airbyte-metrics/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      volumes:
       {{- if .Values.extraVolumes }}
+      volumes:
       {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/airbyte-temporal-ui/templates/deployment.yaml b/charts/airbyte-temporal-ui/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
         {{ toYaml .Values.global.extraContainers | nindent 6 }}
         {{- end }}
         securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
-        volumes:
         {{- if .Values.extraVolumes }}
+        volumes:
     {{ toYaml .Values.extraVolumes | nindent 6 }}
         {{- end }}
diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -163,10 +163,12 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- if or .Values.extraVolumes .Values.global.extraVolumes }}
       volumes:
       {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
       {{- if .Values.global.extraVolumes }}
 {{ toYaml .Values.global.extraVolumes | nindent 6 }}
+        {{- end }}
       {{- end }}
diff --git a/charts/v2/airbyte/templates/airbyte-connector-builder-server/deployment.yaml b/charts/v2/airbyte/templates/airbyte-connector-builder-server/deployment.yaml
@@ -144,7 +144,7 @@ spec:
         {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.connectorBuilderServer.podSecurityContext | nindent 8 }}
-      volumes:
       {{- if .Values.connectorBuilderServer.extraVolumes }}
+      volumes:
 {{ toYaml .Values.connectorBuilderServer.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/v2/airbyte/templates/airbyte-connector-rollout-worker/deployment.yaml b/charts/v2/airbyte/templates/airbyte-connector-rollout-worker/deployment.yaml
@@ -147,8 +147,8 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.connectorRolloutWorker.podSecurityContext | nindent 6 }}
-      volumes:
       {{- if .Values.connectorRolloutWorker.extraVolumes }}
+      volumes:
   {{ toYaml .Values.connectorRolloutWorker.extraVolumes | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/charts/v2/airbyte/templates/airbyte-keycloak/statefulset.yaml b/charts/v2/airbyte/templates/airbyte-keycloak/statefulset.yaml
@@ -158,8 +158,8 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 8 }}
       {{- end }}
       securityContext: {{- toYaml .Values.keycloak.podSecurityContext | nindent 10 }}
-      volumes:
       {{- if .Values.keycloak.extraVolumes }}
+      volumes:
       {{ toYaml .Values.keycloak.extraVolumes | nindent 8 }}
       {{- end }}
   volumeClaimTemplates:

diff --git a/charts/v2/airbyte/templates/airbyte-metrics/deployment.yaml b/charts/v2/airbyte/templates/airbyte-metrics/deployment.yaml
@@ -98,7 +98,7 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.metrics.podSecurityContext | nindent 8 }}
-      volumes:
       {{- if .Values.metrics.extraVolumes }}
+      volumes:
       {{ toYaml .Values.metrics.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/v2/airbyte/templates/airbyte-temporal-ui/deployment.yaml b/charts/v2/airbyte/templates/airbyte-temporal-ui/deployment.yaml
@@ -119,8 +119,8 @@ spec:
         {{ toYaml .Values.global.extraContainers | nindent 8 }}
         {{- end }}
         securityContext: {{- toYaml .Values.temporalUi.podSecurityContext | nindent 8 }}
-        volumes:
         {{- if .Values.temporalUi.extraVolumes }}
+        volumes:
     {{ toYaml .Values.temporalUi.extraVolumes | nindent 8 }}
         {{- end }}
 {{- end }}
diff --git a/charts/v2/airbyte/templates/airbyte-webapp/deployment.yaml b/charts/v2/airbyte/templates/airbyte-webapp/deployment.yaml
@@ -132,10 +132,12 @@ spec:
       {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       securityContext: {{- toYaml .Values.webapp.podSecurityContext | nindent 8 }}
+{{- if or .Values.webapp.extraVolumes .Values.global.extraVolumes }}
       volumes:
       {{- if .Values.webapp.extraVolumes }}
 {{ toYaml .Values.webapp.extraVolumes | nindent 6 }}
       {{- end }}
       {{- if .Values.global.extraVolumes }}
 {{ toYaml .Values.global.extraVolumes | nindent 6 }}
       {{- end }}
+{{- end }}