feat: use helper

clusters/cl01tl/helm/cilium/templates/_helpers.tpl

@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "cilium.labels" -}}
+{{ include "cilium.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "cilium.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}

clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml

@@ -4,9 +4,8 @@
 #   name: cilium-bgp-advertisements
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-bgp-advertisements
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   advertisements:
 #     - advertisementType: "Service"

clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml

@@ -4,9 +4,8 @@
 #   name: cilium-bgp
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-bgp
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   nodeSelector:
 #     matchLabels:

clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml

@@ -4,9 +4,8 @@
 #   name: cilium-peer
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-peer
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   timers:
 #     holdTimeSeconds: 9

clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml

@@ -4,9 +4,8 @@ metadata:
   name: default-ip-pool
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: default-ip-pool
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.1.21"
@@ -19,9 +18,8 @@ metadata:
   name: bgp-ip-pool
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: bgp-ip-pool
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.2.100"

clusters/cl01tl/helm/cilium/templates/gateway.yaml

@@ -4,9 +4,8 @@
 #   name: cilium-tls-gateway
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-tls-gateway
+#     {{- include "cilium.labels" . | nindent 4 }}
 #   annotations:
 #     cert-manager.io/cluster-issuer: letsencrypt-issuer
 # spec:

clusters/cl01tl/helm/cilium/templates/http-route.yaml

@@ -4,9 +4,8 @@ metadata:
   name: hubble
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: hubble
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io