chore: 更新新开普测试环境的配置
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml
index 4b24f61..7c15066 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml
@@ -12,7 +12,7 @@
##
# 平台OpenAPI的外网访问地址，
# **修改** 学校的根域名
- POA_SERVER_URL: http://poa.paas.xxx.edu.cn
+ POA_SERVER_URL: http://poa-test.newcapec.cn
---
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/10.0.init.sql b/project/newcapec-test/k8s-rancher/1.authx-service/10.0.init.sql
index 42cfae0..f415dec 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/10.0.init.sql
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/10.0.init.sql
@@ -28,7 +28,7 @@
SERVICE_ID='https://security-center-test.paas.newcapec.cn/(.*)',
ID_TOKEN_ENABLED=1,
JWT_AS_SERVICE_TICKET=1,
- APPLICATION_DOMAIN='security-center.paas.newcapec.cn'
+ APPLICATION_DOMAIN='security-center-test.paas.newcapec.cn'
where ID='122'; -- todo, modify
commit;
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
index 46b78db..4433238 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
+++ b/project/newcapec-test/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: harbor.supwisdom.com/goa/installer:0.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/goa/installer:1.0.0-SNAPSHOT
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
index 6121637..bad098a 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
@@ -85,7 +85,7 @@
containers:
- name: user-data-service-poa
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/goa/poa-api:0.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/goa/poa-api:1.0.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
index 515ddde..121f248 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@ -101,7 +101,7 @@
containers:
- name: user-data-service-goa
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/goa/goa-api:0.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/goa/goa-api:1.0.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
index 46ade42..54e76ec 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
@@ -80,7 +80,7 @@
containers:
- name: user-data-service-biz
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/goa/biz-api:0.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/goa/biz-api:1.0.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
index 1a94845..d99112b 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
@@ -41,7 +41,7 @@
containers:
- name: user-data-service-datax-job
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/goa/datax-job:0.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/goa/datax-job:1.0.0-SNAPSHOT
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/0.admin-center-base.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/0.admin-center-base.yaml
index 9aeb1f2..fb43537 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/0.admin-center-base.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/0.admin-center-base.yaml
@@ -8,7 +8,7 @@
apiVersion: v1
kind: Namespace
metadata:
- name: admin-center
+ name: admin-center-test
# labels:
# istio-injection: enabled
@@ -21,7 +21,7 @@
kind: Secret
type: kubernetes.io/dockerconfigjson
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: harbor-registry
data:
# 修改harbor仓库配置，并使用 base64 工具进行编码
@@ -36,7 +36,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: mysql-server
spec:
ports:
@@ -48,12 +48,12 @@
kind: Endpoints
apiVersion: v1
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: mysql-server
subsets:
- addresses:
# 修改实际MySQL服务器的IP地址
- - ip: 172.30.104.82
+ - ip: 192.168.116.91
ports:
- name: tcp-mysql
port: 3306
@@ -72,7 +72,7 @@
app: redis
release: redis-server
name: redis-server
- namespace: admin-center
+ namespace: admin-center-test
type: Opaque
data:
REDIS_PASSWORD: OEt1d29zbE9pdXc3SA==
@@ -85,7 +85,7 @@
app: redis
release: redis-server
name: redis-server
- namespace: admin-center
+ namespace: admin-center-test
spec:
ports:
- name: redis
@@ -105,7 +105,7 @@
app: redis
release: redis-server
name: redis-server
- namespace: admin-center
+ namespace: admin-center-test
spec:
podManagementPolicy: OrderedReady
replicas: 1
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/1.admin-center-env.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/1.admin-center-env.yaml
index faaad82..9d42251 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/1.admin-center-env.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/1.admin-center-env.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: jvm-env
data:
MAX_RAM_PERCENTAGE: "75.0"
@@ -13,7 +13,7 @@
apiVersion: v1
kind: Secret
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: datasource-env-secret
type: Opaque
data:
@@ -22,14 +22,14 @@
# admin_center
JDBC_USERNAME: YWRtaW5fY2VudGVy
# 修改为实际的数据库密码，并使用 base64 工具进行编码
- # kingstar
- JDBC_PASSWORD: a2luZ3N0YXI=
+ # Nwpu@Supwisdom123
+ JDBC_PASSWORD: TndwdUBTdXB3aXNkb20xMjM=
---
apiVersion: v1
kind: Secret
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: redis-env-secret
type: Opaque
data:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
index ec07477..2b1b6e5 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
@@ -6,14 +6,14 @@
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-ingress
annotations:
nginx.ingress.kubernetes.io/proxy-buffer-size: "8k"
spec:
rules:
# 修改为学校的根域名
- - host: admin-center.paas.xxx.edu.cn
+ - host: admin-center-test.paas.newcapec.cn
http:
paths:
- path: /
@@ -47,12 +47,12 @@
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-management-ingress
spec:
rules:
# 修改为学校的根域名
- - host: admin-management.paas.xxx.edu.cn
+ - host: admin-management-test.paas.newcapec.cn
http:
paths:
- path: /
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
index 7f456ce..15168bb 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa-installer-env
data:
DB_TYPE: mysql8
@@ -14,7 +14,7 @@
apiVersion: batch/v1
kind: Job
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa-installer
spec:
completions: 1
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
index 1534603..9d8b3f1 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-poa-env
data:
SERVER_PORT: "8080"
@@ -19,7 +19,7 @@
LOGGING_LEVEL_COM_SUPWISDOM_INSTITUTE_ADMIN_CENTER_POA: INFO
- ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center.svc.cluster.local:8080
+ ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center-test.svc.cluster.local:8080
ADMIN_CENTER_SA_CLIENT_AUTH_ENABLED: "false"
#ADMIN_CENTER_SA_CLIENT_AUTH_KEY_PASSWORD: ""
#ADMIN_CENTER_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -27,7 +27,7 @@
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080
+ USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service-test.svc.cluster.local:8080
USER_DATA_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_DATA_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_DATA_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -35,7 +35,7 @@
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service.svc.cluster.local:8080
+ USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service-test.svc.cluster.local:8080
USER_AUTHZ_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -48,7 +48,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-poa-svc
labels:
app: admin-center-poa
@@ -70,7 +70,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-poa
spec:
selector:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
index d7c8aee..47e26a5 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa-env
data:
SERVER_PORT: "8080"
@@ -18,7 +18,7 @@
apiVersion: v1
kind: Secret
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa-env-secret
type: Opaque
data:
@@ -30,7 +30,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa-svc
labels:
app: admin-center-sa
@@ -51,7 +51,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-sa
spec:
selector:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
index f03a397..0d72be9 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-bff-env
data:
SERVER_PORT: "8080"
@@ -19,7 +19,7 @@
LOGGING_LEVEL_COM_SUPWISDOM_INSTITUTE_ADMIN_CENTER_BFF: INFO
- ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center.svc.cluster.local:8080
+ ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center-test.svc.cluster.local:8080
ADMIN_CENTER_SA_CLIENT_AUTH_ENABLED: "false"
#ADMIN_CENTER_SA_CLIENT_AUTH_KEY_PASSWORD: ""
#ADMIN_CENTER_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -27,7 +27,7 @@
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- CASSERVER_SA_API_SERVER_URL: http://cas-server-sa-api-svc.cas-server.svc.cluster.local:8080
+ CASSERVER_SA_API_SERVER_URL: http://cas-server-sa-api-svc.cas-server-test.svc.cluster.local:8080
CASSERVER_SA_API_CLIENT_AUTH_ENABLED: "false"
#CASSERVER_SA_API_CLIENT_AUTH_KEY_PASSWORD: ""
#CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -35,7 +35,7 @@
#CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080
+ USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service-test.svc.cluster.local:8080
USER_DATA_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_DATA_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_DATA_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -43,7 +43,7 @@
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service.svc.cluster.local:8080
+ USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service-test.svc.cluster.local:8080
USER_AUTHZ_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -60,7 +60,7 @@
#PERSONAL_SECURITY_CENTER_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- TPAS_FILE_API_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080/api/v1/tpas/file/db
+ TPAS_FILE_API_URL: http://agent-service-svc.thirdparty-agent-service-test.svc.cluster.local:8080/api/v1/tpas/file/db
TPAS_CLIENT_AUTH_ENABLED: "false"
#TPAS_CLIENT_AUTH_KEY_PASSWORD: ""
#TPAS_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/client/client.keystore
@@ -73,7 +73,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-bff-svc
labels:
app: admin-center-bff
@@ -95,7 +95,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-bff
spec:
selector:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
index 71ed6d3..05336f6 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
@@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-zuul-env
data:
SERVER_PORT: "8080"
@@ -40,16 +40,16 @@
INFRAS_SECURITY_JWT_TOKEN_GENERATE_TYPE: cas
INFRAS_SECURITY_JWT_TOKEN_DECRYPT_KEY_PRIVATE_KEY_PEM_PKCS8: ""
- INFRAS_SECURITY_JWT_TOKEN_SIGNING_KEY_URL: "http://cas-server-site-webapp-svc.cas-server.svc.cluster.local:8080/cas/jwt/publicKey"
+ INFRAS_SECURITY_JWT_TOKEN_SIGNING_KEY_URL: "http://cas-server-site-webapp-svc.cas-server-test.svc.cluster.local:8080/cas/jwt/publicKey"
INFRAS_SECURITY_CAS_ENABLED: "true"
# 修改为学校的admin-center的访问域名
- APP_SERVER_HOST_URL: "http://admin-center.paas.xxx.edu.cn"
+ APP_SERVER_HOST_URL: "http://admin-center-test.paas.newcapec.cn"
#APP_LOGIN_URL: "/cas/login"
#APP_LOGOUT_URL: "/cas/logout"
# 修改为学校的cas的访问域名
- CAS_SERVER_HOST_URL: "http://cas.paas.xxx.edu.cn/cas"
+ CAS_SERVER_HOST_URL: "http://cas-test.paas.newcapec.cn/cas"
ZUUL_HTTPCLIENT_CLIENT_AUTH_ENABLED: "false"
@@ -57,7 +57,7 @@
#ZUUL_HTTPCLIENT_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
#ZUUL_HTTPCLIENT_CLIENT_AUTH_KEYSTORE_PASSWORD: ""
- ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center.svc.cluster.local:8080
+ ADMIN_CENTER_SA_SERVER_URL: http://admin-center-sa-svc.admin-center-test.svc.cluster.local:8080
ADMIN_CENTER_SA_CLIENT_AUTH_ENABLED: "false"
#ADMIN_CENTER_SA_CLIENT_AUTH_KEY_PASSWORD: ""
#ADMIN_CENTER_SA_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -65,7 +65,7 @@
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#ADMIN_CENTER_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080
+ USER_DATA_SERVICE_SERVER_URL: http://user-data-service-goa-svc.user-data-service-test.svc.cluster.local:8080
USER_DATA_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_DATA_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_DATA_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -73,7 +73,7 @@
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service.svc.cluster.local:8080
+ USER_AUTHZ_SERVICE_SERVER_URL: http://user-authorization-sa-svc.user-authorization-service-test.svc.cluster.local:8080
USER_AUTHZ_SERVICE_CLIENT_AUTH_ENABLED: "false"
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEY_PASSWORD: ""
#USER_AUTHZ_SERVICE_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -85,7 +85,7 @@
apiVersion: v1
kind: Secret
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-zuul-env-secret
type: Opaque
data:
@@ -98,7 +98,7 @@
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-zuul-svc
labels:
app: admin-center-zuul
@@ -120,7 +120,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-zuul
spec:
selector:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml
index 4684a8c..103e535 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml
@@ -4,23 +4,23 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-management-env
data:
SCHOOL_NAME: "none"
# 修改为学校的 admin-center 的访问域名
- AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
+ AUTH_URL: http://admin-center-test.paas.newcapec.cn/jwt/cas
# 修改为学校的 admin-center 的访问域名
- BACKEND_URL: http://admin-center.paas.xxx.edu.cn
+ BACKEND_URL: http://admin-center-test.paas.newcapec.cn
# 修改为学校的 admin-management 的访问域名
- SERVER_URL: http://admin-management.paas.xxx.edu.cn
+ SERVER_URL: http://admin-management-test.paas.newcapec.cn
---
apiVersion: v1
kind: Service
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-management-svc
labels:
app: admin-center-management-svc
@@ -37,7 +37,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-center
+ namespace: admin-center-test
name: admin-center-management
spec:
selector:
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/0.admin-platform-base.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/0.admin-platform-base.yaml
index 3777c8e..d052df2 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/0.admin-platform-base.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/0.admin-platform-base.yaml
@@ -8,7 +8,7 @@
apiVersion: v1
kind: Namespace
metadata:
- name: admin-platform
+ name: admin-platform-test
# labels:
# istio-injection: enabled
@@ -22,7 +22,7 @@
type: kubernetes.io/dockerconfigjson
metadata:
name: harbor-registry
- namespace: admin-platform
+ namespace: admin-platform-test
data:
# 修改harbor仓库配置，并使用 base64 工具进行编码
# {"auths":{"harbor.supwisdom.com":{"password":"PWMgP85qiLFC","username":"rancher.devops"}}}
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
index f8c644b..3b654a1 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
@@ -5,11 +5,11 @@
kind: Ingress
metadata:
name: admin-platform-ingress
- namespace: admin-platform
+ namespace: admin-platform-test
spec:
rules:
# 修改为学校的根域名
- - host: admin-platform.paas.xxx.edu.cn
+ - host: admin-platform-test.paas.newcapec.cn
http:
paths:
- path: /
diff --git a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
index c0f91f4..c562567 100644
--- a/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
+++ b/project/newcapec-test/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
@@ -4,28 +4,28 @@
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: admin-platform
+ namespace: admin-platform-test
name: admin-platform-env
data:
# 修改为学校的 admin-platform 的访问域名
- LAYOUT_SPA_URL: http://admin-platform.paas.xxx.edu.cn/layout
- CAS_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/cas-server
- USER_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/user-server
- AUTH_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/auth-server
- ACCOUNT_CENTER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/account-center
- FORM_FLOW_SPA_URL: http://admin-platform.paas.xxx.edu.cn/form-flow
+ LAYOUT_SPA_URL: http://admin-platform-test.paas.newcapec.cn/layout
+ CAS_SERVER_SPA_URL: http://admin-platform-test.paas.newcapec.cn/cas-server
+ USER_SERVER_SPA_URL: http://admin-platform-test.paas.newcapec.cn/user-server
+ AUTH_SERVER_SPA_URL: http://admin-platform-test.paas.newcapec.cn/auth-server
+ ACCOUNT_CENTER_SPA_URL: http://admin-platform-test.paas.newcapec.cn/account-center
+ FORM_FLOW_SPA_URL: http://admin-platform-test.paas.newcapec.cn/form-flow
SCHOOL_NAME: "none"
- MAIN_SERVER: http://admin-platform.paas.xxx.edu.cn
+ MAIN_SERVER: http://admin-platform-test.paas.newcapec.cn
# 修改为学校的访问域名
- SERVER_CONFIG: '{"ROOT": "http://admin-platform.paas.xxx.edu.cn/","AUTH": "http://admin-center.paas.xxx.edu.cn/jwt/cas","BASE_BACK_API": "http://admin-center.paas.xxx.edu.cn/","AUTH_PERSONAL": "http://admin-center.paas.xxx.edu.cn/jwt/cas","PERSONAL_CENTER_API": "http://admin-center.paas.xxx.edu.cn/","PERSONAL_CENTER": "http://admin-platform.paas.xxx.edu.cn/personal-center/","AUTH_FORMFLOW": "http://formflow.paas.xxx.edu.cn/release/cas/authen/redirect","FORM_DESIGN": "http://formflow.paas.xxx.edu.cn/form-design","FORM_DESIGN_PORTAL": "http://formflow.paas.xxx.edu.cn/form-design-portal","FORM_FILE": "http://formflow.paas.xxx.edu.cn/form-file","PERSONAL_CENTER_API_L": "http://portal.paas.xxx.edu.cn/portal-web/","PERSONAL_CENTER_IMAGE_API": "http://portal.paas.xxx.edu.cn/resources/",}'
+ SERVER_CONFIG: '{"ROOT": "http://admin-platform-test.paas.newcapec.cn/","AUTH": "http://admin-center-test.paas.newcapec.cn/jwt/cas","BASE_BACK_API": "http://admin-center-test.paas.newcapec.cn/","AUTH_PERSONAL": "http://admin-center-test.paas.newcapec.cn/jwt/cas","PERSONAL_CENTER_API": "http://admin-center-test.paas.newcapec.cn/","PERSONAL_CENTER": "http://admin-platform-test.paas.newcapec.cn/personal-center/","AUTH_FORMFLOW": "http://formflow-test.paas.newcapec.cn/release/cas/authen/redirect","FORM_DESIGN": "http://formflow-test.paas.newcapec.cn/form-design","FORM_DESIGN_PORTAL": "http://formflow-test.paas.newcapec.cn/form-design-portal","FORM_FILE": "http://formflow-test.paas.newcapec.cn/form-file","PERSONAL_CENTER_API_L": "http://portal-test.paas.newcapec.cn/portal-web/","PERSONAL_CENTER_IMAGE_API": "http://portal-test.paas.newcapec.cn/resources/",}'
---
apiVersion: v1
kind: Service
metadata:
- namespace: admin-platform
+ namespace: admin-platform-test
name: admin-platform-svc
labels:
app: admin-platform-svc
@@ -42,7 +42,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- namespace: admin-platform
+ namespace: admin-platform-test
name: admin-platform
spec:
selector: