Skip to content
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.

Sign up for GitHub

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

[kots]: set emptyDir and allow timeout configuration #14500

Merged
merged 2 commits into from
Nov 9, 2022
Merged

[kots]: set emptyDir and allow timeout configuration #14500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c6b10
[kots]: add emptyDir for /tmp direction
Nov 8, 2022
7849013
[kots]: allow configuration the installer timeout
Nov 8, 2022
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
3 changes: 3 additions & 0 deletions install/installer/scripts/kots-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ EOF
# If certificate secret already exists, set the timeout to 5m
CERT_SECRET=$(kubectl get secrets -n "${NAMESPACE}" https-certificates -o jsonpath='{.metadata.name}' || echo '')
HELM_TIMEOUT="5m"
if [ "${ADVANCED_MODE_ENABLED}" = "1" ]; then
HELM_TIMEOUT="${INSTALLER_TIMEOUT}"
fi
if [ "${CERT_SECRET}" = "" ]; then
HELM_TIMEOUT="1h"
fi
Expand Down
2 changes: 1 addition & 1 deletion install/kots/manifests/gitpod-installation-status.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
containers:
- name: installation-status
# This will normally be the release tag
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-version-script.2"
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
envFrom:
- configMapRef:
name: gitpod-kots-config
Expand Down
6 changes: 5 additions & 1 deletion install/kots/manifests/gitpod-installer-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ spec:
containers:
- name: installer
# This will normally be the release tag
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-version-script.2"
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
volumeMounts:
- mountPath: /mnt/node0
name: node-fs0
readOnly: true
- mountPath: /tmp
name: temp-storage
env:
- name: MOUNT_PATH
value: /mnt/node0
Expand Down Expand Up @@ -75,3 +77,5 @@ spec:
hostPath:
path: /
type: Directory
- name: temp-storage
emptyDir: {}
1 change: 1 addition & 0 deletions install/kots/manifests/gitpod-kots-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ data:
ADVANCED_MODE_ENABLED: repl{{ ConfigOption "advanced_mode_enabled" | quote }}
COMPONENT_PROXY_SERVICE_TYPE: repl{{ ConfigOption "component_proxy_service_serviceType" | quote }}
CUSTOMIZATION_PATCH_ENABLED: repl{{ ConfigOptionNotEquals "customization_patch" "" | quote }} # Use comparison not value
INSTALLER_TIMEOUT: repl{{ ConfigOption "installer_timeout" | quote }}

# Customizations
CONFIG_PATCH: repl{{ ConfigOptionData "config_patch" | default "" | quote }}
Expand Down
20 changes: 20 additions & 0 deletions install/kots/manifests/kots-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,26 @@ spec:
default: "0"
help_text: Enables advanced customization options. Enable only when you know what you are doing!

- name: installer_timeout
title: Installer timeout
type: select_one
default: 5m
when: '{{repl ConfigOptionEquals "advanced_mode_enabled" "1" }}'
help_text: Override the timeout for the Installer.
items:
- name: 5m
title: 5 minutes
- name: 10m
title: 10 minutes
- name: 30m
title: 30 minutes
- name: 1h
title: 1 hour
- name: 90m
title: 90 minutes
- name: 2h
title: 2 hours

- name: customization_patch
title: Gitpod customization patch (YAML file)
type: file
Expand Down