From 508b96fedb014077bbdd01f2b2ad6d33cf3ae841 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Tue, 16 Apr 2024 23:18:54 +0200 Subject: [PATCH] feat(cloudflare-tunnel): cleanup Kubernetes labels (#710) * feat(cloudflare-tunnel): cleanup Kubernetes labels Signed-off-by: Nicolas Lamirault * fix(cloudflare-tunnel): typo Signed-off-by: Nicolas Lamirault --------- Signed-off-by: Nicolas Lamirault --- charts/cloudflare-tunnel/Chart.yaml | 6 +++--- charts/cloudflare-tunnel/templates/_helpers.tpl | 1 - charts/cloudflare-tunnel/templates/configmap.yaml | 3 +++ charts/cloudflare-tunnel/templates/deployment.yaml | 1 + charts/cloudflare-tunnel/templates/secret.yaml | 1 + charts/cloudflare-tunnel/templates/service.yaml | 1 + charts/cloudflare-tunnel/templates/serviceaccount.yaml | 1 + charts/cloudflare-tunnel/templates/servicemonitor.yaml | 1 + 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/charts/cloudflare-tunnel/Chart.yaml b/charts/cloudflare-tunnel/Chart.yaml index 68455a95..bd04433f 100644 --- 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 \ No newline at end of file + - kind: changed + description: Cleanup labels diff --git a/charts/cloudflare-tunnel/templates/_helpers.tpl b/charts/cloudflare-tunnel/templates/_helpers.tpl index ac5d259f..7a3a134b 100644 --- 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 index a46664a1..4eb74c86 100644 --- 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 index 8cfb8d07..8db43c94 100644 --- 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 index 8316526e..18b528c6 100644 --- 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 index f824679e..f65c0c67 100644 --- 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 index ecb321e7..cdb6b6d0 100644 --- 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 index dd898555..9c82d3c7 100644 --- 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 }}