fix remaining metallb issues

charts/enterprise/metallb/Chart.yaml

@@ -22,7 +22,7 @@ sources:
   - https://github.com/metallb/metallb
   - https://metallb.universe.tf
 type: application
-version: 5.0.3
+version: 5.0.4
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/metallb/templates/_bgpadvertisement.tpl

@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: BGPAdvertisement
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   ipAddressPools:

charts/enterprise/metallb/templates/_community.tpl

@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: Community
 metadata:
-  name: {{ $.Release.Name }}-communities
+  name: communities
   namespace: metallb-system
 spec:
   communities:

charts/enterprise/metallb/templates/_ipaddresspool.tpl

@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: IPAddressPool
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   addresses:

charts/enterprise/metallb/templates/_l2advertisement.tpl

@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: L2Advertisement
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   ipAddressPools:

charts/enterprise/metallb/templates/_peers.tpl

@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta2
 kind: BGPPeer
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   {{- with .password }}

charts/enterprise/metallb/templates/_wait.tpl

@@ -1,5 +1,5 @@
-{{- define "metallb.wait" -}}
-{{- $fullName := include "tc.common.names.fullname" . -}}
+{{- define "metallb.wait" }}
+{{- $fullName := include "tc.common.names.fullname" . }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -65,4 +65,4 @@ metadata:
     "helm.sh/hook": pre-install, pre-upgrade
     "helm.sh/hook-weight": "-2"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
-{{- end -}}
+{{- end }}