feat(cloudflare-tunnel): cleanup Kubernetes labels (#710)

* feat(cloudflare-tunnel): cleanup Kubernetes labels Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * fix(cloudflare-tunnel): typo Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> --------- Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
portefaix · Apr 16, 2024 · 508b96f · 508b96f
1 parent cc61aa1
commit 508b96f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 4 deletions.
diff --git a/charts/cloudflare-tunnel/Chart.yaml b/charts/cloudflare-tunnel/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: cloudflare-tunnel
 description: Creation of a cloudflared deployment - a reverse tunnel for an environment
 type: application
-version: 0.2.1
+version: 0.3.0
 appVersion: "2023.5.1"
 icon: https://www.vectorlogo.zone/logos/cloudflare/cloudflare-icon.svg
 home: https://github.com/nlamirault/portefaix-hub
@@ -32,5 +32,5 @@ annotations:
     fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: fixed
-      description: ServiceMonitor selector labels
+    - kind: changed
+      description: Cleanup labels
diff --git a/charts/cloudflare-tunnel/templates/_helpers.tpl b/charts/cloudflare-tunnel/templates/_helpers.tpl
@@ -39,7 +39,6 @@ helm.sh/chart: {{ include "cloudflare-tunnel.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/component: tunnel
 app.kubernetes.io/part-of: {{ include "cloudflare-tunnel.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.additionalLabels }}

diff --git a/charts/cloudflare-tunnel/templates/configmap.yaml b/charts/cloudflare-tunnel/templates/configmap.yaml
@@ -2,6 +2,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  labels:
+    {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
   name: {{ include "cloudflare-tunnel.fullname" . }}
 data:
   config.yaml: |

diff --git a/charts/cloudflare-tunnel/templates/deployment.yaml b/charts/cloudflare-tunnel/templates/deployment.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "cloudflare-tunnel.fullname" . }}
   labels:
     {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: workload
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

diff --git a/charts/cloudflare-tunnel/templates/secret.yaml b/charts/cloudflare-tunnel/templates/secret.yaml
@@ -7,6 +7,7 @@ metadata:
   name: {{ include "cloudflare-tunnel.fullname" . }}
   labels:
     {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: secret
 stringData:
   credentials.json: |-
     {

diff --git a/charts/cloudflare-tunnel/templates/service.yaml b/charts/cloudflare-tunnel/templates/service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "cloudflare-tunnel.fullname" . }}
   labels:
     {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/cloudflare-tunnel/templates/serviceaccount.yaml b/charts/cloudflare-tunnel/templates/serviceaccount.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "cloudflare-tunnel.fullname" . }}
   labels:
     {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/cloudflare-tunnel/templates/servicemonitor.yaml b/charts/cloudflare-tunnel/templates/servicemonitor.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ template "cloudflare-tunnel.fullname" . }}
   labels:
     {{- include "cloudflare-tunnel.labels" . | nindent 4 }}
+    app.kubernetes.io/component: monitoring
     {{- with .Values.serviceMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}