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.

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

helm valuesの整理 #568

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions infra/k8s/web/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data:
#───┘ URL └─────────────────────────────────────────────────────

# Final accessible URL seen by a user.
url: {{ .Values.service.host }}
hostUrl: {{ .Values.misskey-cm.hostUrl }}

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
# URL SETTINGS AFTER THAT!
Expand Down Expand Up @@ -37,15 +37,15 @@ data:
#───┘ PostgreSQL configuration └────────────────────────────────

db:
host: {{ .Values.database.host }}
port: {{ .Values.database.port }}
host: {{ .Values.misskey-cm.database.host }}
port: {{ .Values.misskey-cm.database.port }}

# Database name
db: {{ .Values.database.db }}
db: {{ .Values.misskey-cm.database.db }}

# Auth
user: {{ .Values.database.user }}
pass: {{ .Values.database.pass }}
user: {{ .Values.misskey-cm.database.user }}
pass: {{ .Values.misskey-cm.database.pass }}

# Whether disable Caching queries
#disableCache: true
Expand All @@ -59,8 +59,8 @@ data:
#───┘ Redis configuration └─────────────────────────────────────

redis:
host: {{ .Values.redis.host }}
port: {{ .Values.redis.port }}
host: {{ .Values.misskey-cm.redis.host }}
port: {{ .Values.misskey-cm.redis.port }}
#family: 0 # 0=Both, 4=IPv4, 6=IPv6
#pass: example-pass
#prefix: example-prefix
Expand Down Expand Up @@ -154,7 +154,7 @@ data:
# Upload or download file size limits (bytes)
maxFileSize: 5000000000
# default: false
misskeyBlockMentionsFromUnfamiliarRemoteUsers: true
misskeyBlockMentionsFromUnfamiliarRemoteUsers: {{ .Values.misskey-cm.misskeyBlockMentionsFromUnfamiliarRemoteUsers }}


kind: ConfigMap
Expand Down
4 changes: 2 additions & 2 deletions infra/k8s/web/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ spec:
spec:
containers:
- name: web
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
image: "{{ .Values.image.web.repository }}:{{ .Values.image.web.tag }}"
imagePullPolicy: {{ .Values.image.web.pullPolicy }}
ports:
- containerPort: 3000
readinessProbe:
Expand Down
32 changes: 17 additions & 15 deletions infra/k8s/web/values.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
image:
repository: na2na/misskey-na2na
tag: "2024.5.0-na2na-v3"
pullPolicy: Always

database:
host: "hoge.local"
port: 5432
db: "misskey"
user: "misskey"
pass: "misskey"

redis:
host: "localhost"
port: 6379
web:
repository: na2na/misskey-na2na
tag: "2024.5.0-na2na-v3"
pullPolicy: IfNotPresent

misskey-cm:
hostUrl: "https://mk8stest.na2na.dev/"
database:
host: "hoge.local"
port: 5432
db: "misskey"
user: "misskey"
pass: "misskey"
redis:
host: "localhost"
port: 6379
misskeyBlockMentionsFromUnfamiliarRemoteUsers: false

service:
host: "https://mk8stest.na2na.dev/"
type: ClusterIP
port: 3000

Expand Down