summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Rathi <amit.juschill@gmail.com>2018-12-03 10:16:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-12-03 10:16:38 +0000
commit9a034a8628e83903967620d82497cc1e0b9dedf6 (patch)
tree66df2ea094d9b120f09bee00432fc8ff3da42137
parentd2e280c4bf7a7f956cd6a366df668c3921239f8c (diff)
downloadgitlab-ce-9a034a8628e83903967620d82497cc1e0b9dedf6.tar.gz
HTTPS for JupyterHub installation
-rw-r--r--app/models/clusters/applications/jupyter.rb6
-rw-r--r--changelogs/unreleased/jupyter-tls.yml5
-rw-r--r--vendor/jupyter/values.yaml1
3 files changed, 11 insertions, 1 deletions
diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb
index e43a0fd1786..421a923d386 100644
--- a/app/models/clusters/applications/jupyter.rb
+++ b/app/models/clusters/applications/jupyter.rb
@@ -56,7 +56,11 @@ module Clusters
def specification
{
"ingress" => {
- "hosts" => [hostname]
+ "hosts" => [hostname],
+ "tls" => [{
+ "hosts" => [hostname],
+ "secretName" => "jupyter-cert"
+ }]
},
"hub" => {
"extraEnv" => {
diff --git a/changelogs/unreleased/jupyter-tls.yml b/changelogs/unreleased/jupyter-tls.yml
new file mode 100644
index 00000000000..4111edd34ff
--- /dev/null
+++ b/changelogs/unreleased/jupyter-tls.yml
@@ -0,0 +1,5 @@
+---
+title: "#52753: HTTPS for JupyterHub installation"
+merge_request: 23479
+author: Amit Rathi
+type: added
diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml
index 24136a7aca5..781d6e3042f 100644
--- a/vendor/jupyter/values.yaml
+++ b/vendor/jupyter/values.yaml
@@ -22,3 +22,4 @@ ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: "nginx"
+ kubernetes.io/tls-acme: "true"