chore: 将admin-center下的 admin-center-management 迁移至 admin-platform 下的 admin-management
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql b/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
index 7bd3c0b..9f45a1a 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
@@ -19,6 +19,37 @@
commit;
+-- admin-management 的认证对接信息
+
+INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
+ `NAME`, `DESCRIPTION`, `INFORMATION_URL`, `LOGOUT_URL`,
+ `RESPONSE_TYPE`, `LOGOUT_TYPE`,
+ `EVALUATION_ORDER`, `FRIENDLY_NAME`, `REGISTERED_SERVICE_ID`, `SERVICE_ID`,
+ `ENABLED`, `SSO_ENABLED`, `REQUIRE_ALL_ATTRIBUTES`,
+ `APPLICATION_ID`, `EXTERNAL_ID`)
+VALUES ('20', '1', 0, 'admin', '2020-07-01 00:00:00',
+ '基础管理', '基础管理', 'https://admin-management.paas.example.com', 'https://admin-management.paas.example.com/?clearToken=clearToken',
+ 'REDIRECT', 'FRONT_CHANNEL',
+ 20, '基础管理', 20, 'https://admin-management.paas.example.com/(.*)',
+ 1, 1, 1,
+ '20', '20');
+
+commit;
+
+-- 修改根域名
+update TB_SERVICE
+set
+ INFORMATION_URL='http://admin-management.paas.example.com',
+ LOGOUT_URL='http://admin-management.paas.example.com/?clearToken=clearToken',
+ SERVICE_ID='http://admin-management.paas.example.com/(.*)',
+ ID_TOKEN_ENABLED=1,
+ JWT_AS_SERVICE_TICKET=1,
+ APPLICATION_DOMAIN='admin-management.paas.example.com'
+where ID='20'; -- todo, modify
+
+commit;
+
+
-- admin-platform 的认证对接信息
INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
@@ -50,6 +81,7 @@
commit;
+
use user_authz;
-- 更新 admin-center 下的角色同步地址
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
index cdee7ff..af2e005 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
@@ -43,21 +43,21 @@
# servicePort: http
-# 云平台管理前端
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- namespace: admin-center
- name: admin-center-management-ingress
-spec:
- rules:
- # 修改为学校的根域名
- - host: admin-management.paas.xxx.edu.cn
- http:
- paths:
- - path: /
- backend:
- serviceName: admin-center-management-svc
- servicePort: http
+# 云平台管理前端（废弃）
+# ---
+# apiVersion: extensions/v1beta1
+# kind: Ingress
+# metadata:
+# namespace: admin-center
+# name: admin-center-management-ingress
+# spec:
+# rules:
+# # 修改为学校的根域名
+# - host: admin-management.paas.xxx.edu.cn
+# http:
+# paths:
+# - path: /
+# backend:
+# serviceName: admin-center-management-svc
+# servicePort: http
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
index f8c644b..5b699cc 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
@@ -1,11 +1,30 @@
# 2.admin-platform-ingresses.yaml
+# 基础管理
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
- name: admin-platform-ingress
namespace: admin-platform
+ name: admin-management-ingress
+spec:
+ rules:
+ # 修改为学校的根域名
+ - host: admin-management.paas.xxx.edu.cn
+ http:
+ paths:
+ - path: /
+ backend:
+ serviceName: admin-management-svc
+ servicePort: http
+
+# 云平台
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ namespace: admin-platform
+ name: admin-platform-ingress
spec:
rules:
# 修改为学校的根域名
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml
new file mode 100644
index 0000000..e46165b
--- /dev/null
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml
@@ -0,0 +1,80 @@
+# 4.1.admin-management.yaml
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: admin-platform
+ name: admin-management-env
+data:
+ SCHOOL_NAME: sw
+ SERVER_URL: http://admin-management.paas.xxx.edu.cn
+ BACKEND_URL: http://admin-center.paas.xxx.edu.cn
+
+ # 可选 jwt-cas，idToken-cas，uniauth
+ AUTH_TYPE: uniauth
+
+ # AUTH_TYPE 为 jwt-cas 时，配置 AUTH_URL
+ AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
+
+ # AUTH_TYPE 为 uniauth 时，配置
+ UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
+ UNIAUTH_IDTOKEN_ISS: "uniauth"
+ UNIAUTH_CLIENT_ID: "20"
+
+ # AUTH_TYPE 为 idToken-cas 时，配置 AUTH_CAS、JWT_ISS、JWT_SECRET
+ AUTH_CAS: http://cas.paas.xxx.edu.cn/cas
+ JWT_ISS: http://cas.paas.xxx.edu.cn/cas
+ JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
+
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ namespace: admin-platform
+ name: admin-management-svc
+ labels:
+ app: admin-management-svc
+spec:
+ ports:
+ - port: 80
+ targetPort: http
+ protocol: TCP
+ name: http
+ selector:
+ app: admin-management
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ namespace: admin-platform
+ name: admin-management
+spec:
+ selector:
+ matchLabels:
+ app: admin-management
+ replicas: 1
+ template:
+ metadata:
+ labels:
+ app: admin-management
+ spec:
+ containers:
+ - name: admin-management
+ image: harbor.supwisdom.com/admin-platform/admin-management:1.2.0-SNAPSHOT
+ imagePullPolicy: Always
+ ports:
+ - containerPort: 80
+ name: http
+ envFrom:
+ - configMapRef:
+ name: admin-management-env
+ resources:
+ requests:
+ memory: "128Mi"
+ limits:
+ memory: "256Mi"
+ imagePullSecrets:
+ - name: harbor-registry