Updates for openstack

Makefile

 BASEDIR = $(shell pwd)
+SOURCE:=$(shell source secrets.env)
+
 
 deploy.prod:
 	helmsman --apply --debug --group production -f helmsman/token.yaml -f helmsman.yaml -f helmsman/production.yaml
-deploy.staging:
-	helmsman --apply --debug --group staging -f helmsman/token.yaml -f helmsman.yaml -f helmsman/staging.yaml
+deploy.staging:	helmsman --apply --debug --group staging -f helmsman/token.yaml -f helmsman.yaml -f helmsman/staging.yaml
 
 binder.deploy.prod:
 	helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/production.yaml --always-upgrade
@@ -18,12 +19,33 @@ beta.binder.deploy.prod:
 beta.binder.deploy.staging:
 	helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/gpu.yaml --always-upgrade
 
+# Alpha openstack  service
+
+persistent.alpha.binder.deploy.prod:
+	helmsman --apply --debug --target persistent-binderhub-production -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
+persistent.alpha.binder.deploy.staging:
+	helmsman --apply --debug --target persistent-binderhub-production -f helmsman.yaml -f helmsman/openstack.yaml --always-upgrade
+# 
+
+alpha.binder.deploy.prod:
+	helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
+alpha.binder.deploy.staging:
+	helmsman --apply --debug --target binderhub-staging -f helmsman.yaml -f helmsman/staging.yaml -f helmsman/openstack.yaml --always-upgrade
+
+alpha.deploy.prod:
+	helmsman --apply --debug --group production -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
+
+alpha.cert.deploy.prod:
+	helmsman --apply --debug --target cert-manager-production -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
 
 alpha.trow.deploy.prod:
 	helmsman --apply --debug --target trow -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
 alpha.registry.deploy.prod:
 	helmsman --apply --debug --target docker-registry -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
 
+alpha.ingress.deploy.prod:
+	helmsman --apply --debug --target ingress-nginx -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
+
 # Beta gpu enabled service
 
 

binderhub/config.yaml

@@ -39,6 +39,9 @@ cors: &cors
   allowOrigin: '*'
 
 jupyterhub:
+  proxy:
+    service:
+      type: ClusterIP
   cull:
     users: True
   custom:
@@ -130,10 +133,10 @@ dind:
   enabled: true
   resources:
     requests:
-      cpu: "1"
+      cpu: "2"
       memory: 4Gi
     limits:
-      cpu: "2"
+      cpu: "4"
       memory: 6Gi
 
 ingress:
@@ -146,9 +149,10 @@ ingress:
     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
+    certmanager.k8s.io/acme-http01-edit-in-place: "true"
+    # https:
+    #   enabled: true
+    #   type: nginx
   tls:
     - secretName: binder-bioimagearchive-org-cert
       hosts:

binderhub/production/config.yaml

@@ -31,4 +31,8 @@ ingress:
   tls:
     - secretName: binder-bioimagearchive-org-cert
       hosts:
-        - binder.bioimagearchive.org
\ No newline at end of file
+        - "binder.bioimagearchive.org"
+dind:
+  # enabled: true
+  hostLibDir: /var/lib/dind/production
+  hostSocketDir: /var/run/dind/production
\ No newline at end of file

binderhub/production/config_beta.yaml

@@ -31,7 +31,7 @@ jupyterhub:
         scope:
           - read:user
       JupyterHub:
-        authenticator_class: github
+        authenticator_class: dummy
       # DummyAuthenticator:
       #   password: test
       #   oauth_callback_url: "https://beta.binder.bioimagearchive.org/jupyter/hub/oauth_callback"

binderhub/production/config_beta_openstack.yaml

@@ -9,6 +9,7 @@
 
 
 jupyterhub:
+  custom:
   hub:
     baseUrl: /jhub
   proxy:
@@ -46,7 +47,7 @@ jupyterhub:
     #     - binder.bioimagearchive.org
 config:
   BinderHub:
-    hub_url: "https://binder.bioimagearchive.org/jhub"
+    auth_enabled: false
     banner_message: |
       <div style="text-align: center;">Alpha service with more RAM and CPU and GPU Support </div>
     # image_prefix: docker-registry.docker-registry:5000/binder-
@@ -57,7 +58,7 @@ ingress:
   hosts:
     - "binder.bioimagearchive.org"
   tls:
-    - secretName: binder-bioimagearchive-org-cert-new
+    - secretName: binder-bioimagearchive-org
       hosts:
         - binder.bioimagearchive.org
   annotations:
@@ -70,7 +71,7 @@ ingress:
   # #   hosts:
   # #   - binder.bioimagearchive.org 
   # annotations:
-    # acme.cert-manager.io/http01-edit-in-place: "true"
+    acme.cert-manager.io/http01-edit-in-place: "true"
 dind:
   enabled: true