diff --git a/infra/k8s/web/.gitignore b/infra/k8s/web/.gitignore index 5b6b0720c9ee..733c65dc319e 100644 --- a/infra/k8s/web/.gitignore +++ b/infra/k8s/web/.gitignore @@ -1 +1 @@ -config.yaml +./config.yaml diff --git a/infra/k8s/web/config.yaml b/infra/k8s/web/templates/config.yaml similarity index 94% rename from infra/k8s/web/config.yaml rename to infra/k8s/web/templates/config.yaml index 988f7a87c48f..4da7325f31c1 100644 --- a/infra/k8s/web/config.yaml +++ b/infra/k8s/web/templates/config.yaml @@ -9,7 +9,7 @@ data: #───┘ URL └───────────────────────────────────────────────────── # Final accessible URL seen by a user. - url: https://mk8stest.na2na.dev/ + url: {{ .Values.service.host }} # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE # URL SETTINGS AFTER THAT! @@ -37,15 +37,15 @@ data: #───┘ PostgreSQL configuration └──────────────────────────────── db: - host: postgres-cluster-rw.misskey.svc.cluster.local - port: 5432 + host: {{ .Values.database.host }} + port: {{ .Values.database.port }} # Database name - db: misskey + db: {{ .Values.database.db }} # Auth - user: misskey - pass: misskey + user: {{ .Values.database.user }} + pass: {{ .Values.database.pass }} # Whether disable Caching queries #disableCache: true @@ -152,6 +152,9 @@ data: # Upload or download file size limits (bytes) maxFileSize: 5000000000 + # default: false + misskeyBlockMentionsFromUnfamiliarRemoteUsers: true + kind: ConfigMap metadata: diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml index 6ecafce0f3ce..ac209bc31fa7 100644 --- a/infra/k8s/web/values.yaml +++ b/infra/k8s/web/values.yaml @@ -5,7 +5,15 @@ image: tag: "2023.11.1-na2na-v4" pullPolicy: Always +database: + host: "hoge.local" + port: 5432 + db: "misskey" + user: "misskey" + pass: "misskey" + service: + host: "https://mk8stest.na2na.dev/" type: NodePort port: 3000 nodePort: 30000