From e9fdfc1244a2a99ea1010d790baeac77e047be70 Mon Sep 17 00:00:00 2001
From: Craig Cabrey <craigcabrey@gmail.com>
Date: Mon, 13 Apr 2020 06:03:48 -0700
Subject: [PATCH] [stable/home-assistant] fix templates with go 1.14 (#21888)

Signed-off-by: Craig Cabrey <craigcabrey@gmail.com>
---
 stable/home-assistant/Chart.yaml                          | 2 +-
 stable/home-assistant/templates/appdaemon-ingress.yaml    | 2 +-
 stable/home-assistant/templates/configurator-ingress.yaml | 2 +-
 stable/home-assistant/templates/deployment.yaml           | 2 +-
 stable/home-assistant/templates/vscode-ingress.yaml       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stable/home-assistant/Chart.yaml b/stable/home-assistant/Chart.yaml
index 6f31702046..ff4fa86226 100644
--- a/stable/home-assistant/Chart.yaml
+++ b/stable/home-assistant/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.107.7
 description: Home Assistant
 name: home-assistant
-version: 0.12.6
+version: 0.12.7
 keywords:
 - home-assistant
 - hass
diff --git a/stable/home-assistant/templates/appdaemon-ingress.yaml b/stable/home-assistant/templates/appdaemon-ingress.yaml
index 589baa3e49..7cb65509da 100644
--- a/stable/home-assistant/templates/appdaemon-ingress.yaml
+++ b/stable/home-assistant/templates/appdaemon-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.appdaemon.enabled) and (.Values.appdaemon.ingress.enabled) }}
+{{- if and (.Values.appdaemon.enabled) (.Values.appdaemon.ingress.enabled) }}
 {{- $fullName := include "home-assistant.fullname" . -}}
 {{- $servicePort := .Values.appdaemon.service.port -}}
 {{- $ingressPath := .Values.appdaemon.ingress.path -}}
diff --git a/stable/home-assistant/templates/configurator-ingress.yaml b/stable/home-assistant/templates/configurator-ingress.yaml
index eda9e8614d..77836558a1 100644
--- a/stable/home-assistant/templates/configurator-ingress.yaml
+++ b/stable/home-assistant/templates/configurator-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.configurator.enabled) and (.Values.configurator.ingress.enabled) }}
+{{- if and (.Values.configurator.enabled) (.Values.configurator.ingress.enabled) }}
 {{- $fullName := include "home-assistant.fullname" . -}}
 {{- $servicePort := .Values.configurator.service.port -}}
 {{- $ingressPath := .Values.configurator.ingress.path -}}
diff --git a/stable/home-assistant/templates/deployment.yaml b/stable/home-assistant/templates/deployment.yaml
index 9be0c1a925..f13455d453 100644
--- a/stable/home-assistant/templates/deployment.yaml
+++ b/stable/home-assistant/templates/deployment.yaml
@@ -170,7 +170,7 @@ spec:
                   name: {{ template "home-assistant.fullname" . }}-configurator
                   key: hass-api-password
             {{- end }}
-            {{- if (.Values.configurator.username) and (.Values.configurator.password) }}
+            {{- if and (.Values.configurator.username) (.Values.configurator.password) }}
             - name: HC_USERNAME
               valueFrom:
                 secretKeyRef:
diff --git a/stable/home-assistant/templates/vscode-ingress.yaml b/stable/home-assistant/templates/vscode-ingress.yaml
index 8543cda193..d3e17efddb 100644
--- a/stable/home-assistant/templates/vscode-ingress.yaml
+++ b/stable/home-assistant/templates/vscode-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.vscode.enabled) and (.Values.vscode.ingress.enabled) }}
+{{- if and (.Values.vscode.enabled) (.Values.vscode.ingress.enabled) }}
 {{- $fullName := include "home-assistant.fullname" . -}}
 {{- $servicePort := .Values.vscode.service.port -}}
 {{- $ingressPath := .Values.vscode.ingress.path -}}