From 77a99c7f33d5f20be0de6053e086de786e4a97fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Thu, 10 Jun 2021 10:58:57 +0800
Subject: [PATCH] =?utf8?q?chore:=20=E6=9B=B4=E6=96=B0zzu=E9=83=A8=E7=BD=B2?=
 =?utf8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../0.infras/0.0.2.infras-sba.yaml            | 38 ++++++-------------
 .../4.0.user-data-service-installer.yaml      |  2 +-
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/project/zzu/k8s-rancher/0.infras/0.0.2.infras-sba.yaml b/project/zzu/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
index 70b3269..9b305c7 100644
--- a/project/zzu/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
+++ b/project/zzu/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: base
+  namespace: authx-service
   name: spring-boot-admin-env-secret
 data:
   # sbaadmin
@@ -14,22 +14,11 @@ data:
   # sbanimda
   SBA_PASSWORD: c2JhbmltZGE=
 
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: base
-  name: spring-boot-admin-env
-data:
-  SERVER_PORT: "8080"
-
-
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: base
+  namespace: authx-service
   name: spring-boot-admin-svc
   labels:
     app: spring-boot-admin
@@ -46,6 +35,7 @@ spec:
       name: http-metrics
   selector:
     app: spring-boot-admin
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -65,7 +55,7 @@ spec:
       containers:
       - name: spring-boot-admin
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/institute/spring-boot-admin:0.1.0-SNAPSHOT
+        image: hb.v.zzu.edu.cn/institute/spring-boot-admin:0.1.0-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -73,19 +63,15 @@ spec:
         - containerPort: 6060
           name: http-metrics
         envFrom:
-        - configMapRef:
-            name: jvm-env
-        - secretRef:
-            name: datasource-env-secret
         - secretRef:
             name: spring-boot-admin-env-secret
-        - configMapRef:
-            name: spring-boot-admin-env
         resources:
           requests:
-            memory: "400Mi"
+            cpu: 200m
+            memory: "256Mi"
           limits:
-            memory: "400Mi"
+            cpu: 1000m
+            memory: "256Mi"
         readinessProbe:
           tcpSocket:
             port: 8080
@@ -94,9 +80,8 @@ spec:
           timeoutSeconds: 5
           successThreshold: 1
           failureThreshold: 10
-      imagePullSecrets:
-        - name: harbor-registry
-
+      # imagePullSecrets:
+      #   - name: harbor-registry
 
 ---
 apiVersion: extensions/v1beta1
@@ -107,11 +92,10 @@ metadata:
 spec:
   rules:
   # 修改为学校的根域名
-  - host: sba.paas.xxx.edu.cn
+  - host: sba.s.zzu.edu.cn
     http:
       paths:
       - path: /
         backend:
           serviceName: spring-boot-admin-svc
           servicePort: http
-
diff --git a/project/zzu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/project/zzu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
index 3292853..abd84b3 100644
--- a/project/zzu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
+++ b/project/zzu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
@@ -28,7 +28,7 @@ spec:
       containers:
       - name: user-data-service-installer
         # 若使用了学校搭设的私有仓库，请修改
-        image: hb.v.zzu.edu.cn/goa/installer:1.1
+        image: hb.v.zzu.edu.cn/goa/installer:1.1.13-SNAPSHOT
         imagePullPolicy: Always
         envFrom:
         - configMapRef:
-- 
2.17.1