fix(helm): add {{ .Release.Namespace }} for kustomize v5.8 compat, closes #1808 (#1809)

Co-authored-by: Helmut Wolf <3902045+shadow1runner@users.noreply.github.com>
Co-authored-by: loverustfs <hello@rustfs.com>
This commit is contained in:
shadow1runner
2026-02-14 03:25:13 +01:00
committed by GitHub
parent 23f79ae88f
commit 8e1fcd4792
19 changed files with 23 additions and 0 deletions
@@ -3,6 +3,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-root-ca name: {{ include "rustfs.fullname" . }}-root-ca
namespace: {{ .Release.Namespace }}
spec: spec:
isCA: true isCA: true
commonName: {{ include "rustfs.fullname" . }}-root-ca commonName: {{ include "rustfs.fullname" . }}-root-ca
@@ -3,6 +3,7 @@ apiVersion: cert-manager.io/v1
kind: Issuer kind: Issuer
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-ca-issuer name: {{ include "rustfs.fullname" . }}-ca-issuer
namespace: {{ .Release.Namespace }}
spec: spec:
ca: ca:
secretName: {{ include "rustfs.fullname" . }}-root-ca-secret secretName: {{ include "rustfs.fullname" . }}-root-ca-secret
@@ -3,6 +3,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-server-tls name: {{ include "rustfs.fullname" . }}-server-tls
namespace: {{ .Release.Namespace }}
spec: spec:
secretName: {{ include "rustfs.fullname" . }}-server-tls secretName: {{ include "rustfs.fullname" . }}-server-tls
issuerRef: issuerRef:
@@ -3,6 +3,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-client-tls name: {{ include "rustfs.fullname" . }}-client-tls
namespace: {{ .Release.Namespace }}
spec: spec:
secretName: {{ include "rustfs.fullname" . }}-client-tls secretName: {{ include "rustfs.fullname" . }}-client-tls
issuerRef: issuerRef:
@@ -3,6 +3,7 @@ apiVersion: traefik.io/v1alpha1
kind: ServersTransport kind: ServersTransport
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-transport name: {{ include "rustfs.fullname" . }}-transport
namespace: {{ .Release.Namespace }}
spec: spec:
rootcas: rootcas:
- {{ include "rustfs.fullname" . }}-root-ca-secret - {{ include "rustfs.fullname" . }}-root-ca-secret
+1
View File
@@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-config name: {{ include "rustfs.fullname" . }}-config
namespace: {{ .Release.Namespace }}
labels: labels:
{{- toYaml .Values.commonLabels | nindent 4 }} {{- toYaml .Values.commonLabels | nindent 4 }}
data: data:
+1
View File
@@ -5,6 +5,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "rustfs.fullname" . }} name: {{ include "rustfs.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
@@ -3,6 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
kind: Gateway kind: Gateway
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-gateway name: {{ include "rustfs.fullname" . }}-gateway
namespace: {{ .Release.Namespace }}
spec: spec:
gatewayClassName: {{ .Values.gatewayApi.gatewayClass }} gatewayClassName: {{ .Values.gatewayApi.gatewayClass }}
{{- with .Values.gatewayApi.listeners }} {{- with .Values.gatewayApi.listeners }}
@@ -3,6 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute kind: HTTPRoute
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-route name: {{ include "rustfs.fullname" . }}-route
namespace: {{ .Release.Namespace }}
annotations: annotations:
{{- if eq .Values.gatewayApi.gatewayClass "contour" }} {{- if eq .Values.gatewayApi.gatewayClass "contour" }}
projectcontour.io/upstream-hash-policy: "cookie" projectcontour.io/upstream-hash-policy: "cookie"
@@ -42,6 +43,7 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute kind: HTTPRoute
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-redirect name: {{ include "rustfs.fullname" . }}-redirect
namespace: {{ .Release.Namespace }}
spec: spec:
parentRefs: parentRefs:
{{- if .Values.gatewayApi.existingGateway.name }} {{- if .Values.gatewayApi.existingGateway.name }}
@@ -3,6 +3,7 @@ apiVersion: traefik.io/v1alpha1
kind: TraefikService kind: TraefikService
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-sticky-svc name: {{ include "rustfs.fullname" . }}-sticky-svc
namespace: {{ .Release.Namespace }}
spec: spec:
weighted: weighted:
services: services:
+1
View File
@@ -9,6 +9,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ include "rustfs.fullname" . }} name: {{ include "rustfs.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
@@ -4,6 +4,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
name: {{ include "rustfs.fullname" . }} name: {{ include "rustfs.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
+2
View File
@@ -6,6 +6,7 @@ metadata:
annotations: annotations:
helm.sh/resource-policy: keep helm.sh/resource-policy: keep
name: {{ include "rustfs.fullname" $ }}-data name: {{ include "rustfs.fullname" $ }}-data
namespace: {{ $.Release.Namespace }}
labels: labels:
{{- toYaml $.Values.commonLabels | nindent 4 }} {{- toYaml $.Values.commonLabels | nindent 4 }}
spec: spec:
@@ -25,6 +26,7 @@ metadata:
annotations: annotations:
helm.sh/resource-policy: keep helm.sh/resource-policy: keep
name: {{ include "rustfs.fullname" $ }}-logs name: {{ include "rustfs.fullname" $ }}-logs
namespace: {{ $.Release.Namespace }}
labels: labels:
{{- toYaml $.Values.commonLabels | nindent 4 }} {{- toYaml $.Values.commonLabels | nindent 4 }}
spec: spec:
+1
View File
@@ -3,6 +3,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-tls name: {{ include "rustfs.fullname" . }}-tls
namespace: {{ .Release.Namespace }}
labels: labels:
{{- toYaml .Values.commonLabels | nindent 4 }} {{- toYaml .Values.commonLabels | nindent 4 }}
type: kubernetes.io/tls type: kubernetes.io/tls
+2
View File
@@ -3,6 +3,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "rustfs.secretName" . }} name: {{ include "rustfs.secretName" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- toYaml .Values.commonLabels | nindent 4 }} {{- toYaml .Values.commonLabels | nindent 4 }}
type: Opaque type: Opaque
@@ -17,6 +18,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "rustfs.imagePullSecret.name" . }} name: {{ include "rustfs.imagePullSecret.name" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- toYaml .Values.commonLabels | nindent 4 }} {{- toYaml .Values.commonLabels | nindent 4 }}
type: kubernetes.io/dockerconfigjson type: kubernetes.io/dockerconfigjson
+2
View File
@@ -3,6 +3,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-headless name: {{ include "rustfs.fullname" . }}-headless
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
@@ -27,6 +28,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "rustfs.fullname" . }}-svc name: {{ include "rustfs.fullname" . }}-svc
namespace: {{ .Release.Namespace }}
{{- if and .Values.mode.distributed.enabled (eq .Values.ingress.className "traefik")}} {{- if and .Values.mode.distributed.enabled (eq .Values.ingress.className "traefik")}}
annotations: annotations:
{{- toYaml .Values.ingress.traefikAnnotations | nindent 4 }} {{- toYaml .Values.ingress.traefikAnnotations | nindent 4 }}
@@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "rustfs.serviceAccountName" . }} name: {{ include "rustfs.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
+1
View File
@@ -6,6 +6,7 @@ apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "rustfs.fullname" . }} name: {{ include "rustfs.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
{{- with .Values.commonLabels }} {{- with .Values.commonLabels }}
@@ -2,6 +2,7 @@ apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: "{{ include "rustfs.fullname" . }}-test-connection" name: "{{ include "rustfs.fullname" . }}-test-connection"
namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "rustfs.labels" . | nindent 4 }} {{- include "rustfs.labels" . | nindent 4 }}
annotations: annotations: