[camel-k] branch master updated: Fix helm chart to be compatible with Go 1.14

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 51f3c9f  Fix helm chart to be compatible with Go 1.14
51f3c9f is described below

commit 51f3c9f5a09bbc227fdea43a71bd5f51234a7fa2
Author: jon-ruckwood <jo...@selfdotlearn.net>
AuthorDate: Thu Jan 21 14:55:00 2021 +0000

    Fix helm chart to be compatible with Go 1.14
    
    Additionally, add 'cluster' to fix type error.
    
    See https://github.com/helm/helm/issues/7711#issuecomment-593113347
---
 helm/camel-k/templates/NOTES.txt | 2 +-
 helm/camel-k/values.yaml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/helm/camel-k/templates/NOTES.txt b/helm/camel-k/templates/NOTES.txt
index 3999401..32c70c0 100644
--- a/helm/camel-k/templates/NOTES.txt
+++ b/helm/camel-k/templates/NOTES.txt
@@ -1,7 +1,7 @@
 {{/*
 Constraints
 */}}
-{{- if (not .Values.platform.cluster) or (.Values.platform.cluster ne "OpenShift") }}
+{{- if or (not .Values.platform.cluster) (ne .Values.platform.cluster "OpenShift") }}
 {{ required "Field \"platform.build.registry.address\" is required when not running on OpenShift (set \"platform.cluster=OpenShift\" if you're using OpenShift instead)!" .Values.platform.build.registry.address | substr 0 0 }}
 {{- end }}
 
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index 0167685..a0da4d0 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -28,3 +28,4 @@ operator:
 platform:
   build:
     registry: {}
+  cluster: ""