Merge pull request #1214 from LazyDBA247-Anyvision/add-k8s-helm-chart

FILER/S3: filer Dir Buckets
This commit is contained in:
Chris Lu 2020-03-03 01:22:01 -08:00 committed by GitHub
commit 1f31295a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions

View file

@ -75,7 +75,6 @@ spec:
-cert.file=/usr/local/share/ca-certificates/client/tls.crt \ -cert.file=/usr/local/share/ca-certificates/client/tls.crt \
-key.file=/usr/local/share/ca-certificates/client/tls.key \ -key.file=/usr/local/share/ca-certificates/client/tls.key \
{{- end }} {{- end }}
-filer.dir.buckets={{ .Values.s3.filerDirBuckets }} \
{{- if .Values.s3.domainName }} {{- if .Values.s3.domainName }}
-domainName={{ .Values.s3.domainName }} \ -domainName={{ .Values.s3.domainName }} \
{{- end }} {{- end }}

View file

@ -8,7 +8,7 @@ metadata:
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
"helm.sh/hook": "pre-install" "helm.sh/hook": "pre-install"
stringData: stringData:
user: {{ "YourSWUser" | b64enc }} user: "YourSWUser"
password: "HardCodedPassword" password: "HardCodedPassword"
# better to random generate and create in DB # better to random generate and create in DB
# password: {{ randAlphaNum 10 | sha256sum | b64enc | trunc 32 }} # password: {{ randAlphaNum 10 | sha256sum | b64enc | trunc 32 }}

View file

@ -249,7 +249,7 @@ filer:
WEED_MYSQL_ENABLED: "true" WEED_MYSQL_ENABLED: "true"
WEED_MYSQL_HOSTNAME: "mysql-db-host" WEED_MYSQL_HOSTNAME: "mysql-db-host"
WEED_MYSQL_PORT: "3306" WEED_MYSQL_PORT: "3306"
WEED_MYSQL_DATABASE: "sw-database" WEED_MYSQL_DATABASE: "sw_database"
WEED_MYSQL_CONNECTION_MAX_IDLE: "10" WEED_MYSQL_CONNECTION_MAX_IDLE: "10"
WEED_MYSQL_CONNECTION_MAX_OPEN: "150" WEED_MYSQL_CONNECTION_MAX_OPEN: "150"
# enable usage of memsql as filer backend # enable usage of memsql as filer backend
@ -273,9 +273,6 @@ s3:
port: 8333 port: 8333
loggingOverrideLevel: null loggingOverrideLevel: null
# Folder on filer to store all buckets (default "/buckets")
filerDirBuckets: "/buckets"
# Suffix of the host name, {bucket}.{domainName} # Suffix of the host name, {bucket}.{domainName}
domainName: "" domainName: ""