Skip to content

Commit 96aa632

Browse files
author
Simon Emms
committed
[kots]: put the HTTP Proxy settings behind a KOTS config bool
1 parent 114a26b commit 96aa632

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

install/kots/manifests/gitpod-http-proxy-settings.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
labels:
99
app: gitpod
1010
component: gitpod-installer
11+
annotations:
12+
kots.io/when: '{{repl and (ConfigOptionEquals "advanced_mode_enabled" "1") (ConfigOptionEquals "enable_proxy_settings" "1") }}'
1113
type: Opaque
1214
data:
1315
httpProxy: repl{{ HTTPProxy | Base64Encode | quote }}

install/kots/manifests/gitpod-kots-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data:
2222
SSH_GATEWAY: repl{{ ConfigOption "ssh_gateway" | quote }}
2323

2424
# Secret names
25-
HTTP_PROXY_NAME: http-proxy-settings
25+
HTTP_PROXY_NAME: '{{repl if (ConfigOptionEquals "enable_proxy_settings" "1" ) }}http-proxy-settings{{repl end }}'
2626
LICENSE_NAME: gitpod-license
2727
SSH_GATEWAY_HOST_KEY_NAME: ssh-gateway-host-key
2828

install/kots/manifests/kots-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,13 @@ spec:
392392
default: "0"
393393
help_text: Enables advanced customization options. Enable only when you know what you are doing!
394394

395+
- name: enable_proxy_settings
396+
title: Enable proxy settings
397+
when: '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}'
398+
type: bool
399+
default: "0"
400+
help_text: Enable HTTP_PROXY support for the Gitpod application. This is currently an experimental feature.
401+
395402
- name: customization_patch
396403
title: Gitpod customization patch (YAML file)
397404
type: file

0 commit comments

Comments
 (0)