Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

补全：archery 和 goinception 剩余的数据库变量，优化 archery 的一些注释 #45

Merged
merged 2 commits into from
May 7, 2024
Merged

补全：archery 和 goinception 剩余的数据库变量，优化 archery 的一些注释 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78fe1d2
补全：goinception 剩余的数据库变量
Feb 16, 2023
774d713
update
LeoQuote May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions charts/archery/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ ingress:
# subcharts redis
redis:
embedded: true
# url: "redis://127.0.0.1:6379/0"
# url: "redis://<authpwd>@<server_addr>:6379/0"
# urlSecret: ""
# urlSecretKey: "CACHE_URL"
# dingdingUrl: "redis://127.0.0.1:6379/1"
# dingdingUrl: "redis://<authpwd>@<server_addr>:6379/1"
# dingdingUrlSecret: ""
# dingdingUrlSecretKey: "DINGDING_CACHE_URL"
# embedded 为 false, 会使用外部的 redis, 下方的 redis 就不会生效
Expand All @@ -61,7 +61,7 @@ redis:
# subcharts mysql
mysql:
embedded: true
# url: "mysql://root:@127.0.0.1:3306/archery"
# url: "mysql://<user>:<passwd>@<server_addr>:3306/archery"
# urlSecret: ""
# urlSecretKey: "DATABASE_URL"
# embedded 为 false时, 会使用外部的 mysql, 下方的 mysql 配置不会生效
Expand Down Expand Up @@ -142,8 +142,15 @@ goinception:
targetPort: 4000

initEnv:
- name: BACKUP_HOST
value: ""
- name: BACKUP_PORT
value: ""
# mysql superuser
- name: BACKUP_USER
value: ""
- name: BACKUP_PASSWORD
value: "my-password"
value: ""
# you can override more options , please see goinception chart readme and values
# https://github.com/douban/charts/blob/master/charts/goinception/values.yaml

Expand Down
2 changes: 1 addition & 1 deletion charts/goinception/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
command: ['sh', '-c',
'sed "s/BACKUP_PASSWORD_PLACEHOLDER/${BACKUP_PASSWORD}/g" /etc/goinception-template/config.toml.template > /etc/goinception/config.toml']
'sed "s/BACKUP_HOST_PLACEHOLDER/${BACKUP_HOST}/g;s/BACKUP_PORT_PLACEHOLDER/${BACKUP_PORT}/g;s/BACKUP_USER_PLACEHOLDER/${BACKUP_USER}/g;s/BACKUP_PASSWORD_PLACEHOLDER/${BACKUP_PASSWORD}/g" /etc/goinception-template/config.toml.template > /etc/goinception/config.toml; cat /etc/goinception/config.toml']
volumeMounts:
- name: goinception-config-volume
mountPath: /etc/goinception
Expand Down
16 changes: 10 additions & 6 deletions charts/goinception/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ deployment:
annotations: {}

initEnv:
- name: BACKUP_HOST
value: ""
- name: BACKUP_PORT
value: ""
- name: BACKUP_USER
value: ""
- name: BACKUP_PASSWORD
value: "my-password"
# - name: xxx
# value: xxx
value: ""

resources: {}

Expand Down Expand Up @@ -85,9 +89,9 @@ configMap:
check_float_double=true
support_charset="utf8,utf8mb4"
support_collation="utf8_general_ci,utf8mb4_general_ci"
backup_host="archery-mysql"
backup_port=3306
backup_user="root"
backup_host="BACKUP_HOST_PLACEHOLDER"
backup_port=BACKUP_PORT_PLACEHOLDER
backup_user="BACKUP_USER_PLACEHOLDER"
backup_password="BACKUP_PASSWORD_PLACEHOLDER"
#安全更新是否开启.
#-1表示不做操作,基于远端数据库[默认值]
Expand Down
Loading