fix(addons): chart error label and pvcRetentionPolicy

Author: jianxiaoguo

addons/minio/2023/chart/minio/values.yaml

@@ -894,8 +894,8 @@ persistence:
 ## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
 persistentVolumeClaimRetentionPolicy:
   enabled: true
-  whenScaled: Deleted
-  whenDeleted: Deleted
+  whenScaled: Delete
+  whenDeleted: Delete
 ## @section Volume Permissions parameters
 
 ## Init containers parameters:

addons/redis-cluster/7.0/chart/redis-cluster/values.yaml

@@ -329,8 +329,8 @@ persistence:
 ## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
 persistentVolumeClaimRetentionPolicy:
   enabled: true
-  whenScaled: Deleted
-  whenDeleted: Deleted
+  whenScaled: Delete
+  whenDeleted: Delete
 ## Init containers parameters:
 ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
 ##

addons/seaweedfs/3/chart/seaweedfs/templates/filer/statefulset.yaml

@@ -20,12 +20,10 @@ spec:
   podManagementPolicy: OrderedReady
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-      app:  {{ include "seaweedfs.fullname" . }}
       app.kubernetes.io/component: filer
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
-        app:  {{ include "seaweedfs.fullname" . }}
         app.kubernetes.io/component: filer
     spec:
       {{- if .Values.filer.affinity }}
@@ -107,7 +105,7 @@ spec:
           timeoutSeconds: 1
           successThreshold: 1
           failureThreshold: 5
-        resources: {{ toYaml .Values.filer.resources | nindent 8 }}
+        resources: {{ toYaml .Values.filer.resources | nindent 10 }}
         volumeMounts:
         - name: {{ include "seaweedfs.configuration.configMap" . }}
           mountPath: /etc/seaweedfs

addons/seaweedfs/3/chart/seaweedfs/templates/filer/svc.yaml

@@ -30,7 +30,6 @@ spec:
   {{- end }}
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
-    app:  {{ include "seaweedfs.fullname" . }}
     app.kubernetes.io/component: filer
   ports:
   - name: s3

addons/seaweedfs/3/chart/seaweedfs/templates/master/statefulset.yaml

@@ -20,12 +20,10 @@ spec:
   podManagementPolicy: OrderedReady
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-      app: {{ include "seaweedfs.fullname" . }}
       app.kubernetes.io/component: master
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
-        app:  {{ include "seaweedfs.fullname" . }}
         app.kubernetes.io/component: master
     spec:
       {{- if .Values.master.affinity }}
@@ -92,7 +90,7 @@ spec:
           timeoutSeconds: 1
           successThreshold: 1
           failureThreshold: 5
-        resources: {{ toYaml .Values.master.resources | nindent 8 }}
+        resources: {{ toYaml .Values.master.resources | nindent 10 }}
         volumeMounts:
         - name: {{ include "seaweedfs.configuration.configMap" . }}
           mountPath: /etc/seaweedfs

addons/seaweedfs/3/chart/seaweedfs/templates/master/svc.yaml

@@ -29,7 +29,6 @@ spec:
   {{- end }}
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
-    app:  {{ include "seaweedfs.fullname" . }}
     app.kubernetes.io/component: master
   ports:
   - name: http

addons/seaweedfs/3/chart/seaweedfs/templates/networkpolicy.yaml

@@ -22,7 +22,7 @@ spec:
         matchLabels:
           {{ include "common.names.fullname" . }}-client: "true"
     - podSelector:
-        matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }}
+        matchLabels: {{- include "common.labels.matchLabels" . | nindent 10 }}
     {{- if .Values.networkPolicy.allowCurrentNamespace }}
     - namespaceSelector:
         matchLabels:

addons/seaweedfs/3/chart/seaweedfs/templates/volume/statefulset.yaml

@@ -20,12 +20,10 @@ spec:
   podManagementPolicy: OrderedReady
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-      app: {{ include "seaweedfs.fullname" . }}
       app.kubernetes.io/component: volume
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
-        app: {{ include "seaweedfs.fullname" . }}
         app.kubernetes.io/component: volume
     spec:
       {{- if .Values.volume.affinity }}
@@ -113,7 +111,7 @@ spec:
           timeoutSeconds: 1
           successThreshold: 1
           failureThreshold: 5
-        resources: {{ toYaml .Values.volume.resources | nindent 8 }}
+        resources: {{ toYaml .Values.volume.resources | nindent 10 }}
         volumeMounts:
         - name: {{ include "seaweedfs.configuration.configMap" . }}
           mountPath: /etc/seaweedfs

addons/seaweedfs/3/chart/seaweedfs/templates/volume/svc.yaml

@@ -29,7 +29,6 @@ spec:
   {{- end }}
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
-    app:  {{ include "seaweedfs.fullname" . }}
     app.kubernetes.io/component: volume
   ports:
   - name: http

addons/seaweedfs/3/chart/seaweedfs/values.yaml

@@ -202,8 +202,8 @@ master:
   ## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
   persistentVolumeClaimRetentionPolicy:
     enabled: true
-    whenScaled: Deleted
-    whenDeleted: Deleted
+    whenScaled: Delete
+    whenDeleted: Delete
 
 filer:
   replicas: 3
@@ -288,8 +288,8 @@ filer:
   ## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
   persistentVolumeClaimRetentionPolicy:
     enabled: true
-    whenScaled: Deleted
-    whenDeleted: Deleted
+    whenScaled: Delete
+    whenDeleted: Delete
 
 volume:
   replicas: 4
@@ -376,8 +376,8 @@ volume:
   ## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
   persistentVolumeClaimRetentionPolicy:
     enabled: true
-    whenScaled: Deleted
-    whenDeleted: Deleted
+    whenScaled: Delete
+    whenDeleted: Delete
 
 cronjob:
   scripts: |