From d34da671eb3b38ece45a92288650f15803c04eae Mon Sep 17 00:00:00 2001 From: hoppla20 Date: Wed, 18 Mar 2026 20:58:29 +0100 Subject: [PATCH] fix(chart): bucket hook (#8680) * fix(chart): add imagePullPolicy and imagePullSecret to bucket-hook * chore(chart): add configurable bucket hook resources * fix(chart): add createBucketsHook value to allInOne and filer s3 blocks --- .../templates/shared/post-install-bucket-hook.yaml | 6 ++++++ k8s/charts/seaweedfs/values.yaml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml b/k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml index 86d1a943c..1a20a293a 100644 --- a/k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml +++ b/k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml @@ -64,9 +64,11 @@ spec: {{- if .Values.filer.podSecurityContext.enabled }} securityContext: {{- omit .Values.filer.podSecurityContext "enabled" | toYaml | nindent 8 }} {{- end }} + {{- include "seaweedfs.imagePullSecrets" $ | nindent 6 }} containers: - name: post-install-job image: {{ template "master.image" . }} + imagePullPolicy: {{ $.Values.global.imagePullPolicy | default "IfNotPresent" }} env: - name: WEED_CLUSTER_DEFAULT value: "sw" @@ -187,6 +189,10 @@ spec: {{- end }} - containerPort: {{ .Values.master.grpcPort }} #name: swfs-master-grpc + {{- with coalesce .Values.allInOne.s3.createBucketsHook.resources .Values.s3.createBucketsHook.resources .Values.filer.s3.createBucketsHook.resources }} + resources: + {{- toYaml . | nindent 10 }} + {{- end }} {{- if .Values.filer.containerSecurityContext.enabled }} securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 364334c16..9ea4649dc 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -915,6 +915,8 @@ filer: # versioning: Enabled # - name: bucket-b # anonymousRead: false + createBucketsHook: + resources: {} s3: enabled: false @@ -1082,6 +1084,9 @@ s3: failureThreshold: 100 timeoutSeconds: 10 + createBucketsHook: + resources: {} + ingress: enabled: false className: "" @@ -1485,6 +1490,8 @@ allInOne: # versioning: Enabled # - name: bucket-b # anonymousRead: false + createBucketsHook: + resources: {} # SFTP server configuration # Note: Most parameters below default to null, which means they inherit from