| commit | 61f18c2800ff0722864f05d7fb9e537b17b0a801 | [log] [tgz] |
|---|---|---|
| author | 刘洪青 <hongqing.liu@supwisdom.com> | 周五 12月 24 17:59:30 2021 +0800 |
| committer | 刘洪青 <hongqing.liu@supwisdom.com> | 周五 12月 24 17:59:30 2021 +0800 |
| tree | 594d8870959a5d22c45dc978750798a4a8132b56 | |
| parent | 0799c53dd6aafc5b640a1066f23353f3c23488c5 [diff] | |
| parent | 27181ad9908902738b9f29446d03a797ffa36891 [diff] |
Merge branch '1.3.x' into 1.4.x
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml index 5012b42..68cfc18 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@ -65,6 +65,10 @@ JOBS_RABBITMQ_ACCOUNTGROUPUSERSVC2JOBSRABBITSENDER_ENABLED: "false" + #ipaddr + IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find + + CASSERVER_SA_API_SERVER_URL: http://cas-server-sa-api-svc.cas-server.svc.cluster.local:8080 CASSERVER_SA_API_CLIENT_AUTH_ENABLED: "false" #CASSERVER_SA_API_CLIENT_AUTH_KEY_PASSWORD: "" @@ -74,10 +78,6 @@ #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: "" - #ipaddr - IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find - - AUTHX_LOG_ENABLED: "true" AUTHX_LOG_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local AUTHX_LOG_RABBITMQ_PORT: "5672"
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 db4e6a0..38a0a80 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
@@ -24,6 +24,9 @@ #CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/client/client.keystore #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore + #ipaddr + IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find + --- apiVersion: v1