From 091bb11bdb8201c50f3e592f2027ab020d18a757 Mon Sep 17 00:00:00 2001 From: cgw Date: Sat, 12 Aug 2023 10:53:10 +0800 Subject: [PATCH] v1.3.1 --- README.md | 2 +- dhorse-agent/pom.xml | 2 +- dhorse-api/pom.xml | 2 +- dhorse-application/pom.xml | 2 +- dhorse-infrastructure/pom.xml | 2 +- .../infrastructure/strategy/cluster/K8sClusterStrategy.java | 4 ++-- .../src/main/resources/maven/app_node_pom.xml | 2 +- .../src/main/resources/maven/app_tmp_pom.xml | 2 +- dhorse-rest/pom.xml | 2 +- dhorse-rest/src/main/resources/application-private.yml | 2 +- dhorse-rest/src/main/resources/banner.txt | 2 +- pom.xml | 4 ++-- static/index.html | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5634d7d7..bafdf4ec 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ DHorse是一个简单易用、以应用为中心的云原生DevOps系统,具 2. 下载安装文件 -[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.3.0/dhorse-v1.3.0-bin.tar.gz) +[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.3.1/dhorse-v1.3.1-bin.tar.gz) 3. 解压 diff --git a/dhorse-agent/pom.xml b/dhorse-agent/pom.xml index 31c149bc..ae646daf 100644 --- a/dhorse-agent/pom.xml +++ b/dhorse-agent/pom.xml @@ -5,7 +5,7 @@ org.dhorse dhorse-parent - 1.3.0 + 1.3.1 .. dhorse-agent diff --git a/dhorse-api/pom.xml b/dhorse-api/pom.xml index 5782158b..7105268e 100644 --- a/dhorse-api/pom.xml +++ b/dhorse-api/pom.xml @@ -5,7 +5,7 @@ org.dhorse dhorse-parent - 1.3.0 + 1.3.1 .. dhorse-api diff --git a/dhorse-application/pom.xml b/dhorse-application/pom.xml index a18e25e7..e559ce6c 100644 --- a/dhorse-application/pom.xml +++ b/dhorse-application/pom.xml @@ -6,7 +6,7 @@ org.dhorse dhorse-parent - 1.3.0 + 1.3.1 .. dhorse-application diff --git a/dhorse-infrastructure/pom.xml b/dhorse-infrastructure/pom.xml index 1e05aec8..0e8eaf8c 100644 --- a/dhorse-infrastructure/pom.xml +++ b/dhorse-infrastructure/pom.xml @@ -6,7 +6,7 @@ org.dhorse dhorse-parent - 1.3.0 + 1.3.1 .. dhorse-infrastructure diff --git a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java index 9c212552..ae647cb9 100644 --- a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java +++ b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java @@ -250,7 +250,7 @@ public boolean createDeployment(DeploymentContext context) { if (CollectionUtils.isEmpty(oldDeployment.getItems())) { api.createNamespacedDeployment(namespace, deployment, null, null, null, null); } else { - //配合升级,v1.3.0以后版本应该只使用replaceNamespacedDeployment + //配合升级,v1.3.1以后版本应该只使用replaceNamespacedDeployment if(oldDeployment.getItems().get(0).getMetadata().getLabels().get(K8sUtils.APP_KEY) == null) { api.replaceNamespacedDeployment(context.getDeploymentName(), namespace, deployment, null, null, null, null); @@ -313,7 +313,7 @@ private boolean createService(DeploymentContext context) throws ApiException { logger.info("Start to update service"); } - //配合升级,v1.3.0以后版本应当删除 + //配合升级,v1.3.1以后版本应当删除 V1Service service = serviceList.getItems().get(0); if(service.getMetadata().getLabels().get(K8sUtils.APP_KEY) != null) { //先删除,再创建 diff --git a/dhorse-infrastructure/src/main/resources/maven/app_node_pom.xml b/dhorse-infrastructure/src/main/resources/maven/app_node_pom.xml index 258a687a..a7e07dea 100644 --- a/dhorse-infrastructure/src/main/resources/maven/app_node_pom.xml +++ b/dhorse-infrastructure/src/main/resources/maven/app_node_pom.xml @@ -7,7 +7,7 @@ org.dhorse app-node pom - 1.3.0 + 1.3.1 diff --git a/dhorse-infrastructure/src/main/resources/maven/app_tmp_pom.xml b/dhorse-infrastructure/src/main/resources/maven/app_tmp_pom.xml index 1f7d6d5a..5952f5bf 100644 --- a/dhorse-infrastructure/src/main/resources/maven/app_tmp_pom.xml +++ b/dhorse-infrastructure/src/main/resources/maven/app_tmp_pom.xml @@ -6,7 +6,7 @@ org.dhorse app-tmp - 1.3.0 + 1.3.1 org.springframework.boot diff --git a/dhorse-rest/pom.xml b/dhorse-rest/pom.xml index 7ad84cdc..61ddfc42 100644 --- a/dhorse-rest/pom.xml +++ b/dhorse-rest/pom.xml @@ -6,7 +6,7 @@ org.dhorse dhorse-parent - 1.3.0 + 1.3.1 .. dhorse-rest diff --git a/dhorse-rest/src/main/resources/application-private.yml b/dhorse-rest/src/main/resources/application-private.yml index 949a6179..53ab0931 100644 --- a/dhorse-rest/src/main/resources/application-private.yml +++ b/dhorse-rest/src/main/resources/application-private.yml @@ -1,4 +1,4 @@ -version: 1.3.0 +version: 1.3.1 spring.jackson.default-property-inclusion: non_null spring.jackson.date-format: yyyy-MM-dd HH:mm:ss spring.jackson.time-zone: GMT+8 diff --git a/dhorse-rest/src/main/resources/banner.txt b/dhorse-rest/src/main/resources/banner.txt index 78acd49c..cb3b0cc7 100644 --- a/dhorse-rest/src/main/resources/banner.txt +++ b/dhorse-rest/src/main/resources/banner.txt @@ -4,5 +4,5 @@ / _` | '_ \ / _ \| '__/ __|/ _ \ | (_| | | | | (_) | | \__ \ __/ \__,_|_| |_|\___/|_| |___/\___| - :: DHorse :: (v1.3.0) + :: DHorse :: (v1.3.1) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3f4fd3c5..93e9434d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.dhorse dhorse-parent pom - 1.3.0 + 1.3.1 UTF-8 @@ -16,7 +16,7 @@ 1.8 ${java.version} ${java.version} - 1.3.0 + 1.3.1 5.3.24 2.7.6 diff --git a/static/index.html b/static/index.html index b5f5ec63..34abec84 100644 --- a/static/index.html +++ b/static/index.html @@ -107,7 +107,7 @@
-
v1.3.0
+
v1.3.1