From 3bfeab316a36400691bc623ba19ce7caa44f4bec Mon Sep 17 00:00:00 2001
From: Tommy <tommy@rodl.no>
Date: Wed, 31 Jan 2024 17:28:40 +0100
Subject: [PATCH] fix(netbox) adjust labels in deployment templates

---
 charts/netbox/Chart.yaml                             | 2 +-
 charts/netbox/templates/deployment-housekeeping.yaml | 6 ++----
 charts/netbox/templates/deployment-worker.yaml       | 5 ++---
 charts/netbox/templates/deployment.yaml              | 5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 5d4ebb1..4c87d49 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   An IP address management (IPAM) and data center infrastructure management (DCIM) tool.
 appVersion: v3.7.1
 type: application
-version: 6.0.3
+version: 6.0.4
 maintainers:
 - name: Tommy Skaug
   email: tommy@skaug.me
diff --git a/charts/netbox/templates/deployment-housekeeping.yaml b/charts/netbox/templates/deployment-housekeeping.yaml
index 2940f67..daeaf23 100644
--- a/charts/netbox/templates/deployment-housekeeping.yaml
+++ b/charts/netbox/templates/deployment-housekeeping.yaml
@@ -5,10 +5,8 @@ kind: Deployment
 metadata:
   name: {{ include "netbox.fullname" . }}-housekeeping
   labels:
-    app.kubernetes.io/name: {{ include "netbox.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
+    {{- include "netbox.labels" . | nindent 4 }}
+    app.kubernetes.io/component: housekeeping
 spec:
   replicas: 1
   selector:
diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml
index e3b7c44..b8965aa 100644
--- a/charts/netbox/templates/deployment-worker.yaml
+++ b/charts/netbox/templates/deployment-worker.yaml
@@ -21,9 +21,8 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }}
       labels:
-        app.kubernetes.io/name: {{ include "netbox.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        component: worker
+        {{- include "netbox.labels" . | nindent 8 }}
+        app.kubernetes.io/component: worker
     spec:
       containers:
         - name: {{ .Chart.Name }}-worker
diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
index 0cfcaaa..dff0914 100644
--- a/charts/netbox/templates/deployment.yaml
+++ b/charts/netbox/templates/deployment.yaml
@@ -20,9 +20,8 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }}
       labels:
-        app.kubernetes.io/name: {{ include "netbox.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        component: app
+        {{- include "netbox.labels" . | nindent 8 }}
+        app.kubernetes.io/component: app
     spec:
       containers:
         - name: {{ .Chart.Name }}