Unverified Commit e9fc4e78 authored by Jean-Marie Burel's avatar Jean-Marie Burel Committed by GitHub
Browse files

Merge pull request #21 from manics/upgrade

Re-enable test deployment overrides
parents 689bad08 c1da7f10
......@@ -47,15 +47,17 @@ Ensure it is disabled since this runner has administrative permissions to manage
## Configure secret variables for the deployment
Setup Secret variables referenced in [`.gitlab-ci.yml`](.gitlab-ci.yml):
Setup Secret variables referenced in [`.gitlab-ci.yml`](.gitlab-ci.yml).
These should be visible to `All environments`.
- `SECRET_JUPYTERHUB_PROXY_TOKEN`
- `SECRET_IDR_PASSWORD`
- `SECRET_GITHUB_CLIENTID` (production-vae only)
- `SECRET_GITHUB_CLIENTSECRET` (production-vae only)
- `SECRET_AAI_CLIENTID`: (production-vae-aai only)
- `SECRET_AAI_CLIENTSECRET`: (production-vae-aai only)
- `SECRET_GRAFANA_GITHUB_CLIENTID`: (production-monitoring only)
- `SECRET_GRAFANA_GITHUB_SECRET`: (production-monitoring only)
- `SECRET_GITHUB_CLIENTID`
- `SECRET_GITHUB_CLIENTSECRET`
- `SECRET_AAI_CLIENTID`
- `SECRET_AAI_CLIENTSECRET`
- `SECRET_GRAFANA_GITHUB_CLIENTID`
- `SECRET_GRAFANA_GITHUB_SECRET`
- `SECRET_PROMETHEUS_AUTH_HTPASSWD`
![GitLab secret variables](docs/gitlab-secret-variables.png)
......
docs/gitlab-secret-variables.png

264 KB | W: | H:

docs/gitlab-secret-variables.png

322 KB | W: | H:

docs/gitlab-secret-variables.png
docs/gitlab-secret-variables.png
docs/gitlab-secret-variables.png
docs/gitlab-secret-variables.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -31,6 +31,9 @@ releases:
application: staging
values:
- values/jupyterhub-config.yaml
{{ range .Environment.Values.jupyterhub_staging_overrides }}
- {{ . }}
{{ end }}
set:
- name: proxy.secretToken
value: {{ requiredEnv "SECRET_JUPYTERHUB_PROXY_TOKEN" }}
......@@ -52,6 +55,9 @@ releases:
values:
- values/jupyterhub-config.yaml
- values/jupyterhub-training.yaml
{{ range .Environment.Values.jupyterhub_training_overrides }}
- {{ . }}
{{ end }}
set:
- name: proxy.secretToken
value: {{ requiredEnv "SECRET_JUPYTERHUB_PROXY_TOKEN" }}
......@@ -71,6 +77,9 @@ releases:
values:
- values/jupyterhub-config.yaml
- values/jupyterhub-itr-public.yaml
{{ range .Environment.Values.jupyterhub_itr_overrides }}
- {{ . }}
{{ end }}
set:
- name: proxy.secretToken
value: {{ requiredEnv "SECRET_JUPYTERHUB_PROXY_TOKEN" }}
......@@ -92,6 +101,9 @@ releases:
values:
- values/jupyterhub-config.yaml
- values/jupyterhub-public.yaml
{{ range .Environment.Values.jupyterhub_public_overrides }}
- {{ . }}
{{ end }}
set:
- name: proxy.secretToken
value: {{ requiredEnv "SECRET_JUPYTERHUB_PROXY_TOKEN" }}
......@@ -109,6 +121,9 @@ releases:
values:
- values/jupyterhub-config.yaml
- values/jupyterhub-vae.yaml
{{ range .Environment.Values.jupyterhub_vae_overrides }}
- {{ . }}
{{ end }}
set:
- name: proxy.secretToken
value: {{ requiredEnv "SECRET_JUPYTERHUB_PROXY_TOKEN" }}
......@@ -126,6 +141,9 @@ releases:
deployment: production
application: vae
values:
{{ range .Environment.Values.jupyterhub_vae_shared_storage_overrides }}
- {{ . }}
{{ end }}
- name: jupyterhub-vae-aai
chart: jupyterhub/jupyterhub
......@@ -160,6 +178,9 @@ releases:
deployment: production
application: website
values:
{{ range .Environment.Values.idr_analysis_website_overrides }}
- {{ . }}
{{ end }}
######################################################################
......@@ -187,6 +208,9 @@ releases:
application: monitoring
values:
- values/prometheus.yaml
{{ range .Environment.Values.prometheus_overrides }}
- {{ . }}
{{ end }}
- name: grafana
namespace: monitoring
......@@ -197,6 +221,9 @@ releases:
application: monitoring
values:
- values/grafana.yaml
{{ range .Environment.Values.grafana_overrides }}
- {{ . }}
{{ end }}
set:
- name: env.GF_AUTH_GITHUB_CLIENT_ID
value: {{ requiredEnv "SECRET_GRAFANA_GITHUB_CLIENTID" }}
......@@ -205,3 +232,12 @@ releases:
# To get the auto-generated Grafana admin password:
# kubectl get secret --namespace monitoring grafana -o jsonpath="{.data.admin-password}" | base64 -d ; echo
environments:
default:
values:
- production.yaml
minikube:
values:
- minikube.yaml
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