chore: 更新zzu部署脚本
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 @@
# 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 @@
name: http-metrics
selector:
app: spring-boot-admin
+
---
apiVersion: apps/v1
kind: Deployment
@@ -65,7 +55,7 @@
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 @@
- 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 @@
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 10
- imagePullSecrets:
- - name: harbor-registry
-
+ # imagePullSecrets:
+ # - name: harbor-registry
---
apiVersion: extensions/v1beta1
@@ -107,11 +92,10 @@
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 @@
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: