fix: proplerly render extraContainers (airbytehq#16474)

* fix: proplerly render extraContainers Signed-off-by: Brad Clark <bdashrad@gmail.com> * fix: ignore charts path Signed-off-by: Brad Clark <bdashrad@gmail.com> * feat: add support for extraContainers and standardize to match other charts in repo Signed-off-by: Brad Clark <bdashrad@gmail.com> * fix: fix rendered chart indentation Signed-off-by: Brad Clark <bdashrad@gmail.com> Signed-off-by: Brad Clark <bdashrad@gmail.com>
jhammarstedt · Oct 31, 2022 · c6c2793 · c6c2793
1 parent 1479fb4
commit c6c2793
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 42 deletions.
diff --git a/charts/airbyte-bootloader/.gitignore b/charts/airbyte-bootloader/.gitignore
@@ -0,0 +1,2 @@
+# Charts are downloaded at install time with `helm dep build`.
+charts
diff --git a/charts/airbyte-bootloader/Chart.yaml b/charts/airbyte-bootloader/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: "0.45.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
@@ -90,18 +90,23 @@ spec:
         {{- toYaml .Values.extraEnv | nindent 8 }}
         {{- end }}
 
+      {{- if .Values.resources }}
       resources: {{- toYaml .Values.resources | nindent 8 }}
-{{- if .Values.extraVolumeMounts }}
+      {{- end }}
+      {{- if .Values.extraVolumeMounts }}
       volumeMounts:
-{{- toYaml .Values.extraVolumeMounts | nindent 8 }}
-{{- end }}
-{{- if .Values.extraContainers }}
-{{ toYaml .Values.extraContainers | indent 4 }}
-{{- end }}
-{{- if .Values.global.extraContainers }}
-{{ toYaml .Values.global.extraContainers | indent 4 }}
-{{- end }}
-{{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumeMounts | nindent 8 }}
+      {{- end }}
+      {{- if .Values.containerSecurityContext }}
+        securityContext: {{- toYaml .Values.containerSecurityContext | nindent 8 }}
+      {{- end }}
+    {{- if .Values.extraContainers }}
+    {{ toYaml .Values.extraContainers | nindent 4 }}
+    {{- end }}
+    {{- if .Values.global.extraContainers }}
+    {{ toYaml .Values.global.extraContainers | indent 4 }}
+    {{- end }}
+  {{- if .Values.extraVolumes }}
   volumes:
-{{- toYaml .Values.extraVolumes | nindent 2 }}
-{{- end }}
+    {{- toYaml .Values.extraVolumes | nindent 4 }}
+  {{- end }}
diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml
@@ -1,4 +1,3 @@
-
 ##  global.serviceAccountName Name of service account to be associated with service
 ##  deploymentMode Determines deployment mode of airbyte
 ##  secretName Overrides the secrate name with with credentials to S3 Bucket and logging
@@ -13,6 +12,8 @@ global:
   database:
     secretName: ""
     secretValue: ""
+    host: "example.com"
+    port: "5432"
   secrets: {}
   env_vars: {}
   extraContainers: []
@@ -30,6 +31,14 @@ image:
 ##
 podAnnotations: {}
 
+##  containerSecurityContext Security context for the container
+## Examples:
+## containerSecurityContext:
+##    runAsNonRoot: true
+##    runAsUser: 1000
+##    readOnlyRootFilesystem: true
+containerSecurityContext: {}
+
 ##  nodeSelector [object] Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
@@ -49,16 +58,15 @@ tolerations: []
 ##  bootloader.resources.limits [object] The resources limits for the airbyte bootloader image
 ##  bootloader.resources.requests [object] The requested resources for the airbyte bootloader image
 resources:
-  ## Example:
-  ## requests:
-  ##    memory: 256Mi
-  ##    cpu: 250m
-  requests: {}
   ## Example:
   ## limits:
   ##    cpu: 200m
   ##    memory: 1Gi
   limits: {}
+  ## requests:
+  ##    memory: 256Mi
+  ##    cpu: 250m
+  requests: {}
 
 ##  affinity [object] Affinity and anti-affinity for bootloader pod assignment.
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
@@ -100,14 +108,14 @@ affinity: {}
 ##         key: DATABASE_USER
 ##
 extraEnv: []
+
 ##  secrets [object] Supply additional secrets to container
 ## Example:
 ## secrets:
 ##   DATABASE_PASSWORD: strong-password
 ##   DATABASE_USER: my-db-user
 secrets: {}
 
-
 ##  extraContainer [array] Additional container for server pod(s)
 ## Example:
 # extraContainers:
@@ -161,6 +169,4 @@ extraVolumes: []
 #   DATABASE_URL: jdbc:postgresql://airbyte-db-svc:5432/airbyte
 #   DATABASE_PASSWORD: 12345
 #   DATABASE_USER: airbyte
-
-
-env_vars: {}
+env_vars: {}
diff --git a/charts/airbyte-metrics/Chart.yaml b/charts/airbyte-metrics/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: "0.45.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte-metrics/templates/deployment.yaml b/charts/airbyte-metrics/templates/deployment.yaml
@@ -107,24 +107,26 @@ spec:
         {{- if .Values.extraEnv }}
         {{- toYaml .Values.extraEnv | nindent 8 }}
         {{- end }}
-        
+
         {{- if .Values.resources }}
-        resources: {{- toYaml .Values.resources | nindent 10 }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
         {{- end }}
         {{- if .Values.containerSecurityContext }}
-        securityContext: {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
         {{- end }}
-        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
-  {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
+        volumeMounts:
+          {{ toYaml .Values.extraVolumeMounts | nindent 10 }}
         {{- end }}
       {{- if .Values.extraContainers }}
-      {{ toYaml .Values.extraContainers | indent 8 }}
+      {{ toYaml .Values.extraContainers | nindent 6 }}
       {{- end }}
       {{- if .Values.global.extraContainers }}
-      {{ toYaml .Values.global.extraContainers | indent 8 }}
+      {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       volumes:
       {{- if .Values.extraVolumes }}
-{{ toYaml .Values.extraVolumes | nindent 6 }}
+      {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/airbyte-server/.gitignore b/charts/airbyte-server/.gitignore
@@ -0,0 +1,2 @@
+# Charts are downloaded at install time with `helm dep build`.
+charts
diff --git a/charts/airbyte-server/Chart.yaml b/charts/airbyte-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: 0.45.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
@@ -203,7 +203,7 @@ spec:
         {{- if .Values.extraEnv }}
         {{- toYaml .Values.extraEnv | nindent 8 }}
         {{- end }}
-        
+
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
           httpGet:

diff --git a/charts/airbyte-temporal/.gitignore b/charts/airbyte-temporal/.gitignore
@@ -0,0 +1,2 @@
+# Charts are downloaded at install time with `helm dep build`.
+charts
diff --git a/charts/airbyte-temporal/Chart.yaml b/charts/airbyte-temporal/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: "0.45.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
@@ -134,7 +134,7 @@ spec:
         {{- if .Values.extraContainers }}
         {{ toYaml .Values.extraContainers | indent 6 }}
         {{- end }}
-        {{- if .Values.global.extraConrainers }}
+        {{- if .Values.global.extraContainers }}
         {{ toYaml .Values.global.extraContainers | indent 6 }}
         {{- end }}
       volumes:

diff --git a/charts/airbyte-webapp/.gitignore b/charts/airbyte-webapp/.gitignore
@@ -0,0 +1,2 @@
+# Charts are downloaded at install time with `helm dep build`.
+charts
diff --git a/charts/airbyte-webapp/Chart.yaml b/charts/airbyte-webapp/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: "0.45.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -125,10 +125,10 @@ spec:
   {{ toYaml .Values.global.extraVolumeMounts | nindent 8 }}
         {{- end }}
       {{- if .Values.extraContainers }}
-      {{ toYaml .Values.extraContainers | indent 8 }}
+      {{ toYaml .Values.extraContainers | nindent 6 }}
       {{- end }}
-      {{- if .Values.global.extraConrainers }}
-      {{ toYaml .Values.global.extraContainers | indent 8 }}
+      {{- if .Values.global.extraContainers }}
+      {{ toYaml .Values.global.extraContainers | nindent 6 }}
       {{- end }}
       volumes:
       {{- if .Values.extraVolumes }}

diff --git a/charts/airbyte-worker/.gitignore b/charts/airbyte-worker/.gitignore
@@ -0,0 +1,2 @@
+# Charts are downloaded at install time with `helm dep build`.
+charts
diff --git a/charts/airbyte-worker/Chart.yaml b/charts/airbyte-worker/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.39.36"
+version: "0.45.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.39.36
+version: 0.45.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
@@ -789,6 +789,8 @@ worker:
   ##
   extraVolumes: []
 
+  extraContainers: []
+
   hpa:
     enabled: false
   ## Container Orchestrator
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Charts are downloaded at install time with `helm dep build`.
		charts