Skip to content

[kots]: put the HTTP Proxy settings behind a KOTS config bool #13959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions install/kots/manifests/gitpod-http-proxy-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
labels:
app: gitpod
component: gitpod-installer
annotations:
kots.io/when: '{{repl ConfigOptionEquals "enable_proxy_settings" "1" }}'
Comment on lines +11 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you point me to docs that explain what this annotation does?

Copy link
Contributor Author

@mrsimonemms mrsimonemms Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This includes a resource in the KOTS release, in this case if the enabled_proxy_settings config value equals 1 - it'll either resolve true or false and the annotation includes it if it's true

Docs

type: Opaque
data:
httpProxy: repl{{ HTTPProxy | Base64Encode | quote }}
Expand Down
2 changes: 1 addition & 1 deletion install/kots/manifests/gitpod-kots-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data:
SSH_GATEWAY: repl{{ ConfigOption "ssh_gateway" | quote }}

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

Expand Down
11 changes: 11 additions & 0 deletions install/kots/manifests/kots-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,14 @@ spec:
title: Cluster IP
- name: NodePort
title: Node port

- name: experimental
title: Experimental options
description: Experimental options without any support
when: 'false'
items:
- name: enable_proxy_settings
title: Enable proxy settings
type: bool
default: "0"
help_text: Enable HTTP_PROXY support for the Gitpod application. This is currently an experimental feature.