Browse Source
helm: enhance all-in-one deployment configuration (#7639)
helm: enhance all-in-one deployment configuration (#7639)
* helm: enhance all-in-one deployment configuration Fixes #7110 This PR addresses multiple issues with the all-in-one Helm chart configuration: ## New Features ### Configurable Replicas - Added `allInOne.replicas` (was hardcoded to 1) ### S3 Gateway Configuration - Added full S3 config under `allInOne.s3`: - port, httpsPort, domainName, allowEmptyFolder - enableAuth, existingConfigSecret, auditLogConfig - createBuckets for declarative bucket creation ### SFTP Server Configuration - Added full SFTP config under `allInOne.sftp`: - port, sshPrivateKey, hostKeysFolder, authMethods - maxAuthTries, bannerMessage, loginGraceTime - clientAliveInterval, clientAliveCountMax, enableAuth ### Command Line Arguments - Added `allInOne.extraArgs` for custom CLI arguments ### Update Strategy - Added `allInOne.updateStrategy.type` (Recreate/RollingUpdate) ### Secret Environment Variables - Added `allInOne.secretExtraEnvironmentVars` for injecting secrets ### Ingress Support - Added `allInOne.ingress` with S3, filer, and master sub-configs ### Storage Options - Enhanced `allInOne.data` with existingClaim support - Added PVC template for persistentVolumeClaim type ## CI Enhancements - Added comprehensive tests for all-in-one configurations - Tests cover replicas, S3, SFTP, extraArgs, strategies, PVC, ingress * helm: add real cluster deployment tests to CI - Deploy all-in-one cluster with S3 enabled on kind cluster - Test Master API (/cluster/status endpoint) - Test Filer API (file upload/download) - Test S3 API (/status endpoint) - Test S3 operations with AWS CLI: - Create/delete buckets - Upload/download/delete objects - Verify file content integrity * helm: simplify CI and remove all-in-one ingress Address review comments: - Remove detailed all-in-one template rendering tests from CI - Remove real cluster deployment tests from CI - Remove all-in-one ingress template and values configuration Keep the core improvements: - allInOne.replicas configuration - allInOne.s3.* full configuration - allInOne.sftp.* full configuration - allInOne.extraArgs support - allInOne.updateStrategy configuration - allInOne.secretExtraEnvironmentVars support * helm: address review comments - Fix post-install-bucket-hook.yaml: add filer.s3.enableAuth and filer.s3.existingConfigSecret to or statements for consistency - Fix all-in-one-deployment.yaml: use default function for s3.domainName - Fix all-in-one-deployment.yaml: use hasKey function for s3.allowEmptyFolder * helm: clarify updateStrategy multi-replica behavior Expand comment to warn users that RollingUpdate with multiple replicas requires shared storage (ReadWriteMany) to avoid data loss. * helm: address gemini-code-assist review comments - Make PVC accessModes configurable to support ReadWriteMany for multi-replica deployments (defaults to ReadWriteOnce) - Use configured readiness probe paths in post-install bucket hook instead of hardcoded paths, respecting custom configurations * helm: simplify allowEmptyFolder logic using coalesce Use coalesce function for cleaner template code as suggested in review. * helm: fix extraArgs trailing backslash issue Remove trailing backslash after the last extraArgs argument to avoid shell syntax error. Use counter to only add backslash between arguments. * helm: fix fallback logic for allInOne s3/sftp configuration Changes: - Set allInOne.s3.* and allInOne.sftp.* override parameters to null by default This allows proper inheritance from global s3.* and sftp.* settings - Fix allowEmptyFolder logic to use explicit nil checking instead of coalesce The coalesce/default functions treat 'false' as empty, causing incorrect fallback behavior when users want to explicitly set false values Addresses review feedback about default value conflicts with fallback logic. * helm: fix exec in bucket creation loop causing premature termination Remove 'exec' from the range loops that create and configure S3 buckets. The exec command replaces the current shell process, causing the script to terminate after the first bucket, preventing creation/configuration of subsequent buckets. * helm: quote extraArgs to handle arguments with spaces Use the quote function to ensure each item in extraArgs is treated as a single, complete argument even if it contains spaces. * helm: make s3/filer ingress work for both normal and all-in-one modes Modified s3-ingress.yaml and filer-ingress.yaml to dynamically select the service name based on deployment mode: - Normal mode: points to seaweedfs-s3 / seaweedfs-filer services - All-in-one mode: points to seaweedfs-all-in-one service This eliminates the need for separate all-in-one ingress templates. Users can now use the standard s3.ingress and filer.ingress settings for both deployment modes. * helm: fix allInOne.data.size and storageClass to use null defaults Change size and storageClass from empty strings to null so the template defaults (10Gi for size, cluster default for storageClass) will apply correctly. Empty strings prevent the Helm | default function from working. * helm: fix S3 ingress to include standalone S3 gateway case Add s3.enabled check to the $s3Enabled logic so the ingress works for: 1. Standalone S3 gateway (s3.enabled) 2. S3 on Filer (filer.s3.enabled) when not in all-in-one mode 3. S3 in all-in-one mode (allInOne.s3.enabled)pull/7645/head
Chris Lu
3 weeks ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 254 additions and 95 deletions
-
113k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
-
25k8s/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
-
18k8s/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
-
13k8s/charts/seaweedfs/templates/filer/filer-ingress.yaml
-
16k8s/charts/seaweedfs/templates/s3/s3-ingress.yaml
-
71k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
-
93k8s/charts/seaweedfs/values.yaml
@ -1,21 +1,28 @@ |
|||||
{{- if and .Values.allInOne.enabled (eq .Values.allInOne.data.type "persistentVolumeClaim") }} |
|
||||
|
{{- if .Values.allInOne.enabled }} |
||||
|
{{- if eq .Values.allInOne.data.type "persistentVolumeClaim" }} |
||||
apiVersion: v1 |
apiVersion: v1 |
||||
kind: PersistentVolumeClaim |
kind: PersistentVolumeClaim |
||||
metadata: |
metadata: |
||||
name: {{ .Values.allInOne.data.claimName }} |
|
||||
|
name: {{ template "seaweedfs.name" . }}-all-in-one-data |
||||
|
namespace: {{ .Release.Namespace }} |
||||
labels: |
labels: |
||||
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} |
||||
|
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} |
||||
|
app.kubernetes.io/managed-by: {{ .Release.Service }} |
||||
|
app.kubernetes.io/instance: {{ .Release.Name }} |
||||
app.kubernetes.io/component: seaweedfs-all-in-one |
app.kubernetes.io/component: seaweedfs-all-in-one |
||||
{{- if .Values.allInOne.annotations }} |
|
||||
|
{{- with .Values.allInOne.data.annotations }} |
||||
annotations: |
annotations: |
||||
{{- toYaml .Values.allInOne.annotations | nindent 4 }} |
|
||||
|
{{- toYaml . | nindent 4 }} |
||||
{{- end }} |
{{- end }} |
||||
spec: |
spec: |
||||
accessModes: |
accessModes: |
||||
- ReadWriteOnce |
|
||||
resources: |
|
||||
requests: |
|
||||
storage: {{ .Values.allInOne.data.size }} |
|
||||
|
{{- toYaml (.Values.allInOne.data.accessModes | default (list "ReadWriteOnce")) | nindent 4 }} |
||||
{{- if .Values.allInOne.data.storageClass }} |
{{- if .Values.allInOne.data.storageClass }} |
||||
storageClassName: {{ .Values.allInOne.data.storageClass }} |
storageClassName: {{ .Values.allInOne.data.storageClass }} |
||||
{{- end }} |
{{- end }} |
||||
{{- end }} |
|
||||
|
resources: |
||||
|
requests: |
||||
|
storage: {{ .Values.allInOne.data.size | default "10Gi" }} |
||||
|
{{- end }} |
||||
|
{{- end }} |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue