diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-01 14:36:17 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-08-01 14:36:17 +0000 |
| commit | 354cd090521984dc95ce2ee2713b81a82aec2577 (patch) | |
| tree | ad150b0ee4476764e39ec3e6dcd78e00ec192b78 | |
| parent | 760e75c8fa809fa6d3233700aa7eb99c15458d5a (diff) | |
| parent | f485686131b9fb2655856ddc35b011cb30dc90da (diff) | |
| download | gitlab-ce-354cd090521984dc95ce2ee2713b81a82aec2577.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/clusters/stores/clusters_store.js | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/jupyter-fixes-v1.yml | 5 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index f64f0ca616f..ada5a49e246 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -171,6 +171,7 @@ export default class ClusterStore { this.state.applications.cert_manager.email || serverAppEntry.email; } else if (appId === JUPYTER) { this.state.applications.jupyter.hostname = + this.state.applications.jupyter.hostname || serverAppEntry.hostname || (this.state.applications.ingress.externalIp ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io` diff --git a/changelogs/unreleased/jupyter-fixes-v1.yml b/changelogs/unreleased/jupyter-fixes-v1.yml new file mode 100644 index 00000000000..7a34f273c90 --- /dev/null +++ b/changelogs/unreleased/jupyter-fixes-v1.yml @@ -0,0 +1,5 @@ +--- +title: Jupyter fixes +merge_request: 31332 +author: Amit Rathi +type: fixed diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index 2aadd3dbe1e..852c6c3f2b0 100644 --- a/vendor/jupyter/values.yaml +++ b/vendor/jupyter/values.yaml @@ -57,3 +57,7 @@ ingress: annotations: kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" + +proxy: + service: + type: ClusterIP |