Skip to content

[helm] Remove 'version' and provide an error message if not set #3192

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
Feb 16, 2021
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
6 changes: 3 additions & 3 deletions chart/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ registry.{{ .Values.hostname }}
{{- $ := .root -}}
{{- $gp := .gp -}}
{{- $comp := .comp -}}
{{- $comp.version | default $gp.version -}}
{{- 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) -}}
{{- end -}}

{{- define "gitpod.comp.imageRepo" -}}
Expand Down Expand Up @@ -329,8 +329,8 @@ storage:
blobQuota: {{ .remoteStorage.blobQuota | default 0 }}
minio:
endpoint: {{ $remoteStorageMinio.endpoint | default (printf "minio.%s" $.Values.hostname) }}
accessKey: {{ required "minio access key is required, please add a value to your values.yaml" ($remoteStorageMinio.accessKey | default $minio.accessKey) }}
secretKey: {{ required "minio secret key is required, please add a value to your values.yaml" ($remoteStorageMinio.secretKey | default $minio.secretKey) }}
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) }}
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) }}
secure: {{ $remoteStorageMinio.secure | default ($minio.enabled | default false) }}
region: {{ $remoteStorageMinio.region | default "local" }}
parallelUpload: {{ $remoteStorageMinio.parallelUpload | default "" }}
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2020 Gitpod GmbH. All rights reserved.
# Licensed under the MIT License. See License-MIT.txt in the project root for license information.

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

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