Browse Source

[Helm Chart] add missing apiVersion and kind in PVC templates for better compatibility with GitOps tools (#7408)

* fix: add missing apiVersion and kind in PVC templates

* fix: correct PVC template condition in SeaweedFS filer StatefulSet
pull/7236/merge
Guilherme Moreira Rodrigues 3 weeks ago
committed by GitHub
parent
commit
db35159a41
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
  2. 8
      k8s/charts/seaweedfs/templates/master/master-statefulset.yaml

14
k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml

@ -392,10 +392,12 @@ spec:
nodeSelector: nodeSelector:
{{ tpl .Values.filer.nodeSelector . | indent 8 | trim }} {{ tpl .Values.filer.nodeSelector . | indent 8 | trim }}
{{- end }} {{- end }}
{{- if and (.Values.filer.enablePVC) (eq .Values.filer.data.type "persistentVolumeClaim") }}
{{- if and (.Values.filer.enablePVC) (not .Values.filer.data) }}
# DEPRECATION: Deprecate in favor of filer.data section below # DEPRECATION: Deprecate in favor of filer.data section below
volumeClaimTemplates: volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data-filer name: data-filer
spec: spec:
accessModes: accessModes:
@ -411,7 +413,9 @@ spec:
{{- if $pvc_exists }} {{- if $pvc_exists }}
volumeClaimTemplates: volumeClaimTemplates:
{{- if eq .Values.filer.data.type "persistentVolumeClaim" }} {{- if eq .Values.filer.data.type "persistentVolumeClaim" }}
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data-filer name: data-filer
{{- with .Values.filer.data.annotations }} {{- with .Values.filer.data.annotations }}
annotations: annotations:
@ -425,7 +429,9 @@ spec:
storage: {{ .Values.filer.data.size }} storage: {{ .Values.filer.data.size }}
{{- end }} {{- end }}
{{- if eq .Values.filer.logs.type "persistentVolumeClaim" }} {{- if eq .Values.filer.logs.type "persistentVolumeClaim" }}
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: seaweedfs-filer-log-volume name: seaweedfs-filer-log-volume
{{- with .Values.filer.logs.annotations }} {{- with .Values.filer.logs.annotations }}
annotations: annotations:

8
k8s/charts/seaweedfs/templates/master/master-statefulset.yaml

@ -327,7 +327,9 @@ spec:
{{- if $pvc_exists }} {{- if $pvc_exists }}
volumeClaimTemplates: volumeClaimTemplates:
{{- if eq .Values.master.data.type "persistentVolumeClaim"}} {{- if eq .Values.master.data.type "persistentVolumeClaim"}}
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data-{{ .Release.Namespace }} name: data-{{ .Release.Namespace }}
{{- with .Values.master.data.annotations }} {{- with .Values.master.data.annotations }}
annotations: annotations:
@ -341,7 +343,9 @@ spec:
storage: {{ .Values.master.data.size }} storage: {{ .Values.master.data.size }}
{{- end }} {{- end }}
{{- if eq .Values.master.logs.type "persistentVolumeClaim"}} {{- if eq .Values.master.logs.type "persistentVolumeClaim"}}
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: seaweedfs-master-log-volume name: seaweedfs-master-log-volume
{{- with .Values.master.logs.annotations }} {{- with .Values.master.logs.annotations }}
annotations: annotations:

Loading…
Cancel
Save