solved merge conflicts

Author: zsinnema

applications/jupyterhub/Dockerfile

@@ -1,14 +1,18 @@
+ARG CLOUDHARNESS_BASE
+FROM $CLOUDHARNESS_BASE as base
+
 FROM jupyterhub/k8s-hub:0.9.0
 USER root
 
-# COPY deploy/resources/hub/* /etc/jupyterhub/
-# COPY src/jupyterhub/jupyterhub/handlers/* /usr/local/lib/python3.6/dist-packages/jupyterhub/handlers/
-# COPY ./src/kubespawner /usr/local/lib/python3.6/dist-packages/
+COPY --from=base /libraries/cloudharness-common /libraries/cloudharness-common
+COPY --from=base /libraries/client/cloudharness_cli /libraries/client/cloudharness_cli
+
+RUN pip install -e /libraries/cloudharness-common
+RUN pip install -e /libraries/client/cloudharness_cli
+
 COPY src src
 RUN pip install ./src/harness_jupyter
 RUN pip install ./src/chauthenticator
+
 RUN chmod 777 /usr/local/lib/python3.6/dist-packages/  -R
 USER jovyan
-
-
-# CMD ["jupyterhub", "--config", "/srv/jupyterhub_config.py"]

applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py

@@ -384,18 +384,27 @@ def camelCaseify(s):
     auth_config = c[auth_class_name]
     auth_config.update(get_config('auth.custom.config') or {})
 elif auth_type == 'keycloak':
+    from cloudharness.applications import get_configuration
+    from cloudharness.utils.config import CloudharnessConfig
     from oauthenticator.generic import GenericOAuthenticator
 
+    accounts_app = get_configuration('accounts')
+
+    accounts_url = accounts_app.get_public_address()
+    client_id = accounts_app.conf.webclient.id
+    client_secret = accounts_app.conf.webclient.secret
+    realm = CloudharnessConfig.get_namespace()
+
     c.JupyterHub.authenticator_class = GenericOAuthenticator
-    c.OAuthenticator.oauth_callback_url = "http://minianhub.mnp.local/hub/oauth_callback"
-    c.OAuthenticator.client_id = "web-client"
-    c.OAuthenticator.client_secret = "452952ae-922c-4766-b912-7b106271e34b"
+    c.Authenticator.auto_login = True
+    c.OAuthenticator.client_id = client_id
+    c.OAuthenticator.client_secret = client_secret
 
-    c.GenericOAuthenticator.login_service = "keycloak"
+    c.GenericOAuthenticator.login_service = "CH"
     c.GenericOAuthenticator.username_key = "email"
-    c.GenericOAuthenticator.authorize_url = "http://accounts.mnp.local/auth/realms/mnp/protocol/openid-connect/auth"
-    c.GenericOAuthenticator.token_url = "http://accounts.mnp.local/auth/realms/mnp/protocol/openid-connect/token"
-    c.GenericOAuthenticator.userdata_url = "http://accounts.mnp.local/auth/realms/mnp/protocol/openid-connect/userinfo"
+    c.GenericOAuthenticator.authorize_url = f"{accounts_url}/auth/realms/{realm}/protocol/openid-connect/auth"
+    c.GenericOAuthenticator.token_url = f"{accounts_url}/auth/realms/{realm}/protocol/openid-connect/token"
+    c.GenericOAuthenticator.userdata_url = f"{accounts_url}/auth/realms/{realm}/protocol/openid-connect/userinfo"
     c.GenericOAuthenticator.userdata_params = {'state': 'state'}
 else:
     raise ValueError("Unhandled auth type: %r" % auth_type)
@@ -532,4 +541,5 @@ def camelCaseify(s):
     exec(config_py)
 
 c.apps = get_config('apps')
-c.registry = get_config('registry')
+c.registry = get_config('registry')
+c.domain = get_config('root.domain')

applications/jupyterhub/deploy/resources/hub/z2jh.py

@@ -34,6 +34,7 @@ def _load_config():
         with open(path) as f:
             values = yaml.safe_load(f)
         cfg = _merge_dictionaries(cfg, values)
+        cfg['root'] = cfg
     return cfg
 
 
@@ -44,6 +45,7 @@ def _merge_dictionaries(a, b):
     """
     merged = a.copy()
     for key in b:
+
         if key in a:
             if isinstance(a[key], Mapping) and isinstance(b[key], Mapping):
                 merged[key] = _merge_dictionaries(a[key], b[key])

applications/jupyterhub/deploy/values.yaml

@@ -6,6 +6,9 @@ harness:
     name: proxy-public
   deployment:
     auto: false
+  dependencies:
+    build:
+    - cloudharness-base
 custom: {}
 hub:
   allowNamedServers: true
@@ -203,8 +206,8 @@ singleuser:
     type: dynamic
     capacity: 2Mi
     dynamic:
-      pvcNameTemplate: jupyter-{userid}
-      volumeNameTemplate: jupyter-{userid}
+      pvcNameTemplate: jupyter-{username}
+      volumeNameTemplate: jupyter-{username}
     homeMountPath: /home/workspace
     extraLabels: {}
   image:
@@ -223,7 +226,7 @@ singleuser:
   extraResource:
     limits: {}
     guarantees: {}
-  cmd: jupyterhub-singleuser
+  cmd: /usr/local/bin/start-singleuser.sh
   defaultUrl: null
 scheduling:
   userScheduler:
@@ -260,7 +263,7 @@ prePuller:
       name: jupyterhub/k8s-image-awaiter
       tag: 0.9-b51ffeb
   continuous:
-    enabled: false
+    enabled: true
   extraImages: {}
   pause:
     image:

applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py

@@ -1,6 +1,7 @@
+import imp
 import logging
 import sys
-import imp
+import urllib.parse
 
 from kubespawner.spawner import KubeSpawner
 handler = logging.StreamHandler(sys.stdout)
@@ -17,15 +18,46 @@ def spawner_pod_manifest(self: KubeSpawner):
 
     return KubeSpawner.get_pod_manifest_base(self)
 
+def affinity_spec(key, value):
+    return {
+
+        'labelSelector':
+            {
+                'matchExpressions': [
+                    {
+                        'key': str(key),
+                        'operator': 'In',
+                        'values': [str(value)]
+                    },
+                ]
+            },
+        'topologyKey': 'kubernetes.io/hostname'
+    }
+
+def set_user_volume_affinity(self: KubeSpawner):
+    # Add labels to use for affinity
+    labels = {
+        'user': urllib.parse.quote(self.user.name, safe='').replace('%', ''),
+    }
+
+    self.common_labels = labels
+    self.extra_labels = labels
+
+    for key, value in labels.items():
+        self.pod_affinity_required.append(affinity_spec(key, value))
+
 def change_pod_manifest(self: KubeSpawner):
 
     try:
-        subdomain = self.handler.request.host.split('.')[0]
+
+
+
+
+        subdomain = self.handler.request.host.split(str(self.config['domain']))[0][0:-1]
         app_config = self.config['apps']
         registry = self.config['registry']
         for app in app_config.values():
             if 'harness' in app:
-
                 harness = app['harness']
                 if 'jupyterhub' in harness and harness['jupyterhub']\
                         and 'subdomain' in harness and harness['subdomain'] == subdomain:
@@ -36,6 +68,16 @@ def change_pod_manifest(self: KubeSpawner):
                     if 'args' in harness['jupyterhub']:
                         self.args = harness['jupyterhub']['args']
 
+                    if harness['jupyterhub'].get('mountUserVolume', True):
+                        set_user_volume_affinity(self)
+                    else:
+                        self.volume_mounts = []
+                        self.volumes = []
+
+                    if 'spawnerExtraConfig' in harness['jupyterhub']:
+                        for k, v in harness['jupyterhub']['spawnerExtraConfig'].items():
+                            setattr(self, k, v)
+
                     # check if there is an applicationHook defined in the values.yaml
                     # if so then execute the applicationHook function with "self" as parameter
                     #

applications/notifications/deploy/values.yaml

@@ -0,0 +1,66 @@
+harness:
+  subdomain: notifications
+  secured: false
+  service:
+    auto: false
+  deployment:
+    name: notifications
+    auto: true
+    resources:
+      requests:
+        memory: 64Mi
+        cpu: 25m
+      limits:
+        memory: 256Mi
+        cpu: 100m
+  dependencies:
+    build:
+      - cloudharness-base
+  secrets:
+    email-user:
+    email-password:
+  events:  # events the notification service is listening to
+    cdc: # change data capture events, see https://devshawn.com/blog/apache-kafka-topic-naming-conventions/
+    # - app: notifications
+    #   types:
+    #   - name: TypeA
+    #     events:
+    #     - create
+    #   - name: TypeB
+    #     events:
+    #     - create
+
+notification:
+  channels:
+    admins:
+      adapter: email
+      backends:
+        - email
+      templateFolder: html
+      from: info@example.com
+      to:
+        - info@example.com
+    log:
+      adapter: email
+      backends: 
+        - console
+      templateFolder: text
+      from: info@example.com
+      to:
+        - info@example.com
+  operations:
+    create:
+      subject: New {{ message_type }} - {{ domain }}
+      template: model-instance-create
+      channels:
+        - admins
+    update:
+      subject: Update {{ message_type }} - {{ domain }}
+      template: model-instance-update
+      channels:
+        - admins
+    delete:
+      subject: Delete {{ message_type }} - {{ domain }}
+      template: model-instance-delete
+      channels:
+        - admins

applications/notifications/server/.dockerignore

@@ -0,0 +1,71 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints