Adding persistent binderhub deployment

helmsman.yaml

@@ -32,6 +32,8 @@ helmRepos:
   jupyterhub: "https://jupyterhub.github.io/helm-chart/"
   daskgateway: "https://dask.org/dask-gateway-helm-repo/"
   jetstack: "https://charts.jetstack.io"
+  persistent_binderhub: "https://gesiscss.github.io/persistent_binderhub"
+  nginx-stable: "https://helm.nginx.com/stable"
 
 appsTemplates:
   binderhub: &binderhub
@@ -42,14 +44,13 @@ appsTemplates:
     # version: "0.2.0-n467.hbc700d4"
     # version: "0.2.0-n519.hf5c1a19"
     # version: "0.2.0-n217.h35366ea"
-    version: "0.2.0-n523.h854be18"
     # version: "0.2.0-n217.h35366ea"
     # helmFlags:
     #   - "--debug"
     # # test: true
     # # protected: true
     wait: false # Lethal for binderhub
-    timeout: 1200
+    timeout: 180
     enabled: true
     set:
       registry.username: "$CI_REGISTRY_USER"
@@ -90,6 +91,24 @@ appsTemplates:
     # hooks:
       # preUpgrade: "persistentVolumes/biostudies.yaml"
 
+  persistent-binderhub: &persistent-binderhub
+    name: "persistent-binderhub"
+
+    chart: "persistent_binderhub/persistent_binderhub"
+    version: "0.2.0-n563"
+    wait: false # Lethal for binderhub
+    timeout: 1200
+    enabled: true
+    set:
+      binderhub.registry.username: "$CI_REGISTRY_USER"
+      binderhub.registry.password: "$CI_REGISTRY_PASSWORD"
+      binderhub.jupyterhub.hub.services.binder.apiToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
+      binderhub.jupyterhub.proxy.secretToken: "$SECRET_BINDERHUB_SERVICE"
+      binderhub.config.BinderHub.image_prefix: "$CI_REGISTRY_IMAGE"
+      # binderhub.config.BinderHub.image_prefix: "registry.alpha.binder.bioimagearchive.org/binder-"
+      
+      binderhub.config.GitHubRepoProvider.access_token: "$SECRET_GITHUBREPOPROVIDER"
+
 
   dask: &dask
     name: "daskgateway"
@@ -148,6 +167,17 @@ apps:
       - "binderhub/production/config.yaml"
       # - "binderhub/persistentVolumes.yaml"
 
+  persistent-binderhub-production:
+    <<: *persistent-binderhub
+    name: "persistent-binderhub-production"
+    namespace: "persistent-binderhub-production"
+    group: "production"
+    valuesFiles:
+      - "persistent-binderhub/config.yaml"
+      - "persistent-binderhub/production/config.yaml"
+      # - "binderhub/persistentVolumes.yaml"
+
+
   binderhub-production-gpu:
     <<: *binderhub
     enabled: false

helmsman/production.yaml

@@ -11,6 +11,10 @@ namespaces:
     protected: false
   binderhub-production:
     protected: false
+  persistent-binderhub-staging:
+    protected: false
+  persistent-binderhub-production:
+    protected: false
   daskgateway-staging:
     protected: false
   daskgateway-production:
@@ -21,3 +25,5 @@ namespaces:
     protected: false
   cert-manager:
     protected: false
+  ingress-nginx:
+    protected: false

helmsman/staging.yaml

@@ -11,6 +11,10 @@ namespaces:
     protected: false
   binderhub-production:
     protected: true
+  persistent-binderhub-staging:
+    protected: false
+  persistent-binderhub-production:
+    protected: true
   binderhub-staging-gpu:
     protected: true
   binderhub-production-gpu:
@@ -20,4 +24,6 @@ namespaces:
   daskgateway-production:
     protected: true
   cert-manager:
-    protected: true
\ No newline at end of file
+    protected: true
+  ingress-nginx:
+    protected: true

persistent-binderhub/config.yaml

+# binderhub:
+#   config:
+#     BinderHub:
+#       debug: true
+#       base_url: /
+#       hub_url: "persist.binder.bioimagearchive.org"
+#       image_prefix: ""
+#       use_registry: true
+#       build_image: jupyter/repo2docker:0.10.0
+#   jupyterhub:
+#     hub:
+#   #     config:
+#   #       # GitHubOAuthenticator:
+#   #       #   client_id:
+#   #       #   client_secret:
+#   #       #   oauth_callback_url: https://binder.bioimagearchive.org/hub/oauth_callback
+#   #       JupyterHub:
+#   #         authenticator_class: dummy
+#   #     services:
+#   #       binder:
+#   #         oauth_client_id: "binder-oauth-client-dev"
+#   #         url: "https://persist.binder.bioimagearchive.org"
+#   #         apiToken: "b32f6db83b52afec0099e1154fdc852d053b36f724e03d657f38baf46334a662"
+#   #         oauth_redirect_uri: "https://persist.binder.bioimagearchive.org/services/binder/oauth_callback"
+#     proxy:
+#       secretToken: "790fd9f44ea71a380294cb1d3b483cef1b3d4cb0fe9335132c56661e85b6ab69"
+#   registry:
+#     username:
+#     password:
+
+#   ingress:
+#     enabled: true
+#     hosts:
+#       - "persist.binder.bioimagearchive.org"
+#     annotations:
+#       kubernetes.io/ingress.class: nginx
+#       kubernetes.io/tls-acme: "true"
+#       # cert-manager.k8s.io/acme-challenge-type: http01
+#       # cert-manager.io/cluster-issuer: letsencrypt-production
+#       https:
+#         enabled: true
+#         type: nginx
+#     # tls:
+#     #   - secretName: persist-binder-bioimagearchive-org-cert
+#     #     hosts:
+#     #       - persist.binder.bioimagearchive.org
+
+
+
+binderhub:
+  config:
+    BinderHub:
+      debug: true
+      base_url: /
+      hub_url: "https://persist.binder.bioimagearchive.org/"
+      # use only local docker images
+      image_prefix: ""
+      use_registry: true
+      # build_image: jupyter/repo2docker:0.10.0
+  jupyterhub:
+    hub:
+      baseUrl: /jupyter
+      config:
+        GitHubOAuthenticator:
+          client_id:
+          client_secret:
+          oauth_callback_url: https://persist.binder.bioimagearchive.org/jupyter/hub/oauth_callback
+        JupyterHub:
+          authenticator_class: dummy
+      services:
+        binder:
+          # this is the default value
+          oauth_client_id: "binder-oauth-client-dev"
+          url: "http://binder"
+          apiToken: "b32f6db83b52afec0099e1154fdc852d053b36f724e03d657f38baf46334a662"
+          oauth_redirect_uri: "http://persist.binder.bioimagearchive.org/services/binder/oauth_callback"
+    ingress:
+      enabled: true
+      hosts:
+        - "persist.binder.bioimagearchive.org"
+      annotations:
+        kubernetes.io/ingress.class: nginx
+        kubernetes.io/tls-acme: "true"
+        # cert-manager.k8s.io/acme-challenge-type: http01
+        # cert-manager.io/cluster-issuer: letsencrypt-production
+        https:
+          enabled: true
+          type: nginx
+    proxy:
+      secretToken: "790fd9f44ea71a380294cb1d3b483cef1b3d4cb0fe9335132c56661e85b6ab69"
+  registry:
+    username:
+    password:
+
+
+    # tls:
+    #   - secretName: persist-binder-bioimagearchive-org-cert
+    #     hosts:
+    #       - persist.binder.bioimagearchive.org