Commit 354cd090 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'jupyter-fixes-v1' into 'master'

Jupyter fix hostname editing and remove extra load balancer

Closes #59740 and #62686

See merge request gitlab-org/gitlab-ce!31332
parents 760e75c8 f4856861
...@@ -171,6 +171,7 @@ export default class ClusterStore { ...@@ -171,6 +171,7 @@ export default class ClusterStore {
this.state.applications.cert_manager.email || serverAppEntry.email; this.state.applications.cert_manager.email || serverAppEntry.email;
} else if (appId === JUPYTER) { } else if (appId === JUPYTER) {
this.state.applications.jupyter.hostname = this.state.applications.jupyter.hostname =
this.state.applications.jupyter.hostname ||
serverAppEntry.hostname || serverAppEntry.hostname ||
(this.state.applications.ingress.externalIp (this.state.applications.ingress.externalIp
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io` ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
......
---
title: Jupyter fixes
merge_request: 31332
author: Amit Rathi
type: fixed
...@@ -57,3 +57,7 @@ ingress: ...@@ -57,3 +57,7 @@ ingress:
annotations: annotations:
kubernetes.io/ingress.class: "nginx" kubernetes.io/ingress.class: "nginx"
kubernetes.io/tls-acme: "true" kubernetes.io/tls-acme: "true"
proxy:
service:
type: ClusterIP
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