chore(addons): modify seaweedfs bind and networkpolicy

Author: jianxiaoguo

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

@@ -20,7 +20,7 @@ spec:
     spec:
       template:
         metadata:
-          labels:
+          labels: {{- include "common.labels.standard" . | nindent 12 }}
             component:  {{ include "seaweedfs.fullname" . }}
             app: {{ include "seaweedfs.cronjob.fullname" . }}
         spec:

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

@@ -19,12 +19,12 @@ spec:
     type: RollingUpdate
   podManagementPolicy: OrderedReady
   selector:
-    matchLabels:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
       component:  {{ include "seaweedfs.fullname" . }}
       app: {{ include "seaweedfs.filer.fullname" . }}
   template:
     metadata:
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         component:  {{ include "seaweedfs.fullname" . }}
         app: {{ include "seaweedfs.filer.fullname" . }}
     spec:

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

@@ -29,7 +29,7 @@ spec:
   clusterIP: {{ .Values.filer.service.clusterIP }}
   {{- end }}
   publishNotReadyAddresses: true
-  selector:
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     component:  {{ include "seaweedfs.fullname" . }}
     app: {{ include "seaweedfs.filer.fullname" . }}
   ports:

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

@@ -19,12 +19,12 @@ spec:
     type: RollingUpdate
   podManagementPolicy: OrderedReady
   selector:
-    matchLabels:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
       component:  {{ include "seaweedfs.fullname" . }}
       app: {{ include "seaweedfs.master.fullname" . }}
   template:
     metadata:
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         component:  {{ include "seaweedfs.fullname" . }}
         app: {{ include "seaweedfs.master.fullname" . }}
     spec:

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

@@ -28,7 +28,7 @@ spec:
   clusterIP: {{ .Values.master.service.clusterIP }}
   {{- end }}
   publishNotReadyAddresses: true
-  selector:
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     component:  {{ include "seaweedfs.fullname" . }}
     app: {{ include "seaweedfs.master.fullname" . }}
   ports:

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

@@ -16,10 +16,8 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   ingress:
   # Allow inbound connections
-  - ports:
-    - port: {{ .Values.filer.ports.s3 }}
     {{- if not .Values.networkPolicy.allowExternal }}
-    from:
+  - from:
     - podSelector:
         matchLabels:
           {{ include "common.names.fullname" . }}-client: "true"

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

@@ -19,12 +19,12 @@ spec:
     type: RollingUpdate
   podManagementPolicy: OrderedReady
   selector:
-    matchLabels:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
       component:  {{ include "seaweedfs.fullname" . }}
       app: {{ include "seaweedfs.volume.fullname" . }}
   template:
     metadata:
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         component:  {{ include "seaweedfs.fullname" . }}
         app: {{ include "seaweedfs.volume.fullname" . }}
     spec:

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

@@ -28,7 +28,7 @@ spec:
   clusterIP: {{ .Values.volume.service.clusterIP }}
   {{- end }}
   publishNotReadyAddresses: true
-  selector:
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     component:  {{ include "seaweedfs.fullname" . }}
     app: {{ include "seaweedfs.volume.fullname" . }}
   ports:

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

@@ -217,7 +217,7 @@ filer:
     ## e.g:
     ## clusterIP: None
     ##
-    clusterIP: None
+    clusterIP: ""
     ## @param filer.service.annotations Annotations for Seaweedfs filer service
     ##
     annotations:

addons/seaweedfs/3/plans/standard-v4s1024/bind.yaml

@@ -16,7 +16,7 @@ credential:
   - name: S3_PORT
     valueFrom:
       serviceRef:
-        name: {{ include "seaweedfs.configuration.configMap" . }}
+        name: {{ include "seaweedfs.filer.fullname" . }}
         jsonpath: '{.spec.ports[?(@.name=="s3")].port}'
 
   - name: S3_CONFIG