Merge pull request #21 from gnom4ik/master

Enhanced the system by introducing variables for ingress class name and labels for ingress
cdwv · Nov 6, 2023 · 50491a6 · 50491a6
2 parents 967eed8 + 2467859
commit 50491a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/chart/bitwarden-k8s/Chart.yaml b/chart/bitwarden-k8s/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Bitwarden Helm chart for Kubernetes
 name: bitwarden-k8s
-version: 0.1.6
+version: 0.1.7
 home: https://github.com/dani-garcia/bitwarden_rs
 icon: https://raw.githubusercontent.com/bitwarden/brand/master/icons/icon.svg
 sources:

diff --git a/chart/bitwarden-k8s/templates/ingress.yaml b/chart/bitwarden-k8s/templates/ingress.yaml
@@ -16,11 +16,17 @@ metadata:
     helm.sh/chart: {{ include "bitwarden-k8s.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.ingress.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if not (eq .Values.ingress.ingressClassName "") }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

diff --git a/chart/bitwarden-k8s/values.yaml b/chart/bitwarden-k8s/values.yaml
@@ -45,6 +45,8 @@ service:
 
 ingress:
   enabled: true
+  labels: {}
+  ingressClassName: ""
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"