From: 刘洪青 <loie.engine@gmail.com>
Date: Mon, 7 Sep 2020 04:21:47 +0000 (+0800)
Subject: chore: 完善标准产品部署脚本
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d288d9c175bd75758c108bb73433e406d423f6c1;p=institute%2Fdeploy-authx-service.git

chore: 完善标准产品部署脚本
---

diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml
index f955295..c7e7a8f 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml
@@ -95,20 +95,20 @@ spec:
 
 
 # 该 ingress 配置可选，主要用于实施调试用
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-#   name: minio-ingress
-#   namespace: authx-service
-# spec:
-#   rules:
-#   # 修改为学校的根域名
-#   - host: minio.paas.xxx.edu.cn
-#     http:
-#       paths:
-#       - path: /
-#         backend:
-#           serviceName: minio-svc
-#           servicePort: http
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: minio-ingress
+  namespace: authx-service
+spec:
+  rules:
+  # 修改为学校的根域名
+  - host: minio.paas.xxx.edu.cn
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: minio-svc
+          servicePort: http
 
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png
new file mode 100644
index 0000000..fd1a680
Binary files /dev/null and b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png differ
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png
new file mode 100644
index 0000000..fd1a680
Binary files /dev/null and b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png differ
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
index f37928d..89d9da0 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
@@ -28,7 +28,7 @@ spec:
       containers:
       - name: cas-server-installer
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/cas-server/cas-server-installer:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/cas-server/cas-server-installer:1.0.1-SNAPSHOT
         imagePullPolicy: Always
         envFrom:
         - configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
index 6807b42..f8e1452 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
@@ -86,7 +86,7 @@ spec:
       containers:
       - name: cas-server-sa-api
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.0.1-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
index 3ab8cee..75cc41e 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
@@ -62,7 +62,7 @@ spec:
       containers:
       - name: cas-server-security-engine
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.0.1-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 6060
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
index cdc638e..cbd694e 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
@@ -201,7 +201,7 @@ spec:
       containers:
       - name: cas-server-site-webapp
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.0.1-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
index 6e38682..9acad5c 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
@@ -42,7 +42,7 @@ spec:
           containers:
           - name: cas-server-datax-job
             # 若使用了学校搭设的私有仓库，请修改
-            image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.0.0-SNAPSHOT
+            image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.0.1-SNAPSHOT
             imagePullPolicy: Always
             envFrom:
             - configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml
index 60e0233..612a50b 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml
@@ -24,6 +24,8 @@ data:
   SPRING_REDIS_JEDIS_POOL_MAXIDLE: "100"
   SPRING_REDIS_JEDIS_POOL_MINIDLE: "100"
 
+  LOGGING_LEVEL_COM_SUPWISDOM_INSITITUTE_TOKEN_SERVER: INFO
+
 
   # **修改** 从消息中心申请
   MESSAGECENTER_ENABLED: "false"
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
index 1bba8ac..e6f094f 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
@@ -53,7 +53,7 @@ spec:
       containers:
       - name: security-center-ui
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/personal-security-center/security-center-ui:0.0.1
+        image: harbor.supwisdom.com/personal-security-center/security-center-ui:1.0.0
         imagePullPolicy: Always
         ports:
         - containerPort: 80