application hub update

EOEPCA · Feb 28, 2023 · fa5e365 · fa5e365
1 parent b2e9d63
commit fa5e365
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/system/clusters/creodias/processing-and-chaining/application-hub-sealed-secrets-create.sh b/system/clusters/creodias/processing-and-chaining/application-hub-sealed-secrets-create.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+JUPYTERHUB_CRYPT_KEY="****"
+OAUTH_CLIENT_ID="*****"
+OAUTH_CLIENT_SECRET="*****"
+
 ORIG_DIR="$(pwd)"
 cd "$(dirname "$0")"
 BIN_DIR="$(pwd)"

diff --git a/system/clusters/creodias/processing-and-chaining/proc-application-hub.yaml b/system/clusters/creodias/processing-and-chaining/proc-application-hub.yaml
@@ -1,13 +1,13 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: proc-application-hub
+  name: application-hub
   namespace: proc
 spec:
   chart:
     spec:
       chart: application-hub
-      version: 2.0.23
+      version: 2.0.26
       sourceRef:
         kind: HelmRepository
         name: eoepca
@@ -25,20 +25,21 @@ spec:
         - secretName: applicationhub-tls
           hosts:
           - applicationhub.develop.eoepca.org
-          
+
     jupyterhub:
+      ingress:
+        enabled: true
+      fullnameOverride: "application-hub"
       hub:
-
-
         existingSecret: application-hub-secrets
         extraEnv: 
             JUPYTERHUB_ENV: "dev"
             JUPYTERHUB_SINGLE_USER_IMAGE: "eoepca/pde-container:1.0.3"
-            OAUTH_CALLBACK_URL: "https://jupyterhub.develop.eoepca.org/hub/oauth_callback"
-            OAUTH2_USERDATA_URL: "https://auth.develop.eoepca.org/oxauth/restv1/userinfo"
-            OAUTH2_TOKEN_URL: "https://auth.develop.eoepca.org/oxauth/restv1/token"
-            OAUTH2_AUTHORIZE_URL: "https://auth.develop.eoepca.org/oxauth/restv1/authorize"
-            OAUTH_LOGOUT_REDIRECT_URL: "https://auth.develop.eoepca.org/oxauth/restv1/end_session?post_logout_redirect_uri=https://jupyterhub.develop.eoepca.org"
+            OAUTH_CALLBACK_URL: https://applicationhub.develop.eoepca.org/hub/oauth_callback
+            OAUTH2_USERDATA_URL: https://auth.develop.eoepca.org/oxauth/restv1/userinfo
+            OAUTH2_TOKEN_URL: https://auth.develop.eoepca.org/oxauth/restv1/token
+            OAUTH2_AUTHORIZE_URL: https://auth.develop.eoepca.org/oxauth/restv1/authorize
+            OAUTH_LOGOUT_REDIRECT_URL: "https://auth.develop.eoepca.org/oxauth/restv1/end_session?post_logout_redirect_uri=https://applicationhub.develop.eoepca.org"
             OAUTH2_USERNAME_KEY: "user_name"
             STORAGE_CLASS: "managed-nfs-storage"
             RESOURCE_MANAGER_WORKSPACE_PREFIX: "develop-user"
@@ -93,19 +94,4 @@ spec:
             cpu_limit": 4
             mem_limit": "8G"
 
-      ingress:
-        enabled: true
-        annotations: 
-          kubernetes.io/ingress.class: nginx
-        hosts:
-          - host: applicationhub.demo.eoepca.org
-            paths: 
-              - path: /
-                pathType: ImplementationSpecific
-        tls: []
-
-      proxy: 
-        service:
-          type: ClusterIP
-
   interval: 1m0s