Commit 16f94172 authored by Craig Russell's avatar Craig Russell
Browse files

Updates for openstack

parent 3e1f68c9
BASEDIR = $(shell pwd) BASEDIR = $(shell pwd)
SOURCE:=$(shell source secrets.env)
deploy.prod: deploy.prod:
helmsman --apply --debug --group production -f helmsman/token.yaml -f helmsman.yaml -f helmsman/production.yaml helmsman --apply --debug --group production -f helmsman/token.yaml -f helmsman.yaml -f helmsman/production.yaml
deploy.staging: deploy.staging: helmsman --apply --debug --group staging -f helmsman/token.yaml -f helmsman.yaml -f helmsman/staging.yaml
helmsman --apply --debug --group staging -f helmsman/token.yaml -f helmsman.yaml -f helmsman/staging.yaml
binder.deploy.prod: binder.deploy.prod:
helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/production.yaml --always-upgrade helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/production.yaml --always-upgrade
...@@ -18,12 +19,33 @@ beta.binder.deploy.prod: ...@@ -18,12 +19,33 @@ beta.binder.deploy.prod:
beta.binder.deploy.staging: beta.binder.deploy.staging:
helmsman --apply --debug --target binderhub-production -f helmsman.yaml -f helmsman/gpu.yaml --always-upgrade 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: alpha.trow.deploy.prod:
helmsman --apply --debug --target trow -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade helmsman --apply --debug --target trow -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade
alpha.registry.deploy.prod: alpha.registry.deploy.prod:
helmsman --apply --debug --target docker-registry -f helmsman.yaml -f helmsman/production.yaml -f helmsman/openstack.yaml --always-upgrade 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 # Beta gpu enabled service
......
...@@ -39,6 +39,9 @@ cors: &cors ...@@ -39,6 +39,9 @@ cors: &cors
allowOrigin: '*' allowOrigin: '*'
jupyterhub: jupyterhub:
proxy:
service:
type: ClusterIP
cull: cull:
users: True users: True
custom: custom:
...@@ -130,10 +133,10 @@ dind: ...@@ -130,10 +133,10 @@ dind:
enabled: true enabled: true
resources: resources:
requests: requests:
cpu: "1" cpu: "2"
memory: 4Gi memory: 4Gi
limits: limits:
cpu: "2" cpu: "4"
memory: 6Gi memory: 6Gi
ingress: ingress:
...@@ -146,9 +149,10 @@ ingress: ...@@ -146,9 +149,10 @@ ingress:
kubernetes.io/tls-acme: "true" kubernetes.io/tls-acme: "true"
cert-manager.k8s.io/acme-challenge-type: http01 cert-manager.k8s.io/acme-challenge-type: http01
cert-manager.io/cluster-issuer: letsencrypt-production cert-manager.io/cluster-issuer: letsencrypt-production
https: certmanager.k8s.io/acme-http01-edit-in-place: "true"
enabled: true # https:
type: nginx # enabled: true
# type: nginx
tls: tls:
- secretName: binder-bioimagearchive-org-cert - secretName: binder-bioimagearchive-org-cert
hosts: hosts:
......
...@@ -31,4 +31,8 @@ ingress: ...@@ -31,4 +31,8 @@ ingress:
tls: tls:
- secretName: binder-bioimagearchive-org-cert - secretName: binder-bioimagearchive-org-cert
hosts: hosts:
- binder.bioimagearchive.org - "binder.bioimagearchive.org"
\ No newline at end of file dind:
# enabled: true
hostLibDir: /var/lib/dind/production
hostSocketDir: /var/run/dind/production
\ No newline at end of file
...@@ -31,7 +31,7 @@ jupyterhub: ...@@ -31,7 +31,7 @@ jupyterhub:
scope: scope:
- read:user - read:user
JupyterHub: JupyterHub:
authenticator_class: github authenticator_class: dummy
# DummyAuthenticator: # DummyAuthenticator:
# password: test # password: test
# oauth_callback_url: "https://beta.binder.bioimagearchive.org/jupyter/hub/oauth_callback" # oauth_callback_url: "https://beta.binder.bioimagearchive.org/jupyter/hub/oauth_callback"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
jupyterhub: jupyterhub:
custom:
hub: hub:
baseUrl: /jhub baseUrl: /jhub
proxy: proxy:
...@@ -46,7 +47,7 @@ jupyterhub: ...@@ -46,7 +47,7 @@ jupyterhub:
# - binder.bioimagearchive.org # - binder.bioimagearchive.org
config: config:
BinderHub: BinderHub:
hub_url: "https://binder.bioimagearchive.org/jhub" auth_enabled: false
banner_message: | banner_message: |
<div style="text-align: center;">Alpha service with more RAM and CPU and GPU Support </div> <div style="text-align: center;">Alpha service with more RAM and CPU and GPU Support </div>
# image_prefix: docker-registry.docker-registry:5000/binder- # image_prefix: docker-registry.docker-registry:5000/binder-
...@@ -57,7 +58,7 @@ ingress: ...@@ -57,7 +58,7 @@ ingress:
hosts: hosts:
- "binder.bioimagearchive.org" - "binder.bioimagearchive.org"
tls: tls:
- secretName: binder-bioimagearchive-org-cert-new - secretName: binder-bioimagearchive-org
hosts: hosts:
- binder.bioimagearchive.org - binder.bioimagearchive.org
annotations: annotations:
...@@ -70,7 +71,7 @@ ingress: ...@@ -70,7 +71,7 @@ ingress:
# # hosts: # # hosts:
# # - binder.bioimagearchive.org # # - binder.bioimagearchive.org
# annotations: # annotations:
# acme.cert-manager.io/http01-edit-in-place: "true" acme.cert-manager.io/http01-edit-in-place: "true"
dind: dind:
enabled: true enabled: true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment