update jupyterhub chart version, update drupal zabbix and openldap

Chart.yaml

@@ -1,8 +1,8 @@
 ---
 apiVersion: v2
 name: fadi
-version: 0.2.8
-appVersion: 0.2.8
+version: 0.2.9
+appVersion: 0.2.9
 description: FADI is a Cloud Native platform for Big Data based on mature open source tools. 
 keywords:
   - fadi
@@ -43,7 +43,7 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   condition: grafana.enabled
 - name: jupyterhub
-  version: ~0.9.0
+  version: ~0.11.1
   repository: https://jupyterhub.github.io/helm-chart/
   condition: jupyterhub.enabled
 - name: nifi
@@ -107,8 +107,8 @@ dependencies:
   repository: https://storage.googleapis.com/seldon-charts/
   condition: seldon-core-operator.enabled
 - name: drupal
-  version: ~10.0.5
-  repository: https://charts.bitnami.com/bitnami
+  version: ~0.1.0
+  repository: https://cetic.github.io/helm-charts/
   condition: drupal.enabled
 - name: airflow
   version: ~8.0.5

values.yaml

@@ -132,6 +132,7 @@ postgresql:
       #!/bin/sh
       psql -c "create role ldap_users;" postgres admin
       psql -c "create role ldap_groups;" postgres admin
+      psql -c "create database zabbix;" postgres admin
 
 minio:
   enabled: true
@@ -222,9 +223,6 @@ jupyterhub:
     storage:
       capacity: 5Gi
   # Defines the default image
-    image:
-      name: jupyter/minimal-notebook
-      tag: 7d427e7a4dde
     profileList:
       - display_name: "Minimal environment"
         description: "To avoid too much bells and whistles: Python."
@@ -242,16 +240,19 @@ jupyterhub:
         kubespawner_override:
           image: jupyter/tensorflow-notebook:latest
   # ---- auth ----
-  auth:
-    type: ldap
-    ldap:
-      server:
-        address: fadi-openldap
-      dn:
-        templates:
-          - 'cn={username},cn=admin,dc=ldap,dc=cetic,dc=be'
-          - 'uid={username},cn=admin,dc=ldap,dc=cetic,dc=be'
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: ldapauthenticator.LDAPAuthenticator
+      LDAPAuthenticator:
+        bind_dn_template:
           - 'cn={username},dc=ldap,dc=cetic,dc=be'
+          - 'cn={username},cn=admin,dc=ldap,dc=cetic,dc=be'
+        escape_userdn: false
+        lookup_dn: false
+        server_address: fadi-openldap
+        user_attribute: cn
+        use_ssl: false
   # ---- auth ----
   prePuller:
     hook:
@@ -296,12 +297,14 @@ openldap:
     LDAP_TLS: "true"
     LDAP_TLS_ENFORCE: "false"
     LDAP_REMOVE_CONFIG_AFTER_SETUP: "false"
+    LDAP_TLS_VERIFY_CLIENT: "try"
   adminPassword: password1
   configPassword: password2
   customLdifFiles:
     1-default-users.ldif: |-
       # You can find an example ldif file.
 
+
 phpldapadmin:
   enabled: true
   service:
@@ -406,7 +409,7 @@ zabbix:
     DB_SERVER_HOST: "fadi-postgresql"
     POSTGRES_USER: "admin"
     POSTGRES_PASSWORD: "password1"
-    POSTGRES_DB: "postgres"
+    POSTGRES_DB: "zabbix"
   zabbixagent:
     enabled: true
     ZBX_SERVER_HOST: 127.0.01
@@ -422,27 +425,17 @@ zabbix:
     DB_SERVER_PORT: 5432
     POSTGRES_USER: admin
     POSTGRES_PASSWORD: password1
-    POSTGRES_DB: postgres
+    POSTGRES_DB: zabbix
 
 
 drupal:
   enabled: false
-  drupalUsername: admin
-  drupalPassword: password1
-  mariadb:
-    enabled: true
-  externalDatabase:
-    host:
-    port:
-    user:
-    database:
-    password:
   ingress:
     enabled: false
     hostname:
 
 airflow:
-  enabled: true
+  enabled: false
   postgresql:
     enabled: false
   externalDatabase:
@@ -451,4 +444,3 @@ airflow:
     password: password1
     port: 5432
     user: admin
-