From d288d9c175bd75758c108bb73433e406d423f6c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Mon, 7 Sep 2020 12:21:47 +0800 Subject: [PATCH] =?utf8?q?chore:=20=E5=AE=8C=E5=96=84=E6=A0=87=E5=87=86?= =?utf8?q?=E4=BA=A7=E5=93=81=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../2.authx-service-minio.yaml | 32 +++++++++--------- .../0.authx-service/portrait/1.png | Bin 0 -> 2088 bytes .../0.authx-service/portrait/2.png | Bin 0 -> 2088 bytes .../4.0.cas-server-installer.yaml | 2 +- .../4.cas-server/4.2.cas-server-sa-api.yaml | 2 +- .../4.3.cas-server-security-engine.yaml | 2 +- .../4.5.cas-server-site-webapp.yaml | 2 +- .../4.cas-server/5.cas-server-datax-job.yaml | 2 +- .../5.token-server/4.1.token-server.yaml | 2 ++ .../4.9.security-center-ui.yaml | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png create mode 100644 deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml index f955295..c7e7a8f 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-minio.yaml @@ -95,20 +95,20 @@ spec: # 该 ingress 配置可选，主要用于实施调试用 -# --- -# apiVersion: extensions/v1beta1 -# kind: Ingress -# metadata: -# name: minio-ingress -# namespace: authx-service -# spec: -# rules: -# # 修改为学校的根域名 -# - host: minio.paas.xxx.edu.cn -# http: -# paths: -# - path: / -# backend: -# serviceName: minio-svc -# servicePort: http +--- +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: minio-ingress + namespace: authx-service +spec: + rules: + # 修改为学校的根域名 + - host: minio.paas.xxx.edu.cn + http: + paths: + - path: / + backend: + serviceName: minio-svc + servicePort: http diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/1.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1a680af209436162a143e8ada2ce234e68fc4d GIT binary patch literal 2088 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 H(wp)>;tSZY literal 0 HcmV?d00001 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/portrait/2.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1a680af209436162a143e8ada2ce234e68fc4d GIT binary patch literal 2088 zcmbW2`9IT-1IPE?%Jy?qVYws8(Y8d+ zWSe{)r76eA+{Xt=N|-Bseg1{-53kqr@%rWU!|Rt<8o|LOAv#DS_XlHX7M-+Vl1#){63s#0P6;vpUm%y=nlH|X!F}#6MFvp zuyL;4^=r!ld`ymMe&T!KCo^KBu2rkFHs}?MJ9iwNex%my%WQo0aDLA9opuIKh(2r^ zw|8lZzx-(-_AL=YTA@DJ8s~quqgFWbR=0TfiJ4O5@wE&`68~OgiKNV&Q;DE(^e}(- z`#};Pw>Tl_VTei>s%V|662QS3DcLDo%xt!@TC#uh!qWhz%{zocbWVc%x^H&UXekG+ zrZBO7&SKzlhqrxvAk%E$`czVGNm<^(Bdqy_{U%kG1dv5vc(kcg7PZ zYg>VBu$zL)(@GeQpE9^)#2)7M|A!9RQXW%l?>w)uX2p0o<}4Nc(TGahIKP4m*hiB> z28d{U^MZ*wi#!S&Y7CL4JO56o%uwf66+d|bv3~}iCtfeid|Ovad`#()_)^Evbama- zB>XylCd`~|UdBrH2mlvXoAirsr`^klvoo2lVMvT;jeo-m)M}p8igI}t(vArIcm;sq zoRD3J%aAYI#<$m=7vd&Xzjl)9d$`skQGv;Z?y2#=y$UgoGE^kmF*Tez0h_ZT&9xXe zFhBV}#8O7FniJWlr5n8JWfrcLH3Zvx4*jZzc=)qMmbLW8lC7g1b3V8GF+ttm87DqX znf7{Cv5z!V_aR(8X#1&=4An*+DV?`k%@);I{A zENE!a1uofXksGDwpjS9@?xJJ1T+uD;^wSx!81mZ|ka8vs7*Pg|K!T{YjpUEy=pr~DK zPuOD@(PyET;@C#?U~NOh{9~6f1-9!p*kOUTWFO!r;N~Nqw-qoN9j z>&)i(^by^4_`5RqKS6AiV|WUy-HYg*=y#eHdev}1Hfn;Z6aklRCY~D=f|CJc8A4Z3 zn_D!Xq|uiu%Oba_G%dNbY)DJ3pV0Nx+knEMvLd(Rar@#U;I)+EgMpiTOy6AtxH05S z-t}eQ{sC%h;EgV(oqmPR-{imH>ZnVIVBw|)5pfBP=4+g*?_CJ}Q-f2?wH?N3BgbXU zMXdE0`%h*NeU1`ij#U~C>~}?TDgAmWyYOG5YD0u=6#=V@Dzb!LgO-uo;{}n-Xh#_N zFY%IA=c7_0rDYR>zI$RFaszeU8mFN$wB=(uu~zk#Y4?|Vk2CGEEP$?Pm*5+0s>2*3 zU<%gICEl6zvT>NDZyx4YDIfkr!~>(cR?%lABq{4n0*?)F;i&I%)p-(Ef3>bZ)KMVM zFo41p_w9j%^m=die>4(iTAOq1q*JHNF)ry|_+!uea?q;CyGLboaYpkle`v~!J}-QW zk9=ieI;do4 zCv`-2Y`*-0K|THss{1%{0ZgqwX2CW=iOCym%3z|343XrFI{mA?bDj9a%nupR>{#j~ zpi--*DrPBllT5+xAw$VCoUCq@&7d8dsvDXpfm3D##l%L9Ho!*4f0fpM5wW(OBmm>f zb&iX9>sJw4L#_Mf;!t!`xs@R!Z+C6g#ZY@#KG!yCUK;cC`}xm{lQpGH({Vk+8q*!L zM+F6OOo@5_;9P-E6^4+zj1SuSH3yQ4kz}~B+pGX4xbX=mIVW4tGb_>v@N_9pkG~fA z@RsCe?Xzyc5YW2r+k?I)?$-)iAv^JRQN3YhomeJN+-X@8>IaF*lUsijxUw4F9F&9-f|94A&jw3iJnuab3Zg+b zxO>5pmq-xQjE-&SkL6h|==9wZWUJ?Jl4-z?vOzA07kxH~FuLPfILT3-<`rXGU&=-z zUl(IpVP9?-`4&3D>VyqR-<&%QGTEZuymCD|gp8RQ#^FNMhhUEv4fgs)TZ=vF($O7s z5^xtL%pCtNqIeQgTTCQXr>>sBCauUz;8;N~RhLSH-C;B=K9fA+Z~x&eyjICQ=z%=& z{9{3Byt21NE%yW#>{X7n;Nw^nZ#q6upv@+T@->YNWs|apgkv+g0uxqYFB)FGuc1gw zSvs?k$bFQh?-fN=?6;y1yBnvnAI=ueVnK}sS8UoU?Fp9y@-zF?%+k8O)gbdFnxbL* z$IFDw5?A7X`Y-y;Hti08@+kBG>#3==gP}7!;-A}(NGJ2p$b+nEPds(p?vfEpnP#lC zCYB;jA6p(X4(FM?$-8VT!%h$*z01k>8*1^OnzFiY?*^fGO@nHuxz@cKb`YX=;| H(wp)>;tSZY literal 0 HcmV?d00001 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 f37928d..89d9da0 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.0.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-installer:1.0.1-SNAPSHOT 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 6807b42..f8e1452 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 @@ -86,7 +86,7 @@ spec: containers: - name: cas-server-sa-api # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.0.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.0.1-SNAPSHOT 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 3ab8cee..75cc41e 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.0.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.0.1-SNAPSHOT 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 cdc638e..cbd694e 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 @@ -201,7 +201,7 @@ spec: containers: - name: cas-server-site-webapp # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.0.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.0.1-SNAPSHOT imagePullPolicy: Always ports: - containerPort: 8080 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 6e38682..9acad5c 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.0.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.0.1-SNAPSHOT imagePullPolicy: Always envFrom: - configMapRef: diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml index 60e0233..612a50b 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml @@ -24,6 +24,8 @@ data: SPRING_REDIS_JEDIS_POOL_MAXIDLE: "100" SPRING_REDIS_JEDIS_POOL_MINIDLE: "100" + LOGGING_LEVEL_COM_SUPWISDOM_INSITITUTE_TOKEN_SERVER: INFO + # **修改** 从消息中心申请 MESSAGECENTER_ENABLED: "false" diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml index 1bba8ac..e6f094f 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml @@ -53,7 +53,7 @@ spec: containers: - name: security-center-ui # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/personal-security-center/security-center-ui:0.0.1 + image: harbor.supwisdom.com/personal-security-center/security-center-ui:1.0.0 imagePullPolicy: Always ports: - containerPort: 80 -- 2.17.1