Commit a9f10f16 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'fix-omnibus-wss-address' into 'master'

Add trailing slash to Omnibus kas-address so that proxying works

See merge request gitlab-org/gitlab!55565
parents e49ba529 8789939f
...@@ -281,7 +281,7 @@ example [`resources.yml` file](#example-resourcesyml-file) in the following ways ...@@ -281,7 +281,7 @@ example [`resources.yml` file](#example-resourcesyml-file) in the following ways
after you install the `gitlab-kas` sub-chart, or enable `gitlab-kas` for Omnibus GitLab. after you install the `gitlab-kas` sub-chart, or enable `gitlab-kas` for Omnibus GitLab.
When using the sub-chart, you must set `wss://kas.host.tld:443` as When using the sub-chart, you must set `wss://kas.host.tld:443` as
`kas-address`, where `host.tld` is the domain you've setup for your GitLab installation. `kas-address`, where `host.tld` is the domain you've setup for your GitLab installation.
When using Omnibus GitLab, you must set `wss://GitLab.host.tld:443/-/kubernetes-agent` as When using Omnibus GitLab, you must set `wss://GitLab.host.tld:443/-/kubernetes-agent/` as
`kas-address`, where `GitLab.host.tld` is your GitLab hostname. `kas-address`, where `GitLab.host.tld` is your GitLab hostname.
- When using the sub-chart, specify the `ws` scheme (such as `ws://kas.host.tld:80`) - When using the sub-chart, specify the `ws` scheme (such as `ws://kas.host.tld:80`)
to use an unencrypted WebSockets connection. to use an unencrypted WebSockets connection.
...@@ -346,7 +346,7 @@ spec: ...@@ -346,7 +346,7 @@ spec:
- --token-file=/config/token - --token-file=/config/token
- --kas-address - --kas-address
- wss://kas.host.tld:443 # change this line for the one below if using Omnibus GitLab - wss://kas.host.tld:443 # change this line for the one below if using Omnibus GitLab
# - wss://gitlab.host.tld:443/-/kubernetes-agent # - wss://gitlab.host.tld:443/-/kubernetes-agent/
volumeMounts: volumeMounts:
- name: token-volume - name: token-volume
mountPath: /config mountPath: /config
......
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