From 3f44e78d28079ea6e2d3cc13ed2aebf52f5c4761 Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Thu, 25 Feb 2021 11:59:42 +0100 Subject: [PATCH] Fix templating because of dashes before curly brackets --- deploy/helm/templates/ingress.yaml | 16 ++++++++-------- deploy/helm/templates/serviceaccount.yaml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy/helm/templates/ingress.yaml b/deploy/helm/templates/ingress.yaml index a77367cd3..96404398a 100644 --- a/deploy/helm/templates/ingress.yaml +++ b/deploy/helm/templates/ingress.yaml @@ -1,12 +1,12 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "nebraska.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- $kubeGitVersion := .Capabilities.KubeVersion.GitVersion -}} -{{- if semverCompare ">=1.19-0" $kubeGitVersion -}} +{{- if .Values.ingress.enabled }} +{{- $fullName := include "nebraska.fullname" . }} +{{- $svcPort := .Values.service.port }} +{{- $kubeGitVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $kubeGitVersion }} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" $kubeGitVersion -}} +{{- else if semverCompare ">=1.14-0" $kubeGitVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress @@ -42,7 +42,7 @@ spec: port: number: {{ $svcPort }} pathType: ImplementationSpecific - {{- else -}} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} diff --git a/deploy/helm/templates/serviceaccount.yaml b/deploy/helm/templates/serviceaccount.yaml index 5fdb66747..8272e3bbc 100644 --- a/deploy/helm/templates/serviceaccount.yaml +++ b/deploy/helm/templates/serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.create -}} +{{- if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: