gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-22 20:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(helm): add generic service and ingress annotation support (#2541)

Browse Source 
Co-authored-by: cxymds <Cxymds@qq.com>
Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
Strangerxxx
2026-04-15 13:16:10 +03:00
committed by GitHub
parent f57dd5a3c7
commit 73e6542eea
4 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helm/rustfs/templates/_helpers.tpl
+60
View File
@@ -99,6 +99,66 @@ Render imagePullSecrets for workloads - appends registry secret
{{- toYaml $secrets }}
{{- end }}
{{/*
Render annotations for the main Service resource.
Merges (in order of increasing precedence):
- service.traefikAnnotations (when ingress.className=traefik)
- ingress.traefikAnnotations (when ingress.className=traefik, backwards-compat alias)
- service.annotations
*/}}
{{- define "rustfs.serviceAnnotations" -}}
{{- $annotations := dict }}
{{- if and .Values.mode.distributed.enabled (eq .Values.ingress.className "traefik") }}
{{- $annotations = merge $annotations (default (dict) .Values.service.traefikAnnotations) }}
{{- $annotations = merge $annotations (default (dict) .Values.ingress.traefikAnnotations) }}
{{- end }}
{{- $annotations = merge $annotations (default (dict) .Values.service.annotations) }}
{{- if and .Values.mode.distributed.enabled .Values.mtls.enabled (eq .Values.ingress.className "traefik") }}
{{- $mtls := dict
"traefik.ingress.kubernetes.io/service.serversscheme" "https"
"traefik.ingress.kubernetes.io/service.serverstransport" (printf "%s-%s-transport@kubernetescrd" .Release.Namespace (include "rustfs.fullname" .))
}}
{{- $annotations = merge $annotations $mtls }}
{{- end }}
{{- if $annotations }}
{{- toYaml $annotations }}
{{- end }}
{{- end }}
{{/*
Render annotations for the headless Service resource.
Merges:
- service.headlessAnnotations
*/}}
{{- define "rustfs.headlessServiceAnnotations" -}}
{{- $annotations := default (dict) .Values.service.headlessAnnotations }}
{{- if $annotations }}
{{- toYaml $annotations }}
{{- end }}
{{- end }}
{{/*
Render annotations for the Ingress resource.
Merges (in order of increasing precedence):
- ingress.nginxAnnotations (when ingress.className=nginx)
- ingress.traefikAnnotations (when ingress.className=traefik)
- ingress.customAnnotations (backwards-compat)
- ingress.annotations
*/}}
{{- define "rustfs.ingressAnnotations" -}}
{{- $annotations := dict }}
{{- if eq .Values.ingress.className "nginx" }}
{{- $annotations = merge $annotations (default (dict) .Values.ingress.nginxAnnotations) }}
{{- else if eq .Values.ingress.className "traefik" }}
{{- $annotations = merge $annotations (default (dict) .Values.ingress.traefikAnnotations) }}
{{- end }}
{{- $annotations = merge $annotations (default (dict) .Values.ingress.customAnnotations) }}
{{- $annotations = merge $annotations (default (dict) .Values.ingress.annotations) }}
{{- if $annotations }}
{{- toYaml $annotations }}
{{- end }}
{{- end }}
{{/*
Render RUSTFS_VOLUMES
*/}}
helm/rustfs/templates/ingress.yaml
+2 -11
View File
@@ -1,13 +1,4 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressAnnotations := dict }}
{{- if eq .Values.ingress.className "nginx" }}
{{- $ingressAnnotations = deepCopy (default (dict) .Values.ingress.nginxAnnotations) }}
{{- else if eq .Values.ingress.className "traefik" }}
{{- $ingressAnnotations = deepCopy (default (dict) .Values.ingress.traefikAnnotations) }}
{{- end }}
{{- with .Values.ingress.customAnnotations }}
{{- $ingressAnnotations = merge $ingressAnnotations . }}
{{- end }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
@@ -18,9 +9,9 @@ metadata:
{{- with .Values.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with $ingressAnnotations }}
{{- with (include "rustfs.ingressAnnotations" .) }}
annotations:
{{- toYaml . | nindent 4 }}
{{- . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.ingress.className }}
helm/rustfs/templates/service.yaml
+6 -6
View File
@@ -4,6 +4,10 @@ kind: Service
metadata:
name: {{ include "rustfs.fullname" . }}-headless
namespace: {{ .Release.Namespace }}
{{- with (include "rustfs.headlessServiceAnnotations" .) }}
annotations:
{{- . | nindent 4 }}
{{- end }}
labels:
{{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }}
@@ -29,13 +33,9 @@ kind: Service
metadata:
name: {{ include "rustfs.fullname" . }}-svc
namespace: {{ .Release.Namespace }}
{{- if and .Values.mode.distributed.enabled (eq .Values.ingress.className "traefik")}}
{{- with (include "rustfs.serviceAnnotations" .) }}
annotations:
{{- toYaml .Values.ingress.traefikAnnotations | nindent 4 }}
{{- if and .Values.mtls.enabled (eq .Values.ingress.className "traefik") }}
traefik.ingress.kubernetes.io/service.serversscheme: https
traefik.ingress.kubernetes.io/service.serverstransport: {{ .Release.Namespace }}-{{ include "rustfs.fullname" . }}-transport@kubernetescrd
{{- end }}
{{- . | nindent 4 }}
{{- end }}
labels:
{{- include "rustfs.labels" . | nindent 4 }}