lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-24 06:43:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix/s3 config secret (#5302)

Browse Source
This commit is contained in:
spastorclovr
2024-02-14 23:33:05 +01:00
committed by GitHub
parent c694cb4e7d
commit 3b5d8ffb70
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/charts/seaweedfs/templates/filer-statefulset.yaml
View File

@@ -286,7 +286,7 @@ spec:
- name: db-schema-config-volume - name: db-schema-config-volume
configMap: configMap:
name: seaweedfs-db-init-config name: seaweedfs-db-init-config
{{- if .Values.filer.s3.enableAuth }} {{- if and .Values.filer.s3.enabled .Values.filer.s3.enableAuth }}
- name: config-users - name: config-users
secret: secret:
defaultMode: 420 defaultMode: 420

2
k8s/charts/seaweedfs/templates/s3-deployment.yaml
View File

@@ -191,7 +191,7 @@ spec:
- name: config-users - name: config-users
secret: secret:
defaultMode: 420 defaultMode: 420
{{- if .Values.filer.s3.existingConfigSecret }} {{- if .Values.s3.existingConfigSecret }}
secretName: {{ .Values.s3.existingConfigSecret }} secretName: {{ .Values.s3.existingConfigSecret }}
{{- else }} {{- else }}
secretName: seaweedfs-s3-secret secretName: seaweedfs-s3-secret

2
k8s/charts/seaweedfs/templates/s3-secret.yaml
View File

@@ -1,4 +1,4 @@
{{- if not (or .Values.filer.s3.skipAuthSecretCreation .Values.s3.skipAuthSecretCreation .Values.filer.s3.existingConfigSecret .Values.s3.existingConfigSecret ) }} {{- if or (and .Values.filer.s3.enabled .Values.filer.s3.enableAuth (not .Values.filer.s3.existingConfigSecret)) (and .Values.s3.enabled .Values.s3.enableAuth (not .Values.s3.existingConfigSecret)) }}
{{- $access_key_admin := randAlphaNum 16 -}} {{- $access_key_admin := randAlphaNum 16 -}}
{{- $secret_key_admin := randAlphaNum 32 -}} {{- $secret_key_admin := randAlphaNum 32 -}}
{{- $access_key_read := randAlphaNum 16 -}} {{- $access_key_read := randAlphaNum 16 -}}

10
k8s/charts/seaweedfs/values.yaml
View File

@@ -610,7 +610,7 @@ filer:
# key: password # key: password
s3: s3:
enabled: true enabled: false
port: 8333 port: 8333
# add additional https port # add additional https port
httpsPort: 0 httpsPort: 0
@@ -619,11 +619,10 @@ filer:
# Suffix of the host name, {bucket}.{domainName} # Suffix of the host name, {bucket}.{domainName}
domainName: "" domainName: ""
# enable user & permission to s3 (need to inject to all services) # enable user & permission to s3 (need to inject to all services)
enableAuth: true enableAuth: false
skipAuthSecretCreation: false
# set to the name of an existing kubernetes Secret with the s3 json config file # set to the name of an existing kubernetes Secret with the s3 json config file
# should have a secret key called seaweedfs_s3_config with an inline json configure # should have a secret key called seaweedfs_s3_config with an inline json configure
existingConfigSecret: "" existingConfigSecret: null
auditLogConfig: {} auditLogConfig: {}
# You may specify buckets to be created during the install process. # You may specify buckets to be created during the install process.
# Buckets may be exposed publicly by setting `anonymousRead` to `true` # Buckets may be exposed publicly by setting `anonymousRead` to `true`
@@ -650,10 +649,9 @@ s3:
allowEmptyFolder: true allowEmptyFolder: true
# enable user & permission to s3 (need to inject to all services) # enable user & permission to s3 (need to inject to all services)
enableAuth: false enableAuth: false
skipAuthSecretCreation: false
# set to the name of an existing kubernetes Secret with the s3 json config file # set to the name of an existing kubernetes Secret with the s3 json config file
# should have a secret key called seaweedfs_s3_config with an inline json config # should have a secret key called seaweedfs_s3_config with an inline json config
existingConfigSecret: false existingConfigSecret: null
auditLogConfig: {} auditLogConfig: {}
# Suffix of the host name, {bucket}.{domainName} # Suffix of the host name, {bucket}.{domainName}