From b3a60ec5eb8c2d784031a9cd6afa9e2f37c9cfd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Sat, 18 Sep 2021 11:23:38 +0800 Subject: [PATCH] =?utf8?q?chore:=20cas-server=EF=BC=8C=E5=8F=91=E5=B8=83?= =?utf8?q?=E7=89=88=E6=9C=AC=201.4.0-RELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../4.0.cas-server-installer.yaml | 2 +- .../4.cas-server/4.2.cas-server-sa-api.yaml | 9 ++++++++- .../4.3.cas-server-security-engine.yaml | 2 +- .../4.5.cas-server-site-webapp.yaml | 20 +++++++++++++------ .../4.6.cas-server-site-scheme.yaml | 2 +- .../4.cas-server/5.cas-server-datax-job.yaml | 2 +- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml index feac2b9..8fe13ae 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml @@ -28,7 +28,7 @@ spec: containers: - name: cas-server-installer # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-installer:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-installer:1.4.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml index 74a1079..4ba150a 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml @@ -42,6 +42,13 @@ data: #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore + AUTHX_LOG_ENABLED: "true" + AUTHX_LOG_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local + AUTHX_LOG_RABBITMQ_PORT: "5672" + AUTHX_LOG_RABBITMQ_USERNAME: guest + AUTHX_LOG_RABBITMQ_PASSWORD: guest + + --- apiVersion: v1 kind: Secret @@ -95,7 +102,7 @@ spec: containers: - name: cas-server-sa-api # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.4.0-RELEASE imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml index b5f6433..db4e6a0 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml @@ -62,7 +62,7 @@ spec: containers: - name: cas-server-security-engine # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.4.0-RELEASE imagePullPolicy: Always ports: - containerPort: 6060 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml index 6a080d9..293e787 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml @@ -131,6 +131,13 @@ data: # http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080/api/v1/security/accounts/verifyAccountPassword + ## + # 超级APP Token 的验签公钥 + # 如须和 超级APP 进行对接，修改此配置 + # **修改** 学校的根域名 + SUPERAPP_TOKEN_SIGNING_KEY_URL: https://token.paas.xxx.edu.cn/jwt/publicKey + + TPAS_AGENT_SERVICE_SERVER_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080 TPAS_AGENT_SERVICE_CLIENT_AUTH_ENABLED: "false" #TPAS_AGENT_SERVICE_CLIENT_AUTH_KEY_PASSWORD: "" @@ -172,11 +179,12 @@ data: #USER_AUTHZ_SERVICE_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore #USER_AUTHZ_SERVICE_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: "" - ## - # 超级APP Token 的验签公钥 - # 如须和 超级APP 进行对接，修改此配置 - # **修改** 学校的根域名 - SUPERAPP_TOKEN_SIGNING_KEY_URL: https://token.paas.xxx.edu.cn/jwt/publicKey + + AUTHX_LOG_ENABLED: "true" + AUTHX_LOG_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local + AUTHX_LOG_RABBITMQ_PORT: "5672" + AUTHX_LOG_RABBITMQ_USERNAME: guest + AUTHX_LOG_RABBITMQ_PASSWORD: guest ## @@ -228,7 +236,7 @@ spec: containers: - name: cas-server-site-webapp # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.4.0-RELEASE imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml index 5aada1b..4ca985f 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml @@ -95,7 +95,7 @@ spec: memory: "256Mi" - name: cas-server-site-scheme-generator # 根据情况修改镜像地址 - image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.4.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml index e1e880d..b390d9b 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml @@ -42,7 +42,7 @@ spec: containers: - name: cas-server-datax-job # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.3.1-RELEASE + image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.4.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: -- 2.17.1