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
					
					4 days ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
				  
				  No known key found for this signature in database
				  
				  	
						GPG Key ID: B5690EEEBB952194
				  	
				  
				
			
		
		
		
	
		
			
				 2 changed files with 
16 additions and 
6 deletions
			 
			
		 
		
			
				- 
					
					
					 
					k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
				
 
			
				- 
					
					
					 
					k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
				
 
			
		
		
			
				
					
					
						
							
								
									
										
											
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -392,10 +392,12 @@ spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      nodeSelector: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        {{ tpl .Values.filer.nodeSelector . | indent 8 | trim }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      {{- 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 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  volumeClaimTemplates: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  - metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  - apiVersion: v1 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    kind: PersistentVolumeClaim | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      name: data-filer | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      accessModes: | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -411,7 +413,9 @@ spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  {{- if $pvc_exists }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  volumeClaimTemplates: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- if eq .Values.filer.data.type "persistentVolumeClaim" }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - apiVersion: v1 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      kind: PersistentVolumeClaim | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        name: data-filer | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        {{- with .Values.filer.data.annotations }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        annotations: | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -425,7 +429,9 @@ spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            storage: {{ .Values.filer.data.size }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- end }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- if eq .Values.filer.logs.type "persistentVolumeClaim" }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - apiVersion: v1 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      kind: PersistentVolumeClaim | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        name: seaweedfs-filer-log-volume | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        {{- with .Values.filer.logs.annotations }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        annotations: | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
										
									
								
							
						 
					 
				 
			
		
			
				
					
					
						
							
								
									
										
											
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -327,7 +327,9 @@ spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  {{- if $pvc_exists }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					  volumeClaimTemplates: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- if eq .Values.master.data.type "persistentVolumeClaim"}} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - apiVersion: v1 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      kind: PersistentVolumeClaim | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        name: data-{{ .Release.Namespace }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        {{- with .Values.master.data.annotations }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        annotations: | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -341,7 +343,9 @@ spec: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            storage: {{ .Values.master.data.size }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- end }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    {{- if eq .Values.master.logs.type "persistentVolumeClaim"}} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    - apiVersion: v1 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      kind: PersistentVolumeClaim | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      metadata: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        name: seaweedfs-master-log-volume | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        {{- with .Values.master.logs.annotations }} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        annotations: | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |