Merge branch 'sidt-1171' into 'master'

Update chart version to 10.0.4 to support application version 2.0.2

See merge request !25

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`                         | Redis<sup>TM</sup> architecture. Allowed values: `standalone` or `replication`                                                                                                                                                 | `standalone`      |
 | `redis.enabled`                              | Switch to enable or disable the Redis<sup>TM</sup> helm chart                                                                                                                                                                  | `true`            |
-| `redis.existingSecret`                       | Name of an existing secret containing the Redis<sup>TM</sup> 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 Redis<sup>TM</sup> 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 Redis<sup>TM</sup> 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 [Redis<sup>TM</sup> 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).

chart/Chart.yaml

 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

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

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 -}}
 

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 }}

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 -}}

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

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

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
 ###################################