diff --git a/airbyte/Chart.yaml b/airbyte/Chart.yaml index 60dfd93..d4c7f3e 100644 --- a/airbyte/Chart.yaml +++ b/airbyte/Chart.yaml @@ -15,14 +15,14 @@ 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.3.17 +version: 0.3.18 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.39.28-alpha" +appVersion: "0.39.31-alpha" dependencies: - name: common diff --git a/airbyte/README.md b/airbyte/README.md index 1188cea..a97975e 100644 --- a/airbyte/README.md +++ b/airbyte/README.md @@ -20,6 +20,7 @@ Helm charts for Airbyte. | `serviceAccount.annotations` | Annotations for service account. Evaluated as a template. Only used if `create` is `true`. | `{}` | | `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | | `serviceAccount.name` | Name of the service account to use. If not set and create is true, a name is generated using the fullname template. | `airbyte-admin` | +| `imagePullSecrets` | Array of image pull secrets. | `[]` | | `version` | Sets the AIRBYTE_VERSION environment variable. Defaults to Chart.AppVersion. | `""` | @@ -30,7 +31,7 @@ Helm charts for Airbyte. | `webapp.replicaCount` | Number of webapp replicas | `1` | | `webapp.image.repository` | The repository to use for the airbyte webapp image. | `airbyte/webapp` | | `webapp.image.pullPolicy` | the pull policy to use for the airbyte webapp image | `IfNotPresent` | -| `webapp.image.tag` | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.39.28-alpha` | +| `webapp.image.tag` | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.39.31-alpha` | | `webapp.podAnnotations` | Add extra annotations to the webapp pod(s) | `{}` | | `webapp.containerSecurityContext` | Security context for the container | `{}` | | `webapp.livenessProbe.enabled` | Enable livenessProbe on the webapp | `true` | @@ -103,7 +104,7 @@ Helm charts for Airbyte. | `server.replicaCount` | Number of server replicas | `1` | | `server.image.repository` | The repository to use for the airbyte server image. | `airbyte/server` | | `server.image.pullPolicy` | the pull policy to use for the airbyte server image | `IfNotPresent` | -| `server.image.tag` | The airbyte server image tag. Defaults to the chart's AppVersion | `0.39.28-alpha` | +| `server.image.tag` | The airbyte server image tag. Defaults to the chart's AppVersion | `0.39.31-alpha` | | `server.podAnnotations` | Add extra annotations to the server pod | `{}` | | `server.containerSecurityContext` | Security context for the container | `{}` | | `server.livenessProbe.enabled` | Enable livenessProbe on the server | `true` | @@ -138,7 +139,7 @@ Helm charts for Airbyte. | `worker.replicaCount` | Number of worker replicas | `1` | | `worker.image.repository` | The repository to use for the airbyte worker image. | `airbyte/worker` | | `worker.image.pullPolicy` | the pull policy to use for the airbyte worker image | `IfNotPresent` | -| `worker.image.tag` | The airbyte worker image tag. Defaults to the chart's AppVersion | `0.39.28-alpha` | +| `worker.image.tag` | The airbyte worker image tag. Defaults to the chart's AppVersion | `0.39.31-alpha` | | `worker.podAnnotations` | Add extra annotations to the worker pod(s) | `{}` | | `worker.containerSecurityContext` | Security context for the container | `{}` | | `worker.livenessProbe.enabled` | Enable livenessProbe on the worker | `true` | @@ -170,7 +171,7 @@ Helm charts for Airbyte. | ------------------------------- | -------------------------------------------------------------------- | -------------------- | | `bootloader.image.repository` | The repository to use for the airbyte bootloader image. | `airbyte/bootloader` | | `bootloader.image.pullPolicy` | the pull policy to use for the airbyte bootloader image | `IfNotPresent` | -| `bootloader.image.tag` | The airbyte bootloader image tag. Defaults to the chart's AppVersion | `0.39.28-alpha` | +| `bootloader.image.tag` | The airbyte bootloader image tag. Defaults to the chart's AppVersion | `0.39.31-alpha` | | `bootloader.podAnnotations` | Add extra annotations to the bootloader pod | `{}` | | `bootloader.nodeSelector` | Node labels for pod assignment | `{}` | | `bootloader.tolerations` | Tolerations for worker pod assignment. | `[]` | @@ -216,23 +217,23 @@ Helm charts for Airbyte. ### Airbyte Database parameters -| Name | Description | Value | -| -------------------------------------------------- | ----------------------------------------------------------------------------------------- | ------------------------- | -| `postgresql.enabled` | Switch to enable or disable the PostgreSQL helm chart | `true` | -| `postgresql.postgresqlUsername` | Airbyte Postgresql username | `airbyte` | -| `postgresql.postgresqlPassword` | Airbyte Postgresql password | `airbyte` | -| `postgresql.postgresqlDatabase` | Airbyte Postgresql database | `db-airbyte` | -| `postgresql.existingSecret` | Name of an existing secret containing the PostgreSQL password ('postgresql-password' key) | `""` | -| `postgresql.containerSecurityContext.runAsNonRoot` | Ensures the container will run with a non-root user | `true` | +| Name | Description | Value | +| -------------------------------------------------- | ----------------------------------------------------------------------------------------- | ------------ | +| `postgresql.enabled` | Switch to enable or disable the PostgreSQL helm chart | `true` | +| `postgresql.postgresqlUsername` | Airbyte Postgresql username | `airbyte` | +| `postgresql.postgresqlPassword` | Airbyte Postgresql password | `airbyte` | +| `postgresql.postgresqlDatabase` | Airbyte Postgresql database | `db-airbyte` | +| `postgresql.existingSecret` | Name of an existing secret containing the PostgreSQL password ('postgresql-password' key) | `""` | +| `postgresql.containerSecurityContext.runAsNonRoot` | Ensures the container will run with a non-root user | `true` | | `postgresql.commonAnnotations.helm.sh/hook` | It will determine when the hook should be rendered | `pre-install,pre-upgrade` | -| `postgresql.commonAnnotations.helm.sh/hook-weight` | The order in which the hooks are executed. If weight is lower, it has higher priority | `-1` | -| `externalDatabase.host` | Database host | `localhost` | -| `externalDatabase.user` | non-root Username for Airbyte Database | `airbyte` | -| `externalDatabase.password` | Database password | `""` | -| `externalDatabase.existingSecret` | Name of an existing secret resource containing the DB password | `""` | -| `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the DB password | `""` | -| `externalDatabase.database` | Database name | `db-airbyte` | -| `externalDatabase.port` | Database port number | `5432` | +| `postgresql.commonAnnotations.helm.sh/hook-weight` | The order in which the hooks are executed. If weight is lower, it has higher priority | `-1` +| `externalDatabase.host` | Database host | `localhost` | +| `externalDatabase.user` | non-root Username for Airbyte Database | `airbyte` | +| `externalDatabase.password` | Database password | `""` | +| `externalDatabase.existingSecret` | Name of an existing secret resource containing the DB password | `""` | +| `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the DB password | `""` | +| `externalDatabase.database` | Database name | `db-airbyte` | +| `externalDatabase.port` | Database port number | `5432` | ### Logs parameters @@ -269,3 +270,5 @@ Helm charts for Airbyte. | `jobs.kube.nodeSelector` | key/value node selector applied to kube jobs | `{}` | | `jobs.kube.tolerations` | Tolerations for jobs.kube pod assignment. | `[]` | | `jobs.kube.main_container_image_pull_secret` | image pull secret to use for job pod | `""` | + + diff --git a/airbyte/templates/_helpers.tpl b/airbyte/templates/_helpers.tpl index 67deeac..febb508 100644 --- a/airbyte/templates/_helpers.tpl +++ b/airbyte/templates/_helpers.tpl @@ -50,6 +50,18 @@ app.kubernetes.io/name: {{ include "airbyte.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} +{{/* +Create the image pull secrets +*/}} +{{- define "common.imagePullSecrets" -}} +{{- if .Values.imagePullSecrets }} +{{- printf "imagePullSecrets:" }} + {{- range .Values.imagePullSecrets }} + {{- printf "- name: %s" . | nindent 2 }} + {{- end }} +{{- end }} +{{- end -}} + {{/* Create the name of the service account to use */}} diff --git a/airbyte/templates/bootloader/pod.yaml b/airbyte/templates/bootloader/pod.yaml index 4aef562..8f73e13 100644 --- a/airbyte/templates/bootloader/pod.yaml +++ b/airbyte/templates/bootloader/pod.yaml @@ -14,6 +14,9 @@ metadata: {{- end }} spec: serviceAccountName: {{ include "airbyte.serviceAccountName" . }} + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 2 }} + {{- end }} restartPolicy: Never {{- if .Values.bootloader.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.bootloader.nodeSelector "context" $) | nindent 8 }} diff --git a/airbyte/templates/pod-sweeper/deployment.yaml b/airbyte/templates/pod-sweeper/deployment.yaml index ac0edfa..1693584 100644 --- a/airbyte/templates/pod-sweeper/deployment.yaml +++ b/airbyte/templates/pod-sweeper/deployment.yaml @@ -22,6 +22,9 @@ spec: {{- end }} spec: serviceAccountName: {{ include "airbyte.serviceAccountName" . }} + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 6 }} + {{- end }} {{- if .Values.podSweeper.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.podSweeper.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/airbyte/templates/server/deployment.yaml b/airbyte/templates/server/deployment.yaml index e93e308..4a96ce1 100644 --- a/airbyte/templates/server/deployment.yaml +++ b/airbyte/templates/server/deployment.yaml @@ -22,6 +22,9 @@ spec: {{- end }} spec: serviceAccountName: {{ include "airbyte.serviceAccountName" . }} + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 6 }} + {{- end }} {{- if .Values.server.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.server.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/airbyte/templates/temporal/deployment.yaml b/airbyte/templates/temporal/deployment.yaml index 8ae24d5..c9683e3 100644 --- a/airbyte/templates/temporal/deployment.yaml +++ b/airbyte/templates/temporal/deployment.yaml @@ -20,6 +20,9 @@ spec: {{- end }} spec: serviceAccountName: {{ include "airbyte.serviceAccountName" . }} + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 6 }} + {{- end }} automountServiceAccountToken: true {{- if .Values.temporal.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.temporal.nodeSelector "context" $) | nindent 8 }} diff --git a/airbyte/templates/webapp/deployment.yaml b/airbyte/templates/webapp/deployment.yaml index f63ecbf..ff67aae 100644 --- a/airbyte/templates/webapp/deployment.yaml +++ b/airbyte/templates/webapp/deployment.yaml @@ -19,6 +19,9 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.webapp.podAnnotations "context" $) | nindent 8 }} {{- end }} spec: + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 6 }} + {{- end }} {{- if .Values.webapp.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.webapp.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/airbyte/templates/worker/deployment.yaml b/airbyte/templates/worker/deployment.yaml index f41d728..d3e04a5 100644 --- a/airbyte/templates/worker/deployment.yaml +++ b/airbyte/templates/worker/deployment.yaml @@ -19,6 +19,9 @@ spec: {{- end }} spec: serviceAccountName: {{ include "airbyte.serviceAccountName" . }} + {{- if .Values.imagePullSecrets }} + {{- include "common.imagePullSecrets" . | nindent 6 }} + {{- end }} automountServiceAccountToken: true {{- if .Values.worker.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.worker.nodeSelector "context" $) | nindent 8 }} diff --git a/airbyte/values.yaml b/airbyte/values.yaml index 21fda44..bd04a83 100644 --- a/airbyte/values.yaml +++ b/airbyte/values.yaml @@ -1,8 +1,8 @@ ## @section Global Parameters - -## @param global.imageRegistry Global Docker image registry ## global: + ## @param global.imageRegistry Global Docker image registry + ## imageRegistry: "" ## @section Common Parameters @@ -25,6 +25,13 @@ serviceAccount: annotations: {} name: airbyte-admin +## @param imagePullSecrets Array of image pull secrets. +## +## Example: +## imagePullSecrets: +## - docker-secret +imagePullSecrets: [] + ## @param version Sets the AIRBYTE_VERSION environment variable. Defaults to Chart.AppVersion. ## If changing the image tags below, you should probably also update this. version: "" @@ -43,7 +50,7 @@ webapp: image: repository: airbyte/webapp pullPolicy: IfNotPresent - tag: 0.39.28-alpha + tag: 0.39.31-alpha ## @param webapp.podAnnotations [object] Add extra annotations to the webapp pod(s) ## @@ -442,8 +449,7 @@ server: image: repository: airbyte/server pullPolicy: IfNotPresent - tag: 0.39.28-alpha - + tag: 0.39.31-alpha ## @param server.podAnnotations [object] Add extra annotations to the server pod ## @@ -570,7 +576,7 @@ worker: image: repository: airbyte/worker pullPolicy: IfNotPresent - tag: 0.39.28-alpha + tag: 0.39.31-alpha ## @param worker.podAnnotations [object] Add extra annotations to the worker pod(s) ## @@ -688,7 +694,7 @@ bootloader: image: repository: airbyte/bootloader pullPolicy: IfNotPresent - tag: 0.39.28-alpha + tag: 0.39.31-alpha ## @param bootloader.podAnnotations [object] Add extra annotations to the bootloader pod ##