diff --git a/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml b/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml index 1dbacce0..7922aa1d 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs -appVersion: "3.94" +appVersion: "3.96" # Dev note: Trigger a helm chart release by `git tag -a helm-` -version: 4.0.394 +version: 4.0.396 diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml similarity index 98% rename from packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-deployment.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml index 1086d6a4..86bb45a8 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-deployment.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml @@ -51,7 +51,7 @@ spec: {{- end }} {{- if .Values.allInOne.topologySpreadConstraints }} topologySpreadConstraints: - {{ tpl .Values.allInOne.topologySpreadConstraint . | nindent 8 | trim }} + {{ tpl .Values.allInOne.topologySpreadConstraints . | nindent 8 | trim }} {{- end }} {{- if .Values.allInOne.tolerations }} tolerations: @@ -142,6 +142,9 @@ spec: {{- if .Values.allInOne.disableHttp }} -disableHttp={{ .Values.allInOne.disableHttp }} \ {{- end }} + {{- if and (.Values.volume.dataDirs) (index .Values.volume.dataDirs 0 "maxVolumes") }} + -volume.max={{ index .Values.volume.dataDirs 0 "maxVolumes" }} \ + {{- end }} -master.port={{ .Values.master.port }} \ {{- if .Values.global.enableReplication }} -master.defaultReplication={{ .Values.global.replicationPlacement }} \ diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-pvc.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-pvc.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-service.yml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-service.yml rename to packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/ca-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/ca-cert.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert-caissuer.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cert-caissuer.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert-issuer.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cert-issuer.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/client-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/client-cert.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-cert.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-cert.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/volume-cert.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-bucket-class.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cosi-bucket-class.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cosi-cluster-role.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-service-account.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cosi-service-account.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-ingress.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-service-client.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-service-client.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-service.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml similarity index 99% rename from packages/system/seaweedfs/charts/seaweedfs/templates/filer-statefulset.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml index d2dad009..5c1a0950 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer-statefulset.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml @@ -53,7 +53,7 @@ spec: {{- $configSecret := (lookup "v1" "Secret" .Release.Namespace .Values.filer.s3.existingConfigSecret) | default dict }} checksum/s3config: {{ $configSecret | toYaml | sha256sum }} {{- else }} - checksum/s3config: {{ include (print .Template.BasePath "/s3-secret.yaml") . | sha256sum }} + checksum/s3config: {{ include (print .Template.BasePath "/s3/s3-secret.yaml") . | sha256sum }} {{- end }} spec: restartPolicy: {{ default .Values.global.restartPolicy .Values.filer.restartPolicy }} diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-configmap.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-ingress.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-service.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/master-statefulset.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/s3-deployment.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml similarity index 96% rename from packages/system/seaweedfs/charts/seaweedfs/templates/s3-ingress.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml index 7b279793..f9c36206 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-ingress.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml @@ -41,6 +41,6 @@ spec: servicePort: {{ .Values.s3.port }} {{- end }} {{- if .Values.s3.ingress.host }} - host: {{ .Values.s3.ingress.host }} + host: {{ .Values.s3.ingress.host | quote }} {{- end }} {{- end }} diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/s3-secret.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/s3-service.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/s3-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/sftp-deployment.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/sftp-secret.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/sftp-service.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/sftp-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/_helpers.tpl b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/_helpers.tpl rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/cluster-role.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/notification-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/notification-configmap.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/post-install-bucket-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/post-install-bucket-hook.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/seaweedfs-grafana-dashboard.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/seaweedfs-grafana-dashboard.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/secret-seaweedfs-db.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/secret-seaweedfs-db.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/service-account.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/service-account.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/volume-service.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml similarity index 100% rename from packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml rename to packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml diff --git a/packages/system/seaweedfs/charts/seaweedfs/values.yaml b/packages/system/seaweedfs/charts/seaweedfs/values.yaml index b1b97de1..8c92d3fd 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/values.yaml @@ -1088,7 +1088,6 @@ allInOne: enabled: false imageOverride: null restartPolicy: Always - replicas: 1 # Core configuration idleTimeout: 30 # Connection idle seconds @@ -1231,7 +1230,7 @@ cosi: region: "" sidecar: - image: gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995 + image: gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20250711-controllerv0.2.0-rc1-80-gc2f6e65 # Resource requests, limits, etc. for the server cluster placement. This # should map directly to the value of the resources field for a PodSpec, # formatted as a multi-line string. By default no direct resource request diff --git a/packages/system/seaweedfs/patches/fix-volume-servicemonitor.patch b/packages/system/seaweedfs/patches/fix-volume-servicemonitor.patch index b6b40527..3ca91c8b 100644 --- a/packages/system/seaweedfs/patches/fix-volume-servicemonitor.patch +++ b/packages/system/seaweedfs/patches/fix-volume-servicemonitor.patch @@ -1,6 +1,6 @@ -diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml ---- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml (revision 8951bc13d7d02b5e6982a239570ed58ed7cb025a) -+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-servicemonitor.yaml (revision fa4fff2292c4b79a92db5cd654a3c6bf590252a6) +diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml +--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml (revision 8951bc13d7d02b5e6982a239570ed58ed7cb025a) ++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml (revision fa4fff2292c4b79a92db5cd654a3c6bf590252a6) @@ -21,9 +21,9 @@ {{- with $.Values.global.monitoring.additionalLabels }} {{- toYaml . | nindent 4 }} @@ -12,4 +12,4 @@ diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-service + {{- toYaml $.Values.volume.annotations | nindent 4 }} {{- end }} spec: - endpoints: \ No newline at end of file + endpoints: diff --git a/packages/system/seaweedfs/patches/resize-api-server-annotation.diff b/packages/system/seaweedfs/patches/resize-api-server-annotation.diff index 2b41f297..43af4579 100644 --- a/packages/system/seaweedfs/patches/resize-api-server-annotation.diff +++ b/packages/system/seaweedfs/patches/resize-api-server-annotation.diff @@ -1,7 +1,7 @@ -diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml +diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml index 436a785..9f186ea 100644 ---- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml -+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-resize-hook.yaml +--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml ++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml @@ -45,6 +45,9 @@ metadata: helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation spec: diff --git a/packages/system/seaweedfs/patches/retention-policy-delete.yaml b/packages/system/seaweedfs/patches/retention-policy-delete.yaml index d57d1ea4..af1c73cf 100644 --- a/packages/system/seaweedfs/patches/retention-policy-delete.yaml +++ b/packages/system/seaweedfs/patches/retention-policy-delete.yaml @@ -1,7 +1,7 @@ -diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml +diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml index 0a70d8c..eb3bb91 100644 ---- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml -+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume-statefulset.yaml +--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml ++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml @@ -10,6 +10,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/packages/system/seaweedfs/templates/hook.yaml b/packages/system/seaweedfs/templates/hook.yaml index 133357ab..f4d04bb9 100644 --- a/packages/system/seaweedfs/templates/hook.yaml +++ b/packages/system/seaweedfs/templates/hook.yaml @@ -2,7 +2,7 @@ {{- $configMap := lookup "v1" "ConfigMap" .Release.Namespace "seaweedfs-deployed-version" }} {{- if $configMap }} {{- $deployedVersion := dig "data" "version" "0" $configMap }} - {{- if ge $deployedVersion "1" }} + {{- if ge $deployedVersion "2" }} {{- $shouldRunUpdateHook = false }} {{- end }} {{- end }} diff --git a/packages/system/seaweedfs/templates/version.yaml b/packages/system/seaweedfs/templates/version.yaml index f80f13b6..4b7298b2 100644 --- a/packages/system/seaweedfs/templates/version.yaml +++ b/packages/system/seaweedfs/templates/version.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: seaweedfs-deployed-version data: - version: "1" + version: "2" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 14d97c89..f43619a5 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -81,7 +81,7 @@ seaweedfs: auditLogConfig: {} s3: enabled: true - enableAuth: true + enableAuth: false readinessProbe: scheme: HTTPS logs: