diff --git a/cesnet-central/playbooks/files/jupyterhub-jwt.yaml b/cesnet-central/playbooks/files/jupyterhub-jwt.yaml deleted file mode 120000 index 59f9ac23b488d899df25d4ea582405ec6998d793..0000000000000000000000000000000000000000 --- a/cesnet-central/playbooks/files/jupyterhub-jwt.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../common/playbooks/files/jupyterhub-jwt.yaml \ No newline at end of file diff --git a/common/playbooks/notebooks.yaml b/common/playbooks/notebooks.yaml index 6b068de2a1995dbd0e748acc23c83efce7246551..3f84161425274ca9a0005f343d470286dac2006f 100644 --- a/common/playbooks/notebooks.yaml +++ b/common/playbooks/notebooks.yaml @@ -22,6 +22,19 @@ debug: msg: "{{ item.key }} = {{ item.value }}" loop: "{{ secrets | dict2items }}" + - name: Get Deployment Version From Git + command: + cmd: "git describe --tags" + delegate_to: 127.0.0.1 + ignore_errors: true + register: git_describe + when: true + - name: Set Deployment Version as Fact + set_fact: + deployment_version: "{{ git_describe.stdout | default('0.0.0', true) }}" + - name: Debug Deployment Version + debug: + msg: "Deployment version: {{ deployment_version }}" - name: Copy config file to master vars: name: "{{ item | basename | splitext | first }}" @@ -102,8 +115,13 @@ - "../deployments/*.yaml" - name: Copy JWT wrapper for JupyterHub API - copy: - src: files/jupyterhub-jwt.yaml + vars: + versions: + deployment: + version: "{{ deployment_version }}" + instance: "{{ site_name | upper }}" + template: + src: jupyterhub-jwt.yaml dest: /tmp/jupyterhub-jwt.yaml mode: 0644 - name: Configure JWT wrapper for JupyterHub API diff --git a/common/playbooks/files/jupyterhub-jwt.yaml b/common/playbooks/templates/jupyterhub-jwt.yaml similarity index 73% rename from common/playbooks/files/jupyterhub-jwt.yaml rename to common/playbooks/templates/jupyterhub-jwt.yaml index a8d71b97d2333623530fb72b3df17f889f9d0d30..6490ed67f901ce4f997f778ef6751f1dedabde98 100644 --- a/common/playbooks/files/jupyterhub-jwt.yaml +++ b/common/playbooks/templates/jupyterhub-jwt.yaml @@ -1,4 +1,14 @@ --- +apiVersion: v1 +kind: ConfigMap +metadata: + name: deployment-versions + labels: + app: jwt +data: + versions.json: | + {{ versions | to_nice_json | indent(width=4) }} +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -34,6 +44,13 @@ spec: - name: http containerPort: 8000 protocol: TCP + volumeMounts: + - name: deployment-versions + mountPath: /VERSIONS + volumes: + - name: deployment-versions + configMap: + name: deployment-versions --- apiVersion: v1 kind: Service diff --git a/staging1/playbooks/files/jupyterhub-jwt.yaml b/staging1/playbooks/files/jupyterhub-jwt.yaml deleted file mode 120000 index 59f9ac23b488d899df25d4ea582405ec6998d793..0000000000000000000000000000000000000000 --- a/staging1/playbooks/files/jupyterhub-jwt.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../common/playbooks/files/jupyterhub-jwt.yaml \ No newline at end of file diff --git a/staging1/playbooks/templates/jupyterhub-jwt.yaml b/staging1/playbooks/templates/jupyterhub-jwt.yaml new file mode 120000 index 0000000000000000000000000000000000000000..dc93e9189514d62622aca2ccb22a96e06eec7108 --- /dev/null +++ b/staging1/playbooks/templates/jupyterhub-jwt.yaml @@ -0,0 +1 @@ +../../../common/playbooks/templates/jupyterhub-jwt.yaml \ No newline at end of file diff --git a/testing/playbooks/files/jupyterhub-jwt.yaml b/testing/playbooks/files/jupyterhub-jwt.yaml deleted file mode 120000 index 59f9ac23b488d899df25d4ea582405ec6998d793..0000000000000000000000000000000000000000 --- a/testing/playbooks/files/jupyterhub-jwt.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../common/playbooks/files/jupyterhub-jwt.yaml \ No newline at end of file diff --git a/testing/playbooks/templates/jupyterhub-jwt.yaml b/testing/playbooks/templates/jupyterhub-jwt.yaml new file mode 120000 index 0000000000000000000000000000000000000000..dc93e9189514d62622aca2ccb22a96e06eec7108 --- /dev/null +++ b/testing/playbooks/templates/jupyterhub-jwt.yaml @@ -0,0 +1 @@ +../../../common/playbooks/templates/jupyterhub-jwt.yaml \ No newline at end of file