chore: 整理部署脚本
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/2.developer-center-ingresses.yaml b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/2.developer-center-ingresses.yaml
index c62d404..66f4967 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/2.developer-center-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/2.developer-center-ingresses.yaml
@@ -1,36 +1,37 @@
# 2.developer-center-ingresses.yaml
-#这个文件中，你要将对外暴露的地址修改为实际分配的地址
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- namespace: developer-center
- name: developer-center-backend-sa-ingress
-spec:
- rules:
- - host: dev-sa.paas.newcapec.cn
- http:
- paths:
- - path: /
- backend:
- serviceName: developer-center-backend-sa-svc
- servicePort: http
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- namespace: developer-center
- name: developer-center-bff-ingress
-spec:
- rules:
- - host: dev-bff.paas.newcapec.cn
- http:
- paths:
- - path: /
- backend:
- serviceName: developer-center-bff-svc
- servicePort: http
+#这个文件中，你要将对外暴露的地址修改为实际分配的地址
+# ---
+# apiVersion: extensions/v1beta1
+# kind: Ingress
+# metadata:
+# namespace: developer-center
+# name: developer-center-backend-sa-ingress
+# spec:
+# rules:
+# - host: dev-sa.paas.newcapec.cn
+# http:
+# paths:
+# - path: /
+# backend:
+# serviceName: developer-center-backend-sa-svc
+# servicePort: http
+
+# ---
+# apiVersion: extensions/v1beta1
+# kind: Ingress
+# metadata:
+# namespace: developer-center
+# name: developer-center-bff-ingress
+# spec:
+# rules:
+# - host: dev-bff.paas.newcapec.cn
+# http:
+# paths:
+# - path: /
+# backend:
+# serviceName: developer-center-bff-svc
+# servicePort: http
@@ -56,6 +57,23 @@
kind: Ingress
metadata:
namespace: developer-center
+ name: developer-center-admin-ui-spa-ingress
+spec:
+ rules:
+ - host: dev-admin-spa.paas.newcapec.cn
+ http:
+ paths:
+ - path: /
+ backend:
+ serviceName: developer-center-admin-ui-spa-svc
+ servicePort: http
+
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ namespace: developer-center
name: developer-center-portal-ui-ingress
spec:
rules:
@@ -67,19 +85,3 @@
serviceName: developer-center-portal-ui-svc
servicePort: http
-
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- namespace: developer-center
- name: developer-center-admin-ui-ingress
-spec:
- rules:
- - host: dev-admin.paas.newcapec.cn
- http:
- paths:
- - path: /
- backend:
- serviceName: developer-center-admin-ui-svc
- servicePort: http
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.4.developer-center-bff.yaml b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.4.developer-center-bff.yaml
index d720fed..c43f1cf 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.4.developer-center-bff.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.4.developer-center-bff.yaml
@@ -63,7 +63,7 @@
# CAS_SA_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
#同环境中消息服务的地址
- MESSAGE_MANAGER_SA_SERVER_URL: http://message-manager.paas.newcapec.cn
+ MESSAGE_MANAGER_SA_SERVER_URL: http://message-service-manager.message-service.svc.cluster.local:8080/manager
MESSAGE_MANAGER_SA_CLIENT_AUTH_ENABLED: "false"
# MESSAGE_MANAGER_SA_AUTH_KEY_PASSWORD: ""
# MESSAGE_MANAGER_SA_AUTH_KEYSTORE_FILE: file:/certs/common/common.keystore
@@ -129,21 +129,23 @@
MINIO_BASIC_AUTH_SA_PASSWORD: saadmin
MINIO_BASIC_AUTH_SA_USERNAME: saadmin
- POA_DOCS_URL: https://poa-docs.dev.supwisdom.com/
- POA_SA_API_SEPCS_UPLOAD_CHECK_STYLE: "true"
-
- USER_AUTHZ_BUSINESSDOMAINID: "1"
- USER_AUTHZ_SYSTEMID: "1"
+ POA_DOCS_URL: https://poa-docs.paas.xxx.edu.cn/
+ POA_SA_API_SEPCS_UPLOAD_CHECK_CASE: "false"
USER_IDENTITY_TYPE_DEVELOPER_ENTERPRISE: D02
USER_IDENTITY_TYPE_DEVELOPER_INDIVIDUAL: D01
USER_ORGANIZATION: "1"
- DEVELOPER-CENTER-BFF.NONCE.STORE.IMPL: map
- DEVELOPER-CENTER-BFF_SERVER_PREFIX: http://localhost:8080
+ USER_AUTHZ_BUSINESSDOMAINID: "1"
+ USER_AUTHZ_SYSTEMID: "1"
+
+
+ DEVELOPER_CENTER_BFF_NONCE_STORE_IMPL: redis
+ DEVELOPER_CENTER_BFF_SERVER_PREFIX: http://dev-portal.paas.xxx.edu.cn
SMS_TEMPLATE_APPLY_ACCOUNT_REGISTER_SEND_CODE_BY_MOBILE : {prefix}：您当前正在注册账号，须验证手机有效，验证码{code}，有效期5分钟，请尽快完成验证。
+
---
apiVersion: v1
kind: Secret
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.5.developer-center-gateway-zuul.yaml b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.5.developer-center-gateway-zuul.yaml
index 78df15c..51cb49d 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.5.developer-center-gateway-zuul.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.5.developer-center-gateway-zuul.yaml
@@ -32,9 +32,12 @@
INFRAS_SECURITY_JWT_TOKEN_GENERATE_TYPE: cas
INFRAS_SECURITY_JWT_TOKEN_DECRYPT_KEY_PRIVATE_KEY_PEM_PKCS8: ""
# 这里依赖cas 服务
- INFRAS_SECURITY_JWT_TOKEN_SIGNING_KEY_URL: "https://cas-test.paas.newcapec.cn/cas/jwt/publicKey"
- INFRAS_SECURITY_JWT_PUBLIC_KEY_PEM: ""
- INFRAS_SECURITY_JWT_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"
+ # 对接 uniauth认证时，使用以下配置
+ #INFRAS_SECURITY_JWT_TOKEN_SIGNING_KEY_URL: "http://uniauth-prod-backend.uniauth.svc.cluster.local:9090/idtoken/publicKey"
+
+ #INFRAS_SECURITY_JWT_PUBLIC_KEY_PEM: ""
+ #INFRAS_SECURITY_JWT_PRIVATE_KEY_PEM_PKCS8: ""
INFRAS_SECURITY_CAS_ENABLED: "true"
@@ -87,7 +90,7 @@
#USER_AUTHZ_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore
#USER_AUTHZ_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
- ZUUL_ROUTES_BFF_ABILITY_MESSAGE_URL: http://message-manager.dice.supwisdom.com/manager/api/v1
+ ZUUL_ROUTES_BFF_ABILITY_MESSAGE_URL: http://message-manager-svc.message-service.svc.cluster.local:8080/manager/api/v1
ZUUL_ROUTES_BFF_ADMIN_URL: http://developer-center-bff-svc.develop-center-test.svc.cluster.local:8080
ZUUL_ROUTES_BFF_PORTAL_URL: http://developer-center-bff-svc.develop-center-test.svc.cluster.local:8080
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui.yaml b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui-spa.yaml
similarity index 62%
rename from deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui.yaml
rename to deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui-spa.yaml
index 314464f..0499a2f 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-admin-ui-spa.yaml
@@ -1,29 +1,32 @@
-# 4.9.developer-center-admin-ui.yaml
+# 4.9.developer-center-admin-ui-spa.yaml
---
apiVersion: v1
kind: ConfigMap
metadata:
namespace: developer-center
- name: developer-center-admin-ui-env
+ name: developer-center-admin-ui-spa-env
data:
# 如果配置值中 存在 & 的，需要用 \& 进行转义（此说明只在该镜像配置中有效）
# 这里需要替换实际环境中的地址
- MAIN_SERVER: https://dev-admin.paas.newcapec.cn
- BASE_API: https://dev-center.paas.newcapec.cn/
- DEVELOPER_CENTER_API: https://dev-center.paas.newcapec.cn
+ MAIN_SERVER: http://dev-admin.paas.newcapec.cn
+
+ DEVELOPER_CENTER_API: http://dev-center.paas.newcapec.cn
+ MESSAGE_SERVICE_API: http://message-service.paas.newcapec.cn/manager
+
AUTH_TYPE: cas
- AUTH_CAS: https://cas.paas.newcapec.cn/cas
- JWT_ISS: https://cas.paas.newcapec.cn/cas
+
+ AUTH_CAS: http://cas.paas.newcapec.cn/cas
+ JWT_ISS: http://cas.paas.newcapec.cn/cas
JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
-
+
---
apiVersion: v1
kind: Secret
metadata:
namespace: developer-center
- name: developer-center-admin-ui-env-secret
+ name: developer-center-admin-ui-spa-env-secret
type: Opaque
data:
@@ -33,9 +36,9 @@
kind: Service
metadata:
namespace: developer-center
- name: developer-center-admin-ui-svc
+ name: developer-center-admin-ui-spa-svc
labels:
- app: developer-center-admin-ui
+ app: developer-center-admin-ui-spa
needMonitor: 'true'
spec:
ports:
@@ -48,26 +51,27 @@
# protocol: TCP
# name: http-metrics
selector:
- app: developer-center-admin-ui
+ app: developer-center-admin-ui-spa
---
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: developer-center
- name: developer-center-admin-ui
+ name: developer-center-admin-ui-spa
spec:
selector:
matchLabels:
- app: developer-center-admin-ui
+ app: developer-center-admin-ui-spa
replicas: 1
template:
metadata:
labels:
- app: developer-center-admin-ui
+ app: developer-center-admin-ui-spa
spec:
containers:
- - name: developer-center-admin-ui
- image: harbor.supwisdom.com/developer-center/developer-center-admin-ui:0.0.2
+ - name: developer-center-admin-ui-spa
+ # 若使用了学校搭设的私有仓库，请修改
+ image: paas.harbor.nwpu.edu.cn/developer-center/developer-center-admin-ui-spa:0.0.2
imagePullPolicy: Always
ports:
- containerPort: 80
@@ -76,9 +80,9 @@
# name: http-metrics
envFrom:
- secretRef:
- name: developer-center-admin-ui-env-secret
+ name: developer-center-admin-ui-spa-env-secret
- configMapRef:
- name: developer-center-admin-ui-env
+ name: developer-center-admin-ui-spa-env
resources:
requests:
memory: "128Mi"
diff --git a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-portal-ui.yaml b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-portal-ui.yaml
index a33f75e..8c98689 100644
--- a/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-portal-ui.yaml
+++ b/deploy-manifests/k8s-rancher/open-platform/1.developer-center/4.9.developer-center-portal-ui.yaml
@@ -7,6 +7,23 @@
namespace: developer-center
name: developer-center-portal-ui-env
data:
+ # 如果配置值中 存在 & 的，需要用 \& 进行转义（此说明只在该镜像配置中有效）
+ # 这里需要替换实际环境中的地址
+ MAIN_SERVER: http://dev-portal.paas.newcapec.cn
+
+ BASE_API: http://dev-center.paas.newcapec.cn/
+ DEVELOPER_API: https://dev-center.paas.newcapec.cn
+ MESSAGE_SERVICE_API: http://message-service.paas.newcapec.cn/manager
+
+ AUTH_TYPE: cas
+
+ AUTH_CAS: http://cas.paas.newcapec.cn/cas
+ JWT_ISS: http://cas.paas.newcapec.cn/cas
+ JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
+
+ # UNIAUTH_IDTOKEN: http://uniauth.paas.newcapec.cn/idtoken
+ # UNIAUTH_IDTOKEN_ISS: uniauth
+ # UNIAUTH_CLIENT_ID: "31"
---
@@ -58,7 +75,7 @@
spec:
containers:
- name: developer-center-portal-ui
- image: harbor.supwisdom.com/developer-center/developer-center-portal-ui:0.0.1
+ image: harbor.supwisdom.com/developer-center/developer-center-portal-ui:0.0.2
imagePullPolicy: Always
ports:
- containerPort: 80