From c3b9a41bc81a684e13b68e6726058a723f951794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= Date: Tue, 13 Jun 2023 15:39:00 +0800 Subject: [PATCH] =?UTF-8?q?test=EF=BC=9A=E6=8C=82=E8=BD=BDconfigmap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .beagle.yml | 36 +++++++++++++++++------------------- index.html | 1 + static/config/configmap.js | 3 +++ 3 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 static/config/configmap.js diff --git a/.beagle.yml b/.beagle.yml index 5502d4b..af75e51 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,5 +1,3 @@ -# platform: -# runner: 10.11.92.37 kind: pipeline name: dev trigger: @@ -65,7 +63,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用，如果第三方登录改成ui-base dockerfile: .beagle/dockerfile repo: wod/apaas-system-ui # 生成镜像的 分组/名称 - version: "5.0.16" # 版本号 + version: "5.0.17" # 版本号 channel: amd64 args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址 @@ -80,7 +78,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 namespace: apaas-v5 deployment: apaas-manage-ui container: apaas-manage-ui - image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-amd64 + image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-amd64 environment: KUBERNETES_SERVER: from_secret: KUBERNETES_SERVER @@ -96,7 +94,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64 dockerfile: .beagle/dockerfile repo: wod/apaas-system-ui - version: "5.0.16" + version: "5.0.17" channel: arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com @@ -114,7 +112,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le dockerfile: .beagle/dockerfile repo: wod/apaas-system-ui - version: "5.0.16" + version: "5.0.17" channel: ppc64le args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com @@ -132,7 +130,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le dockerfile: .beagle/dockerfile repo: wod/apaas-system-ui - version: "5.0.16" + version: "5.0.17" channel: mips64le args: "TARGETOS=linux,TARGETARCH=mips64le" registry: registry.cn-qingdao.aliyuncs.com @@ -145,8 +143,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0 settings: platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le - template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-ARCH - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16 + template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-ARCH + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17 username: from_secret: REGISTRY_USER_ALIYUN password: @@ -181,7 +179,7 @@ steps: REGISTRY_PASSWORD: from_secret: REGISTRY_PASSWORD_ALIYUN settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-amd64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-amd64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-amd64 registry: registry.cn-qingdao.aliyuncs.com @@ -199,7 +197,7 @@ steps: REGISTRY_PASSWORD: from_secret: REGISTRY_PASSWORD_ALIYUN settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-arm64 registry: registry.cn-qingdao.aliyuncs.com @@ -217,7 +215,7 @@ steps: REGISTRY_PASSWORD: from_secret: REGISTRY_PASSWORD_ALIYUN settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-ppc64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-ppc64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-ppc64le registry: registry.cn-qingdao.aliyuncs.com @@ -235,7 +233,7 @@ steps: REGISTRY_PASSWORD: from_secret: REGISTRY_PASSWORD_ALIYUN settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.16-mips64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.17-mips64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-mips64le ##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------## --- @@ -266,25 +264,25 @@ get: kind: secret name: ACCESS_KEY_MINIO get: - name: ACCESS_KEY + name: ACCESS_KEY_MINIO path: devops-secrets --- kind: secret name: SECRET_KEY_MINIO get: - name: SECRET_KEY + name: SECRET_KEY_MINIO path: devops-secrets --- kind: secret name: REGISTRY_USER_ALIYUN get: - name: USERNAME - path: devops-registry-aliyun + name: REGISTRY_USER_ALIYUN + path: devops-secrets --- kind: secret name: REGISTRY_PASSWORD_ALIYUN get: - name: PASSWORD - path: devops-registry-aliyun + name: REGISTRY_PASSWORD_ALIYUN + path: devops-secrets diff --git a/index.html b/index.html index e1dafb2..468cd39 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@
+ diff --git a/static/config/configmap.js b/static/config/configmap.js new file mode 100644 index 0000000..c6c2063 --- /dev/null +++ b/static/config/configmap.js @@ -0,0 +1,3 @@ +window.serviceConfig = { + session_validity_max: 30 +}; \ No newline at end of file -- 2.26.0