diff --git a/README.md b/README.md index 1d6dea9cde938a0d5edba3ec733000e4f265bbc5..7562edf903a6ee644f7b531dfd9d8cebc424aaf2 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,7 @@ tolerations configuration ### Airflow database parameters | Parameter | Description | Default | -| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------- | +|----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------| | `externalDatabase.database` | External PostgreSQL database name | `nil` | | `externalDatabase.existingSecret` | Name of an existing secret resource containing the PostgreSQL password | `nil` | | `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the PostgreSQL password | `nil` | @@ -261,9 +261,9 @@ tolerations configuration | `postgresql.postgresqlDatabase` | Airflow Postgresql database | `bitnami_airflow` | | `postgresql.postgresqlPassword` | Airflow Postgresql password | `nil` | | `postgresql.postgresqlUsername` | Airflow Postgresql username | `bn_airflow` | -| `redis.cluster.enabled` | Switch to enable a clustered redis | `false` | +| `redis.architecture` | RedisTM architecture. Allowed values: `standalone` or `replication` | `standalone` | | `redis.enabled` | Switch to enable or disable the RedisTM helm chart | `true` | -| `redis.existingSecret` | Name of an existing secret containing the RedisTM password ('redis-password' key) . This secret is used in case of redis.enabled=true and we would like to specify password for newly created redis instance | `nil` | +| `redis.auth.existingSecret` | Name of an existing secret containing the RedisTM password ('redis-password' key) . This secret is used in case of redis.enabled=true and we would like to specify password for newly created redis instance | `nil` | ### Airflow exposing parameters @@ -533,7 +533,11 @@ Find more information about how to deal with common errors related to Bitnami’ ## Notable changes -### 7.0.0 +### To 10.0.0 + +This major updates the RedisTM subchart to it newest major, 14.0.0, which contains breaking changes. For more information on this subchart's major and the steps needed to migrate your data from your previous release, please refer to [RedisTM upgrade notes.](https://github.com/bitnami/charts/tree/master/bitnami/redis#to-1400). + +### To 7.0.0 [On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. @@ -629,14 +633,14 @@ $ kubectl delete pod airflow-postgresql-0 - https://helm.sh/docs/topics/v2_v3_migration/ - https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ -### 6.5.0 +### To 6.5.0 This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/master/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade. -### 6.0.0 +### To 6.0.0 This release adds support for LDAP authentication. -### 1.0.0 +### To 1.0.0 This release updates the PostgreSQL chart dependency to use PostgreSQL 11.x. You need to migrate the existing PostgreSQL data to this version before upgrading to this release. For more information follow [this link](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#500). diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 19aaeca4a9d930fc36b65c4770a40eb7e247eed2..df54c8a84175fbcaf2cfbe2c4bcf1b57789f9c3b 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: WorkFlow apiVersion: v2 -appVersion: 2.0.1 +appVersion: 2.0.2 dependencies: - name: common repository: https://charts.bitnami.com/bitnami @@ -15,7 +15,7 @@ dependencies: - condition: redis.enabled name: redis repository: https://charts.bitnami.com/bitnami - version: 12.x.x + version: 14.x.x description: Apache Airflow is a platform to programmatically author, schedule and monitor workflows. engine: gotpl home: https://github.com/bitnami/charts/tree/master/bitnami/airflow @@ -32,4 +32,4 @@ name: airflow sources: - https://github.com/bitnami/bitnami-docker-airflow - https://airflow.apache.org/ -version: 9.0.4 +version: 10.0.4 diff --git a/chart/charts/redis-12.10.1.tgz b/chart/charts/redis-12.10.1.tgz deleted file mode 100644 index d0a60c7e93c613a67a7e81aaa1b15a0923591b77..0000000000000000000000000000000000000000 Binary files a/chart/charts/redis-12.10.1.tgz and /dev/null differ diff --git a/chart/charts/redis-14.1.1.tar.gz b/chart/charts/redis-14.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..627ff5d666c38ff6091fb778d84cb3d4f89222b5 Binary files /dev/null and b/chart/charts/redis-14.1.1.tar.gz differ diff --git a/chart/requirements.yaml b/chart/requirements.yaml index 7154bcadf25082f904f41056cea4637936382670..5533d068783364e54f77cd5667838f59f995df6a 100644 --- a/chart/requirements.yaml +++ b/chart/requirements.yaml @@ -10,5 +10,5 @@ dependencies: condition: postgresql.enabled - name: redis repository: https://charts.bitnami.com/bitnami - version: 12.10.1 + version: 14.1.1 condition: redis.enabled \ No newline at end of file diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 713d8771795c2c80ef6f874511e7a3ebc928f877..204bb83fac2bebe94fe6b5d8152b1c44371e823e 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -48,13 +48,13 @@ host. To configure Airflow with the URL of your service: 2. Complete your Airflow deployment by running: - helm upgrade {{ .Release.Name }} bitnami/{{ .Chart.Name }} \ + helm upgrade --namespace {{ .Release.Namespace }} {{ .Release.Name }} bitnami/{{ .Chart.Name }} \ --set service.type={{ .Values.service.type }} \ --set web.baseUrl=http://$AIRFLOW_HOST:$AIRFLOW_PORT \ --set auth.password=$AIRFLOW_PASSWORD \ --set auth.fernetKey=$AIRFLOW_FERNETKEY \ --set postgresql.postgresqlPassword=$POSTGRESQL_PASSWORD \ - --set redis.password=$REDIS_PASSWORD + --set redis.auth.password=$REDIS_PASSWORD {{- else -}} diff --git a/chart/templates/_git_helpers.tpl b/chart/templates/_git_helpers.tpl index 2f655163db049256100b1751ef20aefe5bebef4a..dc233f14fcf648dc0f9dd5a87d0523d55b399880 100644 --- a/chart/templates/_git_helpers.tpl +++ b/chart/templates/_git_helpers.tpl @@ -42,7 +42,7 @@ Returns the volume mounts that will be used by the main container {{- if .Values.git.plugins.enabled }} {{- range .Values.git.plugins.repositories }} - name: git-cloned-plugins-files-{{ include "airflow.git.repository.name" . }} - mountPath: /opt/bitnami/airflow/git_{{ include "airflow.git.repository.name" . }} + mountPath: /opt/bitnami/airflow/plugins/git_{{ include "airflow.git.repository.name" . }} {{- if .path }} subPath: {{ .path }} {{- end }} diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 5032db7d6f7b73d8076ebd000e9e928388a0f447..793af7a6bf84836a5c33d9e518c7db7f9e5d352b 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -123,14 +123,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Get the Redis(TM) credentials secret. */}} {{- define "airflow.redis.secretName" -}} -{{- if and (.Values.redis.enabled) (not .Values.redis.existingSecret) -}} +{{- if and (.Values.redis.enabled) (not .Values.redis.auth.existingSecret) -}} {{/* Create a include for the redis secret We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- $name := default "redis" .Values.redis.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- else if and (.Values.redis.enabled) ( .Values.redis.existingSecret) -}} - {{- printf "%s" .Values.redis.existingSecret -}} +{{- else if and (.Values.redis.enabled) ( .Values.redis.auth.existingSecret) -}} + {{- printf "%s" .Values.redis.auth.existingSecret -}} {{- else }} {{- if .Values.externalRedis.existingSecret -}} {{- printf "%s" .Values.externalRedis.existingSecret -}} diff --git a/chart/templates/config/configmap.yaml b/chart/templates/config/configmap.yaml index 94b4024a8268469829a576d31e9f96e12df4a1ec..e3360a8972b169610e2b1cfc75a9afe3f935ea75 100644 --- a/chart/templates/config/configmap.yaml +++ b/chart/templates/config/configmap.yaml @@ -100,6 +100,9 @@ data: imagePullPolicy: {{ .Values.worker.image.pullPolicy }} {{- if .Values.containerSecurityContext.enabled }} securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.worker.resources }} + resources: {{- toYaml .Values.worker.resources | nindent 12 }} {{- end }} env: - name: AIRFLOW__CORE__EXECUTOR diff --git a/chart/templates/metrics/deployment.yaml b/chart/templates/metrics/deployment.yaml index bd2e8413d23f53990c028a92944d4e678c2382f5..e808c605ae659f28941f36b649c955d03bb01cca 100644 --- a/chart/templates/metrics/deployment.yaml +++ b/chart/templates/metrics/deployment.yaml @@ -39,6 +39,11 @@ spec: nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.nodeSelector "context" $) | nindent 8 }} {{- end }} {{- end }} + {{- if .Values.metrics.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.tolerations "context" $) | nindent 8 }} + {{- else if .Values.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }} + {{- end }} containers: - image: {{ include "airflow.metrics.image" . | quote }} name: airflow-exporter diff --git a/chart/values.yaml b/chart/values.yaml index c44be983c44086d0246e0fa2f3da792b1c9c8bce..0f562b4680a0c0c071ef4b96884c203054ee8ffa 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -65,7 +65,7 @@ web: image: registry: docker.io repository: bitnami/airflow - tag: 2.0.1-debian-10-r51 + tag: 2.0.2-debian-10-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -210,7 +210,7 @@ scheduler: image: registry: docker.io repository: bitnami/airflow-scheduler - tag: 2.0.1-debian-10-r53 + tag: 2.0.2-debian-10-r7 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -327,7 +327,7 @@ worker: image: registry: docker.io repository: bitnami/airflow-worker - tag: 2.0.1-debian-10-r52 + tag: 2.0.2-debian-10-r7 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -552,7 +552,7 @@ git: image: registry: docker.io repository: bitnami/git - tag: 2.31.1-debian-10-r10 + tag: 2.31.1-debian-10-r30 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -908,14 +908,25 @@ externalDatabase: ## redis: enabled: true - ## Cluster settings + ## Use password authentication ## - cluster: - enabled: false - ## In case of redis.enabled = true, allow the usage of existing secrets for redis + auth: + enabled: true + ## Redis(TM) password (both master and slave) + ## Defaults to a random 10-character alphanumeric string if not set and auth.enabled is true. + ## It should always be set using the password value or in the existingSecret to avoid issues + ## with Airflow. + ## The password value is ignored if existingSecret is set + # password: + ## + ## Name of existing secret object containing the password + ## + existingSecret: + ## - existingSecret: - # password: "" + ## Cluster settings + ## + architecture: standalone externalRedis: ## All of these values are only used when redis.enabled is set to false @@ -945,7 +956,7 @@ metrics: image: registry: docker.io repository: bitnami/airflow-exporter - tag: 0.20210126.0-debian-10-r67 + tag: 0.20210126.0-debian-10-r87 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -985,6 +996,7 @@ metrics: ## extraDeploy: [] + ################################### # Airflow - Logs Configs ###################################