Skip to content

Commit 84c0398

Browse files
author
Simon Emms
committed
[kots]: add proxy service type to advanced options
1 parent f91fbae commit 84c0398

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

install/kots/manifests/gitpod-installation-status.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
containers:
3131
- name: installation-status
3232
# This will normally be the release tag
33-
image: "eu.gcr.io/gitpod-core-dev/build/installer:tar-preview-telemetry.25"
33+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-clusterip.4"
3434
command:
3535
- /bin/sh
3636
- -c

install/kots/manifests/gitpod-installer-job.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
containers:
2929
- name: installer
3030
# This will normally be the release tag
31-
image: "eu.gcr.io/gitpod-core-dev/build/installer:tar-preview-telemetry.25"
31+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-clusterip.4"
3232
volumeMounts:
3333
- mountPath: /config-patch
3434
name: config-patch
@@ -263,6 +263,11 @@ spec:
263263
264264
if [ '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}' = "true" ];
265265
then
266+
echo "Gitpod: Applying advanced configuration"
267+
268+
echo "Applying Proxy service type"
269+
yq e -i ".components.proxy.service.serviceType = \"{{repl ConfigOption "component_proxy_service_serviceType" }}\"" "${CONFIG_FILE}"
270+
266271
if [ '{{repl ConfigOptionNotEquals "customization_patch" "" }}' = "true" ];
267272
then
268273
CUSTOMIZATION='{{repl ConfigOptionData "customization_patch" | Base64Encode }}'
@@ -271,6 +276,8 @@ spec:
271276
# Apply the customization property - if something else is set, this will be ignored
272277
yq e -i ".customization = $(echo "${CUSTOMIZATION}" | base64 -d | yq e -o json '.customization' - | jq -rc) // []" "${CONFIG_FILE}"
273278
fi
279+
else
280+
echo "Gitpod: No advanced configuration applied"
274281
fi
275282
276283
echo "Gitpod: Update platform telemetry value"

install/kots/manifests/kots-config.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,3 +400,24 @@ spec:
400400
required: false
401401
when: '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}'
402402
help_text: A file with Gitpod config that will be used to patch the generated Gitpod config. Usually provided by Gitpod as a way to tailor your installation.
403+
404+
- name: components
405+
title: Components
406+
description: Customize your component configuration
407+
when: '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}'
408+
items:
409+
- name: component_proxy_service_serviceType
410+
title: Proxy service type
411+
default: LoadBalancer
412+
help_text: |
413+
Select the [Service Type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
414+
for the Proxy service. If using anything other than "Load Balancer", you are responsible for configuring your network to route
415+
traffic through to the `proxy` service.
416+
type: select_one
417+
items:
418+
- name: LoadBalancer
419+
title: Load balancer
420+
- name: ClusterIP
421+
title: Cluster IP
422+
- name: NodePort
423+
title: Node port

0 commit comments

Comments
 (0)