From 4524ffaf1a98b46278955ad6fb3712afc7b62ec5 Mon Sep 17 00:00:00 2001 From: Yeseul Date: Tue, 24 Sep 2024 17:41:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor(redirect-uri):=20Google=20Login=20?= =?UTF-8?q?Redirect=20URI=20env=EB=A1=9C=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 625aca98..1e7cb68d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.show_sql=true spring.jpa.show-sql=true oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID} oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET} -oauth2.client.registration.google.redirect-uri=https://release.chzzk-diary-server.shop/api/auth/code/google +oauth2.client.registration.google.redirect-uri=${GOOGLE_REDIRECT_URI} oauth2.client.registration.google.authorization-grant-type=code oauth2.client.registration.google.scope=profile email oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth From e6db2c637b46f9f3bce0d0041eecb116fced7225 Mon Sep 17 00:00:00 2001 From: jjaegii Date: Tue, 24 Sep 2024 18:00:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat(k8s/):=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=ED=98=B8=EC=B6=9C=20=EB=B0=A9=EB=B2=95=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/dev/deployment.yaml | 65 +++++-------------------------------- k8s/release/deployment.yaml | 65 +++++-------------------------------- 2 files changed, 18 insertions(+), 112 deletions(-) diff --git a/k8s/dev/deployment.yaml b/k8s/dev/deployment.yaml index ab075b97..f441eba2 100644 --- a/k8s/dev/deployment.yaml +++ b/k8s/dev/deployment.yaml @@ -18,59 +18,12 @@ spec: image: yeseulhong/grass-diary-release:latest ports: - containerPort: 8080 - env: - - name: GOOGLE_CLIENT_ID - valueFrom: - secretKeyRef: - name: google-secrets - key: GOOGLE_CLIENT_ID - - name: GOOGLE_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: google-secrets - key: GOOGLE_CLIENT_SECRET - - name: JWT_ACCESS_SECRET_KEY - valueFrom: - secretKeyRef: - name: jwt-secrets - key: JWT_ACCESS_SECRET_KEY - - name: JWT_REFRESH_SECRET_KEY - valueFrom: - secretKeyRef: - name: jwt-secrets - key: JWT_REFRESH_SECRET_KEY - - name: DB_SERVER_URL - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_SERVER_URL - - name: DB_USER_ID - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_USER_ID - - name: DB_USER_PW - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_USER_PW - - name: S3_ACCESS_PUBLIC_KEY - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_ACCESS_PUBLIC_KEY - - name: S3_ACCESS_SECRET_KEY - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_ACCESS_SECRET_KEY - - name: S3_BUCKET_NAME - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_BUCKET_NAME - - name: S3_SERVER_URL - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_SERVER_URL \ No newline at end of file + envFrom: + - secretRef: + name: google-secrets + - secretRef: + name: jwt-secrets + - secretRef: + name: db-secrets + - secretRef: + name: s3-secrets diff --git a/k8s/release/deployment.yaml b/k8s/release/deployment.yaml index e935dea1..7fe5ad8c 100644 --- a/k8s/release/deployment.yaml +++ b/k8s/release/deployment.yaml @@ -18,59 +18,12 @@ spec: image: yeseulhong/grass-diary-release:latest ports: - containerPort: 8080 - env: - - name: GOOGLE_CLIENT_ID - valueFrom: - secretKeyRef: - name: google-secrets - key: GOOGLE_CLIENT_ID - - name: GOOGLE_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: google-secrets - key: GOOGLE_CLIENT_SECRET - - name: JWT_ACCESS_SECRET_KEY - valueFrom: - secretKeyRef: - name: jwt-secrets - key: JWT_ACCESS_SECRET_KEY - - name: JWT_REFRESH_SECRET_KEY - valueFrom: - secretKeyRef: - name: jwt-secrets - key: JWT_REFRESH_SECRET_KEY - - name: DB_SERVER_URL - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_SERVER_URL - - name: DB_USER_ID - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_USER_ID - - name: DB_USER_PW - valueFrom: - secretKeyRef: - name: db-secrets - key: DB_USER_PW - - name: S3_ACCESS_PUBLIC_KEY - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_ACCESS_PUBLIC_KEY - - name: S3_ACCESS_SECRET_KEY - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_ACCESS_SECRET_KEY - - name: S3_BUCKET_NAME - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_BUCKET_NAME - - name: S3_SERVER_URL - valueFrom: - secretKeyRef: - name: s3-secrets - key: S3_SERVER_URL + envFrom: + - secretRef: + name: google-secrets + - secretRef: + name: jwt-secrets + - secretRef: + name: db-secrets + - secretRef: + name: s3-secrets