From d975960704a2f493e317ff8a8984247731f2f6c2 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Wed, 8 Apr 2020 21:22:46 +0200
Subject: [PATCH] netbox: Clean up labels

---
 charts/netbox/Chart.yaml                       | 2 +-
 charts/netbox/templates/configuration.yaml     | 2 +-
 charts/netbox/templates/deployment-worker.yaml | 2 +-
 charts/netbox/templates/ingress.yaml           | 2 +-
 charts/netbox/templates/nginx-config.yaml      | 2 +-
 charts/netbox/templates/pvc.yaml               | 2 +-
 charts/netbox/templates/secrets.yaml           | 2 +-
 charts/netbox/templates/service.yaml           | 3 +--
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 46503af..0b3028c 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -4,4 +4,4 @@ appVersion: "2.7.12"
 description: An IP address management (IPAM) and data center infrastructure management (DCIM) tool. 
 icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico
 name: netbox
-version: 0.4.7
+version: 0.5.0
diff --git a/charts/netbox/templates/configuration.yaml b/charts/netbox/templates/configuration.yaml
index 69e21ff..bd23233 100644
--- a/charts/netbox/templates/configuration.yaml
+++ b/charts/netbox/templates/configuration.yaml
@@ -5,9 +5,9 @@ metadata:
   name: {{ include "netbox.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
 data:
   DB_NAME: {{ .Values.database.database }}
   DB_USER: {{ .Values.database.user }}
diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml
index 84f62dd..7dd31da 100644
--- a/charts/netbox/templates/deployment-worker.yaml
+++ b/charts/netbox/templates/deployment-worker.yaml
@@ -6,9 +6,9 @@ metadata:
   name: {{ include "netbox.fullname" . }}-worker
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
 spec:
   replicas: {{ .Values.worker.replicaCount }}
   selector:
diff --git a/charts/netbox/templates/ingress.yaml b/charts/netbox/templates/ingress.yaml
index dc5a355..3fc9d94 100644
--- a/charts/netbox/templates/ingress.yaml
+++ b/charts/netbox/templates/ingress.yaml
@@ -10,9 +10,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/netbox/templates/nginx-config.yaml b/charts/netbox/templates/nginx-config.yaml
index 5b7a8cd..f8bd173 100644
--- a/charts/netbox/templates/nginx-config.yaml
+++ b/charts/netbox/templates/nginx-config.yaml
@@ -5,9 +5,9 @@ metadata:
   name: {{ .Chart.Name }}-config-files
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
 data:
   gunicorn_config.py: |-
     command = '/usr/bin/gunicorn'
diff --git a/charts/netbox/templates/pvc.yaml b/charts/netbox/templates/pvc.yaml
index edb758a..257199a 100644
--- a/charts/netbox/templates/pvc.yaml
+++ b/charts/netbox/templates/pvc.yaml
@@ -5,9 +5,9 @@ metadata:
   name: {{ template "netbox.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}
diff --git a/charts/netbox/templates/secrets.yaml b/charts/netbox/templates/secrets.yaml
index 11fd916..cb3122f 100644
--- a/charts/netbox/templates/secrets.yaml
+++ b/charts/netbox/templates/secrets.yaml
@@ -4,9 +4,9 @@ metadata:
   name: {{ include "netbox.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "netbox.chart" . }}
 data:
   DB_PASSWORD: {{ .Values.database.password | b64enc }}
   REDIS_PASSWORD: {{ .Values.redis.password | b64enc }}
diff --git a/charts/netbox/templates/service.yaml b/charts/netbox/templates/service.yaml
index b657c73..255563f 100644
--- a/charts/netbox/templates/service.yaml
+++ b/charts/netbox/templates/service.yaml
@@ -4,10 +4,9 @@ metadata:
   name: {{ include "netbox.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    com.digitalocean.netbox/component: front
+    helm.sh/chart: {{ include "netbox.chart" . }}
 spec:
   type: {{ .Values.service.type }}
   ports: