From 4927f1b10fedf4e5f2ca9c1372c3a809c5c40cea Mon Sep 17 00:00:00 2001
From: caojingrui <mscaojr@163.com>
Date: Mon, 22 Jul 2024 21:15:25 +0800
Subject: [PATCH 1/2] udpate opengauss etherpad

---
 deploy/etherpad/deployment.yaml    | 28 ++++++++++++++++++++++++++++
 deploy/etherpad/kustomization.yaml |  2 +-
 deploy/etherpad/secret.yaml        |  6 ++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/deploy/etherpad/deployment.yaml b/deploy/etherpad/deployment.yaml
index 69e27230..1193a55e 100644
--- a/deploy/etherpad/deployment.yaml
+++ b/deploy/etherpad/deployment.yaml
@@ -180,6 +180,34 @@ spec:
             secretKeyRef:
               key: admin_password
               name: ether-secret-v2
+        - name: ISSUER_AUTHORIZATION_ENDPOINT
+          value: "https://id.opengauss.org/oneid/oidc/authorize"
+        - name: ISSUER_TOKEN_ENDPOINT
+          value: "https://id.opengauss.org/oneid/oidc/token"
+        - name: ISSUER_USERINFO_ENDPOINT
+          value: "https://id.opengauss.org/oneid/oidc/user"
+        - name: ISSUER_ENDPOINT
+          value: "https://id.opengauss.org/login"
+        - name: ISSUER_JWKS_URI
+          value: "https://id.opengauss.org"
+        - name: ISSUER_BASE_URL
+          value: "https://etherpad.opengauss.org"
+        - name: REQUIRE_AUTHENTICATION
+          value: "true"
+        - name: SKIN_NAME
+          value: "colibris"
+        - name: TOKEN_ENDPOINT_AUTH_METHODS_SUPPORTED
+          value: "client_secret_post"
+        - name: ISSUER_CLIENT_SECRET
+          valueFrom:
+            secretKeyRef:
+              key: ISSUER_CLIENT_SECRET
+              name: ether-secret-v2
+        - name: ISSUER_CLIENT_ID
+          valueFrom:
+            secretKeyRef:
+              key: ISSUER_CLIENT_ID
+              name: ether-secret-v2
         image: swr.cn-north-4.myhuaweicloud.com/opensourceway/common/etherpad:dev-1.8.18-238541
         imagePullPolicy: IfNotPresent
         name: etherpad-lite
diff --git a/deploy/etherpad/kustomization.yaml b/deploy/etherpad/kustomization.yaml
index e02e1300..cc64cc57 100644
--- a/deploy/etherpad/kustomization.yaml
+++ b/deploy/etherpad/kustomization.yaml
@@ -16,4 +16,4 @@ commonAnnotations:
   kubernetes.ops.region: hk
 images:
 - name: swr.cn-north-4.myhuaweicloud.com/opensourceway/common/etherpad
-  newTag: develop-93e26a
+  newTag: openeuler-v1.9.7-18e2b8
diff --git a/deploy/etherpad/secret.yaml b/deploy/etherpad/secret.yaml
index e5625fe5..7c0dad12 100644
--- a/deploy/etherpad/secret.yaml
+++ b/deploy/etherpad/secret.yaml
@@ -106,4 +106,10 @@ spec:
     port:
       key: port_v2
       path: secrets/data/infra-common/opengauss-etherpad
+    ISSUER_CLIENT_SECRET:
+      key: ISSUER_CLIENT_SECRET
+      path: secrets/data/infra-common/opengauss-etherpad
+    ISSUER_CLIENT_ID:
+      key: ISSUER_CLIENT_ID
+      path: secrets/data/infra-common/opengauss-etherpad
   name: ether-secret-v2
-- 
Gitee


From 4b2976a12090f8b390f8961f40d02ea62d6a97b1 Mon Sep 17 00:00:00 2001
From: caojingrui <mscaojr@163.com>
Date: Mon, 22 Jul 2024 21:18:33 +0800
Subject: [PATCH 2/2] update

---
 deploy/etherpad/deployment.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/deploy/etherpad/deployment.yaml b/deploy/etherpad/deployment.yaml
index 1193a55e..7894f9d5 100644
--- a/deploy/etherpad/deployment.yaml
+++ b/deploy/etherpad/deployment.yaml
@@ -194,8 +194,6 @@ spec:
           value: "https://etherpad.opengauss.org"
         - name: REQUIRE_AUTHENTICATION
           value: "true"
-        - name: SKIN_NAME
-          value: "colibris"
         - name: TOKEN_ENDPOINT_AUTH_METHODS_SUPPORTED
           value: "client_secret_post"
         - name: ISSUER_CLIENT_SECRET
-- 
Gitee