From f137e1b0abfc4885209a2fe0a5a787426fe847be Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Mon, 3 Jul 2023 12:29:17 +0200 Subject: [PATCH] fix(env): Correct env variables for database --- manifests/configmap.yaml | 7 ------- manifests/deployment.yaml | 16 +++++++++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 09001d1..298a310 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -30,13 +30,6 @@ data: LFS_START_SERVER = true OFFLINE_MODE = false - [database] - DB_TYPE = postgres - LOG_SQL = false - SCHEMA = - SSL_MODE = disable - CHARSET = utf8 - [indexer] ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve diff --git a/manifests/deployment.yaml b/manifests/deployment.yaml index ac03609..8a03e09 100644 --- a/manifests/deployment.yaml +++ b/manifests/deployment.yaml @@ -21,19 +21,25 @@ spec: ports: - containerPort: 3000 env: - - name: DB_PASSWORD + - name: GITEA__database__DB_TYPE + value: "postgres" + - name: GITEA__database__HOST + value: "gitea.gitea.svc.cluster.local:5432" + - name: GITEA__database__NAME + value: "gitea" + - name: GITEA__database__USER + value: "gitea" + - name: GITEA__database__PASSWD valueFrom: secretKeyRef: name: gitea.gitea.credentials.postgresql.acid.zalan.do key: password - - name: GITEA__DATABASE__HOST - value: "postgresql://gitea:$(DB_PASSWORD)@gitea.gitea.svc.cluster.local:5432/gitea" - - name: GITEA__SERVER__LFS_JWT_SECRET + - name: GITEA__server__LFS_JWT_SECRET valueFrom: secretKeyRef: name: gitea-lfs-jwt-secret key: token - - name: GITEA__SECURITY__INTERNAL_TOKEN + - name: GITEA__security__INTERNAL_TOKEN valueFrom: secretKeyRef: name: gitea-lfs-jwt-secret