chore: 调整个人中心logo 替换方案
diff --git "a/deploy-manifests/k8s-rancher/0.1.1.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md" "b/deploy-manifests/k8s-rancher/0.1.1.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
index 8f8e499..1d42a2e 100644
--- "a/deploy-manifests/k8s-rancher/0.1.1.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
+++ "b/deploy-manifests/k8s-rancher/0.1.1.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
@@ -191,6 +191,8 @@
personal-security-center.paas.xxx.edu.cn 个人安全中心后端API
security-center.paas.xxx.edu.cn 安全中心前端UI(帐号激活、忘记密码)
+
+ authx-minio.paas.xxx.edu.cn 文件服务
```
如果使用 学校域名,则去除 .paas 即可,同时申请开通相关域名
diff --git a/deploy-manifests/k8s-rancher/0.infras/0.0.z.infras-tmp.yaml b/deploy-manifests/k8s-rancher/0.infras/0.0.z.infras-tmp.yaml
new file mode 100644
index 0000000..7830e3d
--- /dev/null
+++ b/deploy-manifests/k8s-rancher/0.infras/0.0.z.infras-tmp.yaml
@@ -0,0 +1,102 @@
+
+
+# 创建 namespace,如 tmp
+# 并修改以下配置中的 namespace
+
+# 创建 ConfigMap
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ # 修改namespace
+ namespace: tmp
+ name: txt
+data:
+ # 修改 key,value
+ # 其中,
+ # key 为 文件名
+ # value 为 文件内容
+ FWdJ6SLVde.txt: "70976dc348062015aaecd04c4fe393c6"
+
+
+
+# 部署nginx,并将 ConfigMap 挂载成文件
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ # 修改namespace
+ namespace: tmp
+ name: txt-svc
+ labels:
+ app: txt-svc
+spec:
+ ports:
+ - port: 80
+ targetPort: http
+ protocol: TCP
+ name: http
+ selector:
+ app: txt
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ # 修改namespace
+ namespace: tmp
+ name: txt
+spec:
+ selector:
+ matchLabels:
+ app: txt
+ replicas: 1
+ template:
+ metadata:
+ labels:
+ app: txt
+ spec:
+ containers:
+ - name: txt-nginx
+ # 根据情况修改镜像地址
+ image: nginx:latest
+ ports:
+ - containerPort: 80
+ name: http
+ volumeMounts:
+ - name: txt
+ mountPath: /usr/share/nginx/html
+ readOnly: true
+ volumes:
+ - name: txt
+ configMap:
+ # 这个是 ConfigMap 的名称
+ name: txt
+ items:
+ # 将 ConfigMap 中某个 key 的 value 映射为 文件及文件内容
+ - key: FWdJ6SLVde.txt
+ path: FWdJ6SLVde.txt
+
+# 配置ingress
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ # 修改namespace
+ namespace: tmp
+ name: txt-ingress
+spec:
+ rules:
+ # 修改为学校的根域名
+ - host: txt.paas.xxx.edu.cn
+ http:
+ paths:
+ # 修改path,对应某个文件路径
+ - path: /FWdJ6SLVde.txt
+ backend:
+ serviceName: txt-svc
+ servicePort: http
+
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 5c88212..3e425e5 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
@@ -14,7 +14,9 @@
# 将 cas-server-site-ui 目录下的 图片,上传到 cas-server-site-ui 中(此为认证登录界面上使用的图片,实际项目中,由UI进行设计后,替换)
# 创建 bucket: security-center-ui ,并设置访问策略 * Read Only
-# 将 security-center-ui 目录下的 图片,上传到 security-center-ui 中(此为安全中心界面上使用的图片,由UI进行设计后,替换)
+# 在 security-center-ui 目录下 创建目录 favicon ,上传文件 security-center-ui/favicon/favicon.ico
+# 在 security-center-ui 目录下 创建目录 logo ,上传文件 security-center-ui/logo/logo.png
+# 此为安全中心界面上使用的图片,由UI进行设计后,替换
---
@@ -107,7 +109,6 @@
claimName: minio-data-pvc
-# 该 ingress 配置可选,主要用于实施调试用
---
apiVersion: extensions/v1beta1
kind: Ingress
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/favicon.ico b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/favicon/favicon.ico
similarity index 100%
rename from deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/favicon.ico
rename to deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/favicon/favicon.ico
Binary files differ
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/logo.png b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/logo/logo.png
similarity index 100%
rename from deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/logo.png
rename to deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/security-center-ui/logo/logo.png
Binary files differ
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
index beda708..3bdc109 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
@@ -40,36 +40,3 @@
serviceName: security-center-ui-svc
servicePort: http
-# 安全中心 logo、favicon
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: personal-security-center
- name: minio-svc
-spec:
- type: ExternalName
- externalName: minio-svc.authx-service.svc.cluster.local
-
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- namespace: personal-security-center
- name: security-center-ui-ingress-img
- annotations:
- ingress.kubernetes.io/rewrite-target: "/security-center-ui/$1"
-spec:
- rules:
- # 修改为学校的根域名
- - host: security-center.paas.xxx.edu.cn
- http:
- paths:
- - path: /favicon/*
- backend:
- serviceName: minio-svc
- servicePort: 9000
- - path: /logo/*
- backend:
- serviceName: minio-svc
- servicePort: 9000
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 a22393f..a09f3b3 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
@@ -7,7 +7,8 @@
namespace: personal-security-center
name: security-center-ui-env
data:
- SCHOOL_NAME: sw
+ RESOURCE_PREFIX: http://authx-minio.paas.xxx.edu.cn/security-center-ui
+ SCHOOL_NAME: ""
MAIN_SERVER: http://security-center.paas.xxx.edu.cn
PERSONAL_CENTER_API: http://personal-security-center.paas.xxx.edu.cn