Skip to content

Commit 3cce30d

Browse files
[helm] Remove 'version' and provide an error message if not set
/werft with-installer Fixes #3091
1 parent d819a6b commit 3cce30d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

chart/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ registry.{{ .Values.hostname }}
275275
{{- $ := .root -}}
276276
{{- $gp := .gp -}}
277277
{{- $comp := .comp -}}
278-
{{- $comp.version | default $gp.version -}}
278+
{{- required "please specify the Gitpod version to use in your values.yaml or with the helm flag --set version=x.x.x" ($comp.version | default $gp.version) -}}
279279
{{- end -}}
280280

281281
{{- define "gitpod.comp.imageRepo" -}}
@@ -329,8 +329,8 @@ storage:
329329
blobQuota: {{ .remoteStorage.blobQuota | default 0 }}
330330
minio:
331331
endpoint: {{ $remoteStorageMinio.endpoint | default (printf "minio.%s" $.Values.hostname) }}
332-
accessKey: {{ required "minio access key is required, please add a value to your values.yaml" ($remoteStorageMinio.accessKey | default $minio.accessKey) }}
333-
secretKey: {{ required "minio secret key is required, please add a value to your values.yaml" ($remoteStorageMinio.secretKey | default $minio.secretKey) }}
332+
accessKey: {{ required "minio access key is required, please add a value to your values.yaml or with the helm flag --set minio.accessKey=xxxxx" ($remoteStorageMinio.accessKey | default $minio.accessKey) }}
333+
secretKey: {{ required "minio secret key is required, please add a value to your values.yaml or with the helm flag --set minio.secretKey=xxxxx" ($remoteStorageMinio.secretKey | default $minio.secretKey) }}
334334
secure: {{ $remoteStorageMinio.secure | default ($minio.enabled | default false) }}
335335
region: {{ $remoteStorageMinio.region | default "local" }}
336336
parallelUpload: {{ $remoteStorageMinio.parallelUpload | default "" }}

chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 Gitpod GmbH. All rights reserved.
22
# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
33

4-
version: "0.7.0"
4+
version: # version of Gitpod will be set by the CI job on publishing to https://charts.gitpod.io/
55

66
hostname: localhost
77
# ingressModes determines how Gitpod makes workspaces and their ports available. Possible values are:

0 commit comments

Comments
 (0)