From c0ff1b5273ac74efb26af5522b5673cd1e601b06 Mon Sep 17 00:00:00 2001 From: maomaocake Date: Sun, 17 Aug 2025 15:59:17 +0700 Subject: [PATCH] Added support for new user defined labels --- helm/proxlb/templates/_helpers.yaml | 8 ++++++++ helm/proxlb/templates/configmap.yaml | 6 +----- helm/proxlb/templates/deployment.yaml | 6 +++--- helm/proxlb/values.yaml | 9 +++++++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/helm/proxlb/templates/_helpers.yaml b/helm/proxlb/templates/_helpers.yaml index 03dfba1..a6d78e6 100644 --- a/helm/proxlb/templates/_helpers.yaml +++ b/helm/proxlb/templates/_helpers.yaml @@ -2,3 +2,11 @@ {{ .Release.Name }}-{{ .Chart.Name }} {{ end }} +{{ define "proxlb.labels" }} +app.kubernetes.io/name: {{ .Release.Name }} +app.kubernetes.io/managed-by: Helm +app.kubernetes.io/version: {{ .Chart.AppVersion }} +{{- if .Values.labels }} +{{ toYaml .Values.labels }} +{{- end }} +{{ end }} \ No newline at end of file diff --git a/helm/proxlb/templates/configmap.yaml b/helm/proxlb/templates/configmap.yaml index c8acf94..204ac23 100644 --- a/helm/proxlb/templates/configmap.yaml +++ b/helm/proxlb/templates/configmap.yaml @@ -4,11 +4,7 @@ kind: ConfigMap metadata: name: proxlb-config labels: - app.kubernetes.io/name: "{{ .Release.Name }}" - app.kubernetes.io/instance: "{{ .Chart.Name }}" - app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} - app.kubernetes.io/part-of: proxlb - app.kubernetes.io/managed-by: Helm + {{- include "proxlb.labels" . | nindent 4 }} data: proxlb.yaml: | {{ toYaml .Values.configmap.config | indent 4 }} diff --git a/helm/proxlb/templates/deployment.yaml b/helm/proxlb/templates/deployment.yaml index 0ada34c..6e8f396 100644 --- a/helm/proxlb/templates/deployment.yaml +++ b/helm/proxlb/templates/deployment.yaml @@ -3,16 +3,16 @@ kind: Deployment metadata: name: {{ .Release.Name }} labels: - app.kubernetes.io/name: "{{ .Release.Name }}" + {{- include "proxlb.labels" . | nindent 4 }} spec: replicas: 1 # Number of replicas cannot be more than 1 selector: matchLabels: - app.kubernetes.io/name: "{{ .Release.Name }}" + {{- include "proxlb.labels" . | nindent 6 }} template: metadata: labels: - app.kubernetes.io/name: "{{ .Release.Name }}" + {{- include "proxlb.labels" . | nindent 8 }} spec: {{- with .Values.image.imagePullSecrets }} imagePullSecrets: diff --git a/helm/proxlb/values.yaml b/helm/proxlb/values.yaml index ac6fb82..c0af5de 100644 --- a/helm/proxlb/values.yaml +++ b/helm/proxlb/values.yaml @@ -5,6 +5,8 @@ image: pullPolicy: IfNotPresent imagePullSecrets: [ ] +labels: {} + extraArgs: dryRun: false @@ -13,8 +15,11 @@ configmap: config: proxmox_api: hosts: [] - user: "" - pass: "" +#Can be either a user or a token +# user: "" +# pass: "" +# token_id: "" +# token_secret: "" ssl_verification: True timeout: 10 proxmox_cluster: