From 1c2a8512ebb65bdb44999a6f4a7889710b5ed97b Mon Sep 17 00:00:00 2001 From: Brad Clark Date: Tue, 13 Sep 2022 06:19:11 -0400 Subject: [PATCH] fix: proplerly render extraContainers (#16474) * fix: proplerly render extraContainers Signed-off-by: Brad Clark * fix: ignore charts path Signed-off-by: Brad Clark * feat: add support for extraContainers and standardize to match other charts in repo Signed-off-by: Brad Clark * fix: fix rendered chart indentation Signed-off-by: Brad Clark Signed-off-by: Brad Clark --- charts/airbyte-bootloader/.gitignore | 2 ++ charts/airbyte-bootloader/Chart.yaml | 2 +- charts/airbyte-bootloader/templates/pod.yaml | 29 +++++++++++-------- charts/airbyte-bootloader/values.yaml | 26 ++++++++++------- charts/airbyte-metrics/Chart.yaml | 2 +- .../airbyte-metrics/templates/deployment.yaml | 18 +++++++----- charts/airbyte-server/.gitignore | 2 ++ charts/airbyte-server/Chart.yaml | 2 +- .../airbyte-server/templates/deployment.yaml | 2 +- charts/airbyte-temporal/.gitignore | 2 ++ charts/airbyte-temporal/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- charts/airbyte-webapp/.gitignore | 2 ++ charts/airbyte-webapp/Chart.yaml | 2 +- .../airbyte-webapp/templates/deployment.yaml | 6 ++-- charts/airbyte-worker/.gitignore | 2 ++ charts/airbyte-worker/Chart.yaml | 2 +- charts/airbyte/Chart.yaml | 2 +- charts/airbyte/values.yaml | 2 ++ 19 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 charts/airbyte-bootloader/.gitignore create mode 100644 charts/airbyte-server/.gitignore create mode 100644 charts/airbyte-temporal/.gitignore create mode 100644 charts/airbyte-webapp/.gitignore create mode 100644 charts/airbyte-worker/.gitignore diff --git a/charts/airbyte-bootloader/.gitignore b/charts/airbyte-bootloader/.gitignore new file mode 100644 index 000000000000..88e91e8a8f34 --- /dev/null +++ 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 index b968ef3273b2..a22593376383 100644 --- 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 index 73dc8aca81c8..172e06547f6d 100644 --- 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 index 64c7bc2d6e12..bce6a55069b1 100644 --- 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,6 +108,7 @@ affinity: {} ## key: DATABASE_USER ## extraEnv: [] + ## secrets [object] Supply additional secrets to container ## Example: ## secrets: @@ -107,7 +116,6 @@ extraEnv: [] ## 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: {} \ No newline at end of file +env_vars: {} diff --git a/charts/airbyte-metrics/Chart.yaml b/charts/airbyte-metrics/Chart.yaml index 1acc08fea938..7db9650f4b0f 100644 --- 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 index dcde11f8ec9b..cddefed758b4 100644 --- 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 new file mode 100644 index 000000000000..88e91e8a8f34 --- /dev/null +++ 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 index 8a5b3e1b9c68..2c1659126039 100644 --- 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 index 6a1614898fc9..d786f19e9a8c 100644 --- 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 new file mode 100644 index 000000000000..88e91e8a8f34 --- /dev/null +++ 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 index 9bb3c2d5bb84..eeb5ef79bdec 100644 --- 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 index bfd075e4eece..b21cbd982d63 100644 --- 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 new file mode 100644 index 000000000000..88e91e8a8f34 --- /dev/null +++ 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 index 2b0b3e3c6aeb..30caf0cd4d7d 100644 --- 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 index 8edbf5ce3f9a..274202fb417f 100644 --- 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 new file mode 100644 index 000000000000..88e91e8a8f34 --- /dev/null +++ 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 index ca67e752df54..e942572e7789 100644 --- 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 index 722ca436ed79..94c63721e8f8 100644 --- 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 index 79123cd1caee..98cbec98c1d3 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -789,6 +789,8 @@ worker: ## extraVolumes: [] + extraContainers: [] + hpa: enabled: false ## Container Orchestrator