From 5d3e0697e1b78696e719c8c89cc2dd84563f250e Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 13 Sep 2022 19:16:11 +0200
Subject: [PATCH] fix(metallb): fix error/warning on upgrade

---
 charts/enterprise/metallb/Chart.yaml                      | 2 +-
 charts/enterprise/metallb/templates/bgpadvertisement.yaml | 4 +++-
 charts/enterprise/metallb/templates/community.yaml        | 4 +++-
 charts/enterprise/metallb/templates/ipaddresspool.yaml    | 4 +++-
 charts/enterprise/metallb/templates/l2advertisement.yaml  | 4 +++-
 charts/enterprise/metallb/templates/peers.yaml            | 4 +++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/charts/enterprise/metallb/Chart.yaml b/charts/enterprise/metallb/Chart.yaml
index 22dd13d79da..24f80b8fdb2 100644
--- a/charts/enterprise/metallb/Chart.yaml
+++ b/charts/enterprise/metallb/Chart.yaml
@@ -25,7 +25,7 @@ sources:
   - https://github.com/metallb/metallb
   - https://metallb.universe.tf
 type: application
-version: 4.0.6
+version: 4.0.7
 annotations:
   truecharts.org/catagories: |
     - core
diff --git a/charts/enterprise/metallb/templates/bgpadvertisement.yaml b/charts/enterprise/metallb/templates/bgpadvertisement.yaml
index 0b8d3b3fbbf..10a44052fee 100644
--- a/charts/enterprise/metallb/templates/bgpadvertisement.yaml
+++ b/charts/enterprise/metallb/templates/bgpadvertisement.yaml
@@ -1,7 +1,9 @@
 {{- range .Values.BGPAdvertisements }}
-{{- if .Release.IsInstall  }}
+{{- if hasKey .Release "IsInstall" }}
+{{- if .Release.IsInstall }}
 {{- fail "Please only add MetalLB configuration after initial installation" }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: metallb.io/v1beta1
 kind: BGPAdvertisement
diff --git a/charts/enterprise/metallb/templates/community.yaml b/charts/enterprise/metallb/templates/community.yaml
index 882ae519be7..b89ab71b8f8 100644
--- a/charts/enterprise/metallb/templates/community.yaml
+++ b/charts/enterprise/metallb/templates/community.yaml
@@ -1,7 +1,9 @@
 {{- if .Values.Communities }}
-{{- if .Release.IsInstall  }}
+{{- if hasKey .Release "IsInstall" }}
+{{- if .Release.IsInstall }}
 {{- fail "Please only add MetalLB configuration after initial installation" }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: metallb.io/v1beta1
 kind: Community
diff --git a/charts/enterprise/metallb/templates/ipaddresspool.yaml b/charts/enterprise/metallb/templates/ipaddresspool.yaml
index b48cfd093dc..ff04afb837b 100644
--- a/charts/enterprise/metallb/templates/ipaddresspool.yaml
+++ b/charts/enterprise/metallb/templates/ipaddresspool.yaml
@@ -1,7 +1,9 @@
 {{- range .Values.ipAddressPools }}
-{{- if .Release.IsInstall  }}
+{{- if hasKey .Release "IsInstall" }}
+{{- if .Release.IsInstall }}
 {{- fail "Please only add MetalLB configuration after initial installation" }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: metallb.io/v1beta1
 kind: IPAddressPool
diff --git a/charts/enterprise/metallb/templates/l2advertisement.yaml b/charts/enterprise/metallb/templates/l2advertisement.yaml
index 8ac5ffa18dc..54fbf42162b 100644
--- a/charts/enterprise/metallb/templates/l2advertisement.yaml
+++ b/charts/enterprise/metallb/templates/l2advertisement.yaml
@@ -1,7 +1,9 @@
 {{- range .Values.L2Advertisements }}
-{{- if .Release.IsInstall  }}
+{{- if hasKey .Release "IsInstall" }}
+{{- if .Release.IsInstall }}
 {{- fail "Please only add MetalLB configuration after initial installation" }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: metallb.io/v1beta1
 kind: L2Advertisement
diff --git a/charts/enterprise/metallb/templates/peers.yaml b/charts/enterprise/metallb/templates/peers.yaml
index 91bc888cf88..3ceb0009d28 100644
--- a/charts/enterprise/metallb/templates/peers.yaml
+++ b/charts/enterprise/metallb/templates/peers.yaml
@@ -1,7 +1,9 @@
 {{- range .Values.Peers }}
-{{- if .Release.IsInstall  }}
+{{- if hasKey .Release "IsInstall" }}
+{{- if .Release.IsInstall }}
 {{- fail "Please only add MetalLB configuration after initial installation" }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: metallb.io/v1beta2
 kind: BGPPeer