Skip to content

Commit ecf24dc

Browse files
author
Simon Emms
committed
[kots]: allow configuration the installer timeout
1 parent ced679a commit ecf24dc

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

install/installer/scripts/kots-install.sh

+3
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ EOF
177177
# If certificate secret already exists, set the timeout to 5m
178178
CERT_SECRET=$(kubectl get secrets -n "${NAMESPACE}" https-certificates -o jsonpath='{.metadata.name}' || echo '')
179179
HELM_TIMEOUT="5m"
180+
if [ "${ADVANCED_MODE_ENABLED}" = "1" ]; then
181+
HELM_TIMEOUT="${INSTALLER_TIMEOUT}"
182+
fi
180183
if [ "${CERT_SECRET}" = "" ]; then
181184
HELM_TIMEOUT="1h"
182185
fi

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

+1-1
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:sje-installer-version-script.2"
33+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
3434
envFrom:
3535
- configMapRef:
3636
name: gitpod-kots-config

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
containers:
4040
- name: installer
4141
# This will normally be the release tag
42-
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-version-script.2"
42+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
4343
volumeMounts:
4444
- mountPath: /mnt/node0
4545
name: node-fs0

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

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ data:
7474
ADVANCED_MODE_ENABLED: repl{{ ConfigOption "advanced_mode_enabled" | quote }}
7575
COMPONENT_PROXY_SERVICE_TYPE: repl{{ ConfigOption "component_proxy_service_serviceType" | quote }}
7676
CUSTOMIZATION_PATCH_ENABLED: repl{{ ConfigOptionNotEquals "customization_patch" "" | quote }} # Use comparison not value
77+
INSTALLER_TIMEOUT: repl{{ ConfigOption "installer_timeout" | quote }}
7778

7879
# Customizations
7980
CONFIG_PATCH: repl{{ ConfigOptionData "config_patch" | default "" | quote }}

install/kots/manifests/kots-config.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,26 @@ spec:
392392
default: "0"
393393
help_text: Enables advanced customization options. Enable only when you know what you are doing!
394394

395+
- name: installer_timeout
396+
title: Installer timeout
397+
type: select_one
398+
default: 5m
399+
when: '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}'
400+
help_text: Override the timeout for the Installer.
401+
items:
402+
- name: 5m
403+
title: 5 minutes
404+
- name: 10m
405+
title: 10 minutes
406+
- name: 30m
407+
title: 30 minutes
408+
- name: 1h
409+
title: 1 hour
410+
- name: 90m
411+
title: 90 minutes
412+
- name: 2h
413+
title: 2 hours
414+
395415
- name: customization_patch
396416
title: Gitpod customization patch (YAML file)
397417
type: file

0 commit comments

Comments
 (0)