+
+
{{wordTranslation(notification.content.status,'pipeline','task')}}
@@ -78,7 +78,7 @@
-
+
{{notification.content.title}}
@@ -385,14 +385,6 @@ export default {
color: #ff1949;
}
}
-
- .truncate {
- display: block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
}
}
}
diff --git a/zadig-portal/src/components/entry/home/sidebar.vue b/zadig-portal/src/components/entry/home/sidebar.vue
index 162d39becf..e4bb3264cd 100644
--- a/zadig-portal/src/components/entry/home/sidebar.vue
+++ b/zadig-portal/src/components/entry/home/sidebar.vue
@@ -169,6 +169,19 @@ export default {
url: 'system/storage'
}]
},
+ {
+ category_name: '资源管理',
+ items: [{
+ name: '集群管理',
+ icon: 'iconfont iconjiqun',
+ url: 'system/cluster'
+ },
+ {
+ name: '主机管理',
+ icon: 'iconfont iconzhuji',
+ url: 'system/host'
+ }]
+ },
{
category_name: '系统配置',
items: [{
diff --git a/zadig-portal/src/components/entry/login.vue b/zadig-portal/src/components/entry/login.vue
index ce927f6de6..c40446d321 100644
--- a/zadig-portal/src/components/entry/login.vue
+++ b/zadig-portal/src/components/entry/login.vue
@@ -36,6 +36,13 @@
class="btn-md btn-theme btn-block login-btn">
登录
+
+
+
+ SSO 登录
+
+
diff --git a/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
new file mode 100644
index 0000000000..9a0ba594b3
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
@@ -0,0 +1,1721 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 构建环境
+
+
+
+
+
+
+ {{sys.label}}
+
+ 自定义
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 应用列表
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+ 环境变量
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 敏感信息
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+
+
+ 缓存策略
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+
+ 构建脚本
+
+
+ 当前可用环境变量如下，可在构建脚本中进行引用
+ $WORKSPACE 工作目录
+ $IMAGE 输出镜像名称
+ $SERVICE 构建的服务名称
+ $DIST_DIR 构建出的 Tar 包的目的目录
+ $PKG_FILE 构建出的 Tar 包名称
+ $ENV_NAME 执行的环境名称
+ $BUILD_URL 构建任务的 URL
+ <REPONAME>_PR 构建过程中指定代码仓库使用的 Pull Request 信息
+ <REPONAME>_BRANCH 构建过程中指定代码仓库使用的分支信息
+ <REPONAME>_TAG 构建过程中指定代码仓库使用 Tag 信息
+
+ 变量
+
+
+
+
+
+
+
+
+
+
+
+
+ 镜像构建
+
+
+ $WORKSPACE/
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 二进制包归档
+
+
+ /$PKG_FILE
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+ 新增构建步骤
+
+
+ 镜像构建
+ 二进制包归档
+
+
+
+
+
+
+ 资源配置
+
+
+
+
+
+ {{item.env_name}}
+
+
+
+
+
+ 创建主机
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 部署配置
+
+
+
+
+ 本地直连部署
+
+
+ 本地直连部署：需确保本系统能连通或访问到脚本中的主机地址(含本机)
+
+
+
+
+ 使用 SSH Agent 远程部署
+
+
+ 使用 SSH Agent 远程部署：安全登陆到目标机器，执行部署操作，可在系统设置-主机管理中进行配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级设置
+
+
+
+
+
+
+
+
+
+
+ 健康阈值
+
+ 从不健康变为健康的连续探测次数
+
+
+ ：
+
+
+
+
+
+
+
+ 不健康阈值
+
+ 从健康变为不健康的连续探测次数
+
+
+ ：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/common/not_k8s/service_list.vue b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
new file mode 100644
index 0000000000..c676cb5d92
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+ {{ data.service_name }}
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/delivery/version/detail.vue b/zadig-portal/src/components/projects/delivery/version/detail.vue
index bf452a7488..8e50ca156a 100644
--- a/zadig-portal/src/components/projects/delivery/version/detail.vue
+++ b/zadig-portal/src/components/projects/delivery/version/detail.vue
@@ -488,7 +488,6 @@ export default {
})
}
if (current_version_info.deployInfo) {
- // 交付物部署
current_version_info.deployInfo.forEach(artifactDeploy => {
this.imagesAndConfigs.push({
serviceName: artifactDeploy.serviceName,
@@ -502,9 +501,9 @@ export default {
if (current_version_info.buildInfo) {
current_version_info.buildInfo.forEach(build => {
- // code list
+ // Code list
this.codeLists = this.codeLists.concat(build.commits)
- // jira issue
+ // Jira issues
if (build.issues.length > 0) {
this.jiraIssues.push({
service_name: build.serviceName,
@@ -516,7 +515,7 @@ export default {
if (current_version_info.testInfo) {
current_version_info.testInfo.forEach(test => {
- // test list
+ // Test list
this.testLists = this.testLists.concat(test.testReports)
})
}
@@ -545,7 +544,6 @@ export default {
},
showConfig (data) {
this.exportModal.visible = true
- // 清空，确保在请求返回后再触发editor的mounted
this.exportModal.textObjects = []
this.exportModal.textObjects = this.$utils.mapToArray(data, 'key').map(txt => ({
originalText: txt,
diff --git a/zadig-portal/src/components/projects/detail_ope/create.vue b/zadig-portal/src/components/projects/detail_ope/create.vue
index d1000f8187..01c8137fdc 100644
--- a/zadig-portal/src/components/projects/detail_ope/create.vue
+++ b/zadig-portal/src/components/projects/detail_ope/create.vue
@@ -57,7 +57,30 @@
+
+
+ 基础设施
+
+
+ Kubernetes：包括自建 K8s 和云厂商提供容器云服务
+ 云主机/物理机：包括物理机和云厂商提供的云服务器
+
+
+
+
+
+
+
+ Kubernetes
+ 云主机/物理机
+
+
+
@@ -65,6 +88,7 @@
K8s YAML 部署：使用 K8s 原生的 YAML配置方式部署服务
+ Helm Chart 部署：使用 Helm 工具部署服务
@@ -75,6 +99,8 @@
v-model="projectForm.product_feature.deploy_type">
K8s YAML 部署
+ Helm Chart 部署
@@ -224,7 +250,14 @@ export default {
})
this.$store.dispatch('refreshProjectTemplates')
if (payload.product_feature.basic_facility === 'kubernetes') {
- this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ if (payload.product_feature.deploy_type === 'k8s') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ }
+ if (payload.product_feature.deploy_type === 'helm') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/helm/info?rightbar=step`)
+ }
+ } else if (payload.product_feature.basic_facility === 'cloud_host') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/not_k8s/info`)
}
})
},
diff --git a/zadig-portal/src/components/projects/detail_ope/detail.vue b/zadig-portal/src/components/projects/detail_ope/detail.vue
index b12b5a552d..7515ab2935 100644
--- a/zadig-portal/src/components/projects/detail_ope/detail.vue
+++ b/zadig-portal/src/components/projects/detail_ope/detail.vue
@@ -196,6 +196,12 @@
+
+
+ {{`${scope.row.clusterName}`}}
+ {{`${scope.row.clusterType}`}}
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
new file mode 100644
index 0000000000..65a75470b4
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+ 当前版本
+
+
+
+
+
+ {{ scope.row.current_version }}
+
+
+
+
+ 新版本
+
+
+
+
+
+ {{ scope.row.latest_version }}
+
+
+
+
+ 版本对比
+
+
+
+
+
+
+
+
+ + - {{ section.value }}
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
new file mode 100644
index 0000000000..8dbbd8de13
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
similarity index 94%
rename from zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
rename to zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
index 902dfbd8a5..b30aaa707a 100644
--- a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
@@ -120,13 +120,7 @@ export default {
type: 'success'
})
}
- ).catch(() => {
- // const description = error.data.description
- // const res = description.match('the following services are modified since last update')
- // if(res) {
- // this.updateEnv(error.data.description)
- // }
- })
+ )
},
updateEnv (res) {
const message = JSON.parse(res.match(/{.+}/g)[0])
diff --git a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
index b693a3e0a8..d959a0ef8d 100644
--- a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
@@ -1,134 +1,207 @@
-
-
-
-
-
-
-
-
- {{`${env.envName}`}}
-
+
+
+
+
+
+
+
+
+ {{`${env.envName}`}}
+ 生产
+ 托管
-
-
-
-
- 新建环境
-
-
+
+
+
+
+ 新建环境
+
+
-
-
-
-
-
-
- 基本信息
+
-
-
-
- 更新时间:
-
-
- {{$utils.convertTimestamp(productInfo.update_time)}}
-
-
- 命名空间:
-
-
- {{ envText }}
-
-
-
-
- 环境状态:
-
-
-
- {{getEnvStatus(productInfo.status,productStatus.updatable)}}
-
-
-
-
-
- 基本操作:
-
-
-
-
+
+
+
+
+ 基本信息
+
+
+
+
+
+ 所属集群:
+
+
+
+ {{currentCluster.production?currentCluster.name+' (生产集群)':currentCluster.name +' (测试集群)'}}
+
+ 本地集群
+
+
+
+ 更新时间:
+
+
+ {{$utils.convertTimestamp(productInfo.update_time)}}
+
+
+
+
+ 命名空间:
+
+
+ {{ envText }}
+
+
+ 环境状态:
+
+
+
+ {{getProdStatus(productInfo.status,productStatus.updatable)}}
+
+
+
+
+
+ 基本操作:
+
+
+
+
+
+ 更新环境变量
+ 更新环境变量
+
+
+
+
+ 更新环境
+ 更新环境
+
+
- 更新环境变量
-
-
-
-
- 更新环境
+
+ 删除环境
+
+ 取消托管
+
+ 删除环境
+
+ 删除环境
+ 环境回收
-
-
-
- 删除环境
-
+
+
+
+
+
+ 更新环境变量
+
+
+ 更新环境
+
+
+
+ 删除环境
+
取消托管
- 环境回收
-
-
-
-
-
-
- 错误信息:
-
-
-
- {{productInfo.error}}
-
-
-
-
-
-
-
+ 删除环境
+
+ 删除环境
+
+
+
+
+
+
+ 错误信息:
+
+
+
+ {{productInfo.error}}
+
+
+
+
+
+
+
-
-
- 服务列表
- 共计 {{ envTotal }} 个服务
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.service_name }}
-
-
-
-
-
-
- 模板对比
-
-
-
- {{section.value}}
+
+
+ 服务列表
+ 共计 {{ envTotal }} 个服务
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+ 模板对比
+
+
+
+ {{section.value}}
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+
+ {{ scope.row.ready?scope.row.ready:'N/A' }}
+
+
+
+ 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
+ 实际正常的服务/预期的正常服务数量
+
-
-
-
-
- {{ scope.row.product_name }}
-
-
-
-
- {{ scope.row.ready?scope.row.ready:'N/A' }}
-
-
-
- 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
- 实际正常的服务/预期的正常服务数量
-
-
-
-
-
- {{scope.row.status}}
-
-
-
-
-
-
-
- {{imageNameSplit(image) }}
-
+
+
+ {{scope.row.status}}
+
-
-
-
-
-
-
-
- {{ingress.host}}
-
-
+
+
+
+
+
+ {{imageNameSplit(image) }}
+
+
- N/A
-
-
+
+
+
+
+
+
+ {{ingress.host}}
+
+
+
+ N/A
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+ 状态
-
-
-
+ 实际正常的服务/预期的正常服务数量
+
-
-
-
-
- 数据加载中 ~
- 数据已加载完毕 ~
-
-
-
+
+ {{calcPmServiceStatus(scope.row.env_statuses)}}
+
+
+
+
+
+
+
+ {{name}}
+
+
+
+ N/A
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据加载中 ~
+ 数据已加载完毕 ~
+
+
+
+
@@ -743,6 +1024,35 @@ export default {
overflow: auto;
font-size: 13px;
+ .helm-yaml-drawer {
+ .el-drawer__header {
+ margin-bottom: 10px;
+
+ :first-child {
+ &:focus {
+ outline: none;
+ }
+ }
+ }
+
+ .el-drawer__body {
+ padding: 20px;
+ }
+
+ .helm-yaml-drawer__content {
+ flex: 1;
+ }
+
+ .helm-yaml-drawer__footer {
+ display: flex;
+ margin-top: 15px;
+ }
+
+ .helm-yaml-drawer__footer button {
+ flex: 1;
+ }
+ }
+
.module-title h1 {
margin-bottom: 30px;
font-weight: 200;
@@ -797,100 +1107,6 @@ export default {
}
}
- .el-form-item__label {
- text-align: left;
- }
-
- .env-form {
- display: flex;
-
- .el-form-item {
- width: 50%;
- margin-right: 0;
- margin-bottom: 0;
- }
- }
-
- .service-form {
- margin: 10px 0 0 0;
- padding-left: 10px;
-
- .el-form-item {
- margin-bottom: 10px;
- }
-
- .group {
- margin-top: 10px;
- padding: 10px;
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
- }
- }
-
- .kv-container {
- .el-table {
- .unused {
- background: #e6effb;
- }
-
- .present {
- background: #fff;
- }
-
- .new {
- background: oldlace;
- }
- }
-
- .el-table__row {
- .cell {
- span {
- font-weight: 400;
- }
-
- .operate {
- font-size: 1.12rem;
-
- .delete {
- color: #ff1949;
- }
- }
- }
- }
-
- .render-value {
- display: block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .add-key-container {
- .el-form-item__label {
- display: none;
- }
-
- .el-form-item {
- margin-bottom: 15px;
- }
- }
-
- .add-kv-btn {
- display: inline-block;
- margin-top: 10px;
- margin-left: 5px;
-
- i {
- padding-right: 4px;
- color: #5e6166;
- color: #1989fa;
- font-size: 14px;
- line-height: 14px;
- cursor: pointer;
- }
- }
- }
-
.box-card,
.box-card-service {
margin-top: 25px;
@@ -921,35 +1137,6 @@ export default {
width: 140px;
}
}
-
- .services-container {
- p {
- margin: 0;
- padding: 0;
- line-height: 20px;
- }
-
- .container-name {
- color: #2f3033;
- font-weight: 700;
- }
-
- .el-table {
- .cell {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 5px;
- }
- }
-
- .service-wrap {
- padding-bottom: 20px;
-
- .service-name-tag {
- margin-bottom: 3px;
- }
- }
- }
}
.el-card__header {
@@ -1079,6 +1266,20 @@ export default {
width: 250px;
}
+ .el-form-item__label {
+ text-align: left;
+ }
+
+ .env-form {
+ display: flex;
+
+ .el-form-item {
+ width: 50%;
+ margin-right: 0;
+ margin-bottom: 0;
+ }
+ }
+
.second-title {
color: #606266;
font-size: 14px;
@@ -1105,10 +1306,21 @@ export default {
.el-tag {
background-color: rgba(64, 158, 255, 0.2);
+ }
+
+ .service-form {
+ margin: 10px 0 0 0;
+ padding-left: 10px;
- /* min-width: 500px; */
+ .el-form-item {
+ margin-bottom: 10px;
+ }
- /* text-align: center; */
+ .group {
+ margin-top: 10px;
+ padding: 10px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
}
.service {
@@ -1138,5 +1350,70 @@ export default {
.ops {
margin-top: 25px;
}
+
+ .kv-container {
+ .el-table {
+ .unused {
+ background: #e6effb;
+ }
+
+ .present {
+ background: #fff;
+ }
+
+ .new {
+ background: oldlace;
+ }
+ }
+
+ .el-table__row {
+ .cell {
+ span {
+ font-weight: 400;
+ }
+
+ .operate {
+ font-size: 1.12rem;
+
+ .delete {
+ color: #ff1949;
+ }
+ }
+ }
+ }
+
+ .render-value {
+ display: block;
+ max-width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .add-key-container {
+ .el-form-item__label {
+ display: none;
+ }
+
+ .el-form-item {
+ margin-bottom: 15px;
+ }
+ }
+
+ .add-kv-btn {
+ display: inline-block;
+ margin-top: 10px;
+ margin-left: 5px;
+
+ i {
+ padding-right: 4px;
+ color: #5e6166;
+ color: #1989fa;
+ font-size: 14px;
+ line-height: 14px;
+ cursor: pointer;
+ }
+ }
+ }
}
diff --git a/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
new file mode 100644
index 0000000000..6642c0dc88
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
@@ -0,0 +1,173 @@
+
+
+
+
+ 基本信息
+
+
+
+
+ 服务名称
+
+
+ {{serviceName}}
+
+
+
+
+
+
+ 服务状态
+
+
+
+
+
+
+ {{ scope.row.address }}
+
+
+
+
+
+ {{`${item.protocol}:${item.port}`}}
+ {{`${item.protocol}`}}
+ {{`${item.path}`}}
+
+
+
+
+
+ {{statusTranslation[scope.row.status]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
index 72e0de38cd..dc50bd6ae0 100644
--- a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
+++ b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
@@ -68,7 +68,7 @@
-
+
基本操作
@@ -335,6 +335,7 @@
:serviceName="serviceName"
:containerName="execModal.containerName"
:podName="execModal.podName"
+ :clusterId="clusterId"
:visible="execModal.visible"
ref="debug">
@@ -518,6 +519,9 @@ export default {
originProjectName () {
return (this.$route.query.originProjectName ? this.$route.query.originProjectName : this.projectName)
},
+ clusterId () {
+ return this.$route.query.clusterId
+ },
serviceName () {
return this.$route.params.service_name
},
@@ -527,6 +531,9 @@ export default {
envSource () {
return this.$route.query.envSource || ''
},
+ isProd () {
+ return this.$route.query.isProd === 'true'
+ },
notSupportYaml () {
return '没有找到数据'
},
@@ -562,7 +569,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
getServiceInfo(projectName, serviceName, envName, envType).then((res) => {
if (res.scales) {
if (res.scales.length > 0 && res.scales[0].pods.length > 0) {
@@ -616,7 +623,7 @@ export default {
this.$set(item, 'edit', false)
},
saveImage (item, scaleName, typeUppercase) {
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
const type = typeUppercase.toLowerCase()
item.edit = false
this.$message({
@@ -645,7 +652,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartServiceAPI(projectName, serviceName, envName, scaleName, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -658,7 +665,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
scaleServiceAPI(projectName, serviceName, envName, scaleName, scaleNumber, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -682,7 +689,7 @@ export default {
const ownerQuery = this.envName ? `&envName=${this.envName}` : ''
const projectName = `${this.projectName}${ownerQuery}`
const podName = pod.name
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartPodAPI(podName, projectName, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -705,7 +712,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.exportModal.visible = true
this.exportModal.textObjects = []
this.exportModal.loading = true
@@ -757,7 +764,7 @@ export default {
const projectName = this.projectName
const podName = pod.name
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
podEventAPI(projectName, podName, envName, envType).then((res) => {
this.eventsModal.data = res.map(row => {
@@ -770,7 +777,7 @@ export default {
showScaleEvents (scaleName, type) {
const projectName = this.projectName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
this.eventsModal.name = scaleName
scaleEventAPI(projectName, scaleName, envName, type, envType).then((res) => {
diff --git a/zadig-portal/src/components/projects/guide/helm/delivery.vue b/zadig-portal/src/components/projects/guide/helm/delivery.vue
new file mode 100644
index 0000000000..b70ddc40da
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/delivery.vue
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+ 你可能还需要：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/info_basic.vue b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
new file mode 100644
index 0000000000..5ff30f8867
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
@@ -0,0 +1,307 @@
+
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/runtime.vue b/zadig-portal/src/components/projects/guide/helm/runtime.vue
new file mode 100644
index 0000000000..181c0e1f86
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/runtime.vue
@@ -0,0 +1,450 @@
+
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+ 环境准备
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+
+
+
+
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
index 59381cc743..ac5c0dc891 100644
--- a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
+++ b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
@@ -197,8 +197,8 @@
:show-header="false"
style="width: 100%;">
-
-
+
@@ -208,7 +208,7 @@
@@ -216,8 +216,8 @@
-
-
+
@@ -227,7 +227,7 @@
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
new file mode 100644
index 0000000000..c6f09e9ce6
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+ 产品交付向导
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
new file mode 100644
index 0000000000..5cc8c81904
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+ 第二步
+ 配置服务的构建脚本，后续仍可在项目中重新配置
+
+
+
+
+ 
+ 暂无服务，创建服务请在左侧栏点击
+ 创建服务
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
new file mode 100644
index 0000000000..285a57bbd7
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+ 你可能还需要：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
new file mode 100644
index 0000000000..a40638af92
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+ 环境准备
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+
+
+
+
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
new file mode 100644
index 0000000000..52757e9c76
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
@@ -0,0 +1,297 @@
+
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/service_helm_guide.vue b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
new file mode 100644
index 0000000000..dea3abb86e
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+ 第二步
+ 创建服务模板，后续均可在项目中重新配置
+
+
+
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
index cc708097b0..6e2d374c21 100755
--- a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
+++ b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
@@ -185,7 +185,7 @@
-
创建版本
@@ -272,7 +272,7 @@ import virtualListItem from './virtual_list_item'
import workflowBuildRows from '@/components/common/workflow_build_rows.vue'
import workflowTestRows from '@/components/common/workflow_test_rows.vue'
import deployIcons from '@/components/common/deploy_icons'
-import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI } from '@api'
+import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI, getSingleProjectAPI } from '@api'
import virtualScrollList from 'vue-virtual-scroll-list'
export default {
data () {
@@ -300,6 +300,7 @@ export default {
startTaskLoading: false,
fastSelect: false,
createVersion: false,
+ isHelm: false,
versionInfo: {
version: '',
enabled: true,
@@ -446,6 +447,16 @@ export default {
}
},
methods: {
+ async checkProjectFeature (projectName) {
+ const res = await getSingleProjectAPI(projectName)
+ if (res.product_feature) {
+ if (res.product_feature.basic_facility === 'kubernetes') {
+ if (res.product_feature.deploy_type === 'helm') {
+ this.isHelm = true
+ }
+ }
+ }
+ },
changeVirtualData (event, row, index) {
const opt = event ? 0 : -1
const id = this.imageMap[row.name].map(img => img.full).indexOf(row.image) + opt
diff --git a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
index c28565b38f..f6f4f0025e 100755
--- a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
+++ b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
@@ -202,7 +202,6 @@
-
-
+
@@ -201,7 +201,7 @@
@@ -209,8 +209,8 @@
-
-
+
@@ -220,7 +220,7 @@
diff --git a/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
new file mode 100644
index 0000000000..feb8d036c2
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service.vue b/zadig-portal/src/components/projects/service_mgr/service.vue
index b387c98e58..63659a07af 100644
--- a/zadig-portal/src/components/projects/service_mgr/service.vue
+++ b/zadig-portal/src/components/projects/service_mgr/service.vue
@@ -1,318 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无服务，点击
- 创建服务
- 请在左侧选择需要编辑的服务
- 请在左侧选择需要编辑的服务
-
-
-
-
-
-
- 环境更新
-
-
-
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_k8s.vue b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
new file mode 100644
index 0000000000..d57091aa90
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
@@ -0,0 +1,316 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无服务，点击
+ 创建服务
+ 请在左侧选择需要编辑的服务
+ 请在左侧选择需要编辑的服务
+
+
+
+
+
+
+ 环境更新
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_pm.vue b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
new file mode 100644
index 0000000000..9b8e436e8b
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
@@ -0,0 +1,173 @@
+
+
+ 暂无服务，创建服务请在左侧栏点击
+ 创建服务
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
index 54b47700c0..ab6503ca5b 100755
--- a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
+++ b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
@@ -149,7 +149,6 @@
+
{{notification.content.title}}
@@ -385,14 +385,6 @@ export default {
color: #ff1949;
}
}
-
- .truncate {
- display: block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
}
}
}
diff --git a/zadig-portal/src/components/entry/home/sidebar.vue b/zadig-portal/src/components/entry/home/sidebar.vue
index 162d39becf..e4bb3264cd 100644
--- a/zadig-portal/src/components/entry/home/sidebar.vue
+++ b/zadig-portal/src/components/entry/home/sidebar.vue
@@ -169,6 +169,19 @@ export default {
url: 'system/storage'
}]
},
+ {
+ category_name: '资源管理',
+ items: [{
+ name: '集群管理',
+ icon: 'iconfont iconjiqun',
+ url: 'system/cluster'
+ },
+ {
+ name: '主机管理',
+ icon: 'iconfont iconzhuji',
+ url: 'system/host'
+ }]
+ },
{
category_name: '系统配置',
items: [{
diff --git a/zadig-portal/src/components/entry/login.vue b/zadig-portal/src/components/entry/login.vue
index ce927f6de6..c40446d321 100644
--- a/zadig-portal/src/components/entry/login.vue
+++ b/zadig-portal/src/components/entry/login.vue
@@ -36,6 +36,13 @@
class="btn-md btn-theme btn-block login-btn">
登录
+
+
+
+ SSO 登录
+
+
diff --git a/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
new file mode 100644
index 0000000000..9a0ba594b3
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
@@ -0,0 +1,1721 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 构建环境
+
+
+
+
+
+
+ {{sys.label}}
+
+ 自定义
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 应用列表
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+ 环境变量
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 敏感信息
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+
+
+ 缓存策略
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+
+
+
+
+ 构建脚本
+
+
+ 当前可用环境变量如下，可在构建脚本中进行引用
+ $WORKSPACE 工作目录
+ $IMAGE 输出镜像名称
+ $SERVICE 构建的服务名称
+ $DIST_DIR 构建出的 Tar 包的目的目录
+ $PKG_FILE 构建出的 Tar 包名称
+ $ENV_NAME 执行的环境名称
+ $BUILD_URL 构建任务的 URL
+ <REPONAME>_PR 构建过程中指定代码仓库使用的 Pull Request 信息
+ <REPONAME>_BRANCH 构建过程中指定代码仓库使用的分支信息
+ <REPONAME>_TAG 构建过程中指定代码仓库使用 Tag 信息
+
+ 变量
+
+
+
+
+
+
+
+
+
+
+
+
+ 镜像构建
+
+
+ $WORKSPACE/
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 二进制包归档
+
+
+ /$PKG_FILE
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+ 新增构建步骤
+
+
+ 镜像构建
+ 二进制包归档
+
+
+
+
+
+
+ 资源配置
+
+
+
+
+
+ {{item.env_name}}
+
+
+
+
+
+ 创建主机
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 部署配置
+
+
+
+
+ 本地直连部署
+
+
+ 本地直连部署：需确保本系统能连通或访问到脚本中的主机地址(含本机)
+
+
+
+
+ 使用 SSH Agent 远程部署
+
+
+ 使用 SSH Agent 远程部署：安全登陆到目标机器，执行部署操作，可在系统设置-主机管理中进行配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级设置
+
+
+
+
+
+
+
+
+
+
+ 健康阈值
+
+ 从不健康变为健康的连续探测次数
+
+
+ ：
+
+
+
+
+
+
+
+ 不健康阈值
+
+ 从健康变为不健康的连续探测次数
+
+
+ ：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/common/not_k8s/service_list.vue b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
new file mode 100644
index 0000000000..c676cb5d92
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+ {{ data.service_name }}
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/delivery/version/detail.vue b/zadig-portal/src/components/projects/delivery/version/detail.vue
index bf452a7488..8e50ca156a 100644
--- a/zadig-portal/src/components/projects/delivery/version/detail.vue
+++ b/zadig-portal/src/components/projects/delivery/version/detail.vue
@@ -488,7 +488,6 @@ export default {
})
}
if (current_version_info.deployInfo) {
- // 交付物部署
current_version_info.deployInfo.forEach(artifactDeploy => {
this.imagesAndConfigs.push({
serviceName: artifactDeploy.serviceName,
@@ -502,9 +501,9 @@ export default {
if (current_version_info.buildInfo) {
current_version_info.buildInfo.forEach(build => {
- // code list
+ // Code list
this.codeLists = this.codeLists.concat(build.commits)
- // jira issue
+ // Jira issues
if (build.issues.length > 0) {
this.jiraIssues.push({
service_name: build.serviceName,
@@ -516,7 +515,7 @@ export default {
if (current_version_info.testInfo) {
current_version_info.testInfo.forEach(test => {
- // test list
+ // Test list
this.testLists = this.testLists.concat(test.testReports)
})
}
@@ -545,7 +544,6 @@ export default {
},
showConfig (data) {
this.exportModal.visible = true
- // 清空，确保在请求返回后再触发editor的mounted
this.exportModal.textObjects = []
this.exportModal.textObjects = this.$utils.mapToArray(data, 'key').map(txt => ({
originalText: txt,
diff --git a/zadig-portal/src/components/projects/detail_ope/create.vue b/zadig-portal/src/components/projects/detail_ope/create.vue
index d1000f8187..01c8137fdc 100644
--- a/zadig-portal/src/components/projects/detail_ope/create.vue
+++ b/zadig-portal/src/components/projects/detail_ope/create.vue
@@ -57,7 +57,30 @@
+
+
+ 基础设施
+
+
+ Kubernetes：包括自建 K8s 和云厂商提供容器云服务
+ 云主机/物理机：包括物理机和云厂商提供的云服务器
+
+
+
+
+
+
+
+ Kubernetes
+ 云主机/物理机
+
+
+
@@ -65,6 +88,7 @@
K8s YAML 部署：使用 K8s 原生的 YAML配置方式部署服务
+ Helm Chart 部署：使用 Helm 工具部署服务
@@ -75,6 +99,8 @@
v-model="projectForm.product_feature.deploy_type">
K8s YAML 部署
+ Helm Chart 部署
@@ -224,7 +250,14 @@ export default {
})
this.$store.dispatch('refreshProjectTemplates')
if (payload.product_feature.basic_facility === 'kubernetes') {
- this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ if (payload.product_feature.deploy_type === 'k8s') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ }
+ if (payload.product_feature.deploy_type === 'helm') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/helm/info?rightbar=step`)
+ }
+ } else if (payload.product_feature.basic_facility === 'cloud_host') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/not_k8s/info`)
}
})
},
diff --git a/zadig-portal/src/components/projects/detail_ope/detail.vue b/zadig-portal/src/components/projects/detail_ope/detail.vue
index b12b5a552d..7515ab2935 100644
--- a/zadig-portal/src/components/projects/detail_ope/detail.vue
+++ b/zadig-portal/src/components/projects/detail_ope/detail.vue
@@ -196,6 +196,12 @@
+
+
+ {{`${scope.row.clusterName}`}}
+ {{`${scope.row.clusterType}`}}
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
new file mode 100644
index 0000000000..65a75470b4
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+ 当前版本
+
+
+
+
+
+ {{ scope.row.current_version }}
+
+
+
+
+ 新版本
+
+
+
+
+
+ {{ scope.row.latest_version }}
+
+
+
+
+ 版本对比
+
+
+
+
+
+
+
+
+ + - {{ section.value }}
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
new file mode 100644
index 0000000000..8dbbd8de13
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
similarity index 94%
rename from zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
rename to zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
index 902dfbd8a5..b30aaa707a 100644
--- a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
@@ -120,13 +120,7 @@ export default {
type: 'success'
})
}
- ).catch(() => {
- // const description = error.data.description
- // const res = description.match('the following services are modified since last update')
- // if(res) {
- // this.updateEnv(error.data.description)
- // }
- })
+ )
},
updateEnv (res) {
const message = JSON.parse(res.match(/{.+}/g)[0])
diff --git a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
index b693a3e0a8..d959a0ef8d 100644
--- a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
@@ -1,134 +1,207 @@
-
-
-
-
-
-
-
-
- {{`${env.envName}`}}
-
+
+
+
+
+
+
+
+
+ {{`${env.envName}`}}
+ 生产
+ 托管
-
-
-
-
- 新建环境
-
-
+
+
+
+
+ 新建环境
+
+
-
-
-
-
-
-
- 基本信息
+
-
-
-
- 更新时间:
-
-
- {{$utils.convertTimestamp(productInfo.update_time)}}
-
-
- 命名空间:
-
-
- {{ envText }}
-
-
-
-
- 环境状态:
-
-
-
- {{getEnvStatus(productInfo.status,productStatus.updatable)}}
-
-
-
-
-
- 基本操作:
-
-
-
-
+
+
+
+
+ 基本信息
+
+
+
+
+
+ 所属集群:
+
+
+
+ {{currentCluster.production?currentCluster.name+' (生产集群)':currentCluster.name +' (测试集群)'}}
+
+ 本地集群
+
+
+
+ 更新时间:
+
+
+ {{$utils.convertTimestamp(productInfo.update_time)}}
+
+
+
+
+ 命名空间:
+
+
+ {{ envText }}
+
+
+ 环境状态:
+
+
+
+ {{getProdStatus(productInfo.status,productStatus.updatable)}}
+
+
+
+
+
+ 基本操作:
+
+
+
+
+
+ 更新环境变量
+ 更新环境变量
+
+
+
+
+ 更新环境
+ 更新环境
+
+
- 更新环境变量
-
-
-
-
- 更新环境
+
+ 删除环境
+
+ 取消托管
+
+ 删除环境
+
+ 删除环境
+ 环境回收
-
-
-
- 删除环境
-
+
+
+
+
+
+ 更新环境变量
+
+
+ 更新环境
+
+
+
+ 删除环境
+
取消托管
- 环境回收
-
-
-
-
-
-
- 错误信息:
-
-
-
- {{productInfo.error}}
-
-
-
-
-
-
-
+ 删除环境
+
+ 删除环境
+
+
+
+
+
+
+ 错误信息:
+
+
+
+ {{productInfo.error}}
+
+
+
+
+
+
+
-
-
- 服务列表
- 共计 {{ envTotal }} 个服务
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.service_name }}
-
-
-
-
-
-
- 模板对比
-
-
-
- {{section.value}}
+
+
+ 服务列表
+ 共计 {{ envTotal }} 个服务
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+ 模板对比
+
+
+
+ {{section.value}}
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+
+ {{ scope.row.ready?scope.row.ready:'N/A' }}
+
+
+
+ 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
+ 实际正常的服务/预期的正常服务数量
+
-
-
-
-
- {{ scope.row.product_name }}
-
-
-
-
- {{ scope.row.ready?scope.row.ready:'N/A' }}
-
-
-
- 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
- 实际正常的服务/预期的正常服务数量
-
-
-
-
-
- {{scope.row.status}}
-
-
-
-
-
-
-
- {{imageNameSplit(image) }}
-
+
+
+ {{scope.row.status}}
+
-
-
-
-
-
-
-
- {{ingress.host}}
-
-
+
+
+
+
+
+ {{imageNameSplit(image) }}
+
+
- N/A
-
-
+
+
+
+
+
+
+ {{ingress.host}}
+
+
+
+ N/A
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+ 状态
-
-
-
+ 实际正常的服务/预期的正常服务数量
+
-
-
-
-
- 数据加载中 ~
- 数据已加载完毕 ~
-
-
-
+
+ {{calcPmServiceStatus(scope.row.env_statuses)}}
+
+
+
+
+
+
+
+ {{name}}
+
+
+
+ N/A
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据加载中 ~
+ 数据已加载完毕 ~
+
+
+
+
@@ -743,6 +1024,35 @@ export default {
overflow: auto;
font-size: 13px;
+ .helm-yaml-drawer {
+ .el-drawer__header {
+ margin-bottom: 10px;
+
+ :first-child {
+ &:focus {
+ outline: none;
+ }
+ }
+ }
+
+ .el-drawer__body {
+ padding: 20px;
+ }
+
+ .helm-yaml-drawer__content {
+ flex: 1;
+ }
+
+ .helm-yaml-drawer__footer {
+ display: flex;
+ margin-top: 15px;
+ }
+
+ .helm-yaml-drawer__footer button {
+ flex: 1;
+ }
+ }
+
.module-title h1 {
margin-bottom: 30px;
font-weight: 200;
@@ -797,100 +1107,6 @@ export default {
}
}
- .el-form-item__label {
- text-align: left;
- }
-
- .env-form {
- display: flex;
-
- .el-form-item {
- width: 50%;
- margin-right: 0;
- margin-bottom: 0;
- }
- }
-
- .service-form {
- margin: 10px 0 0 0;
- padding-left: 10px;
-
- .el-form-item {
- margin-bottom: 10px;
- }
-
- .group {
- margin-top: 10px;
- padding: 10px;
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
- }
- }
-
- .kv-container {
- .el-table {
- .unused {
- background: #e6effb;
- }
-
- .present {
- background: #fff;
- }
-
- .new {
- background: oldlace;
- }
- }
-
- .el-table__row {
- .cell {
- span {
- font-weight: 400;
- }
-
- .operate {
- font-size: 1.12rem;
-
- .delete {
- color: #ff1949;
- }
- }
- }
- }
-
- .render-value {
- display: block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .add-key-container {
- .el-form-item__label {
- display: none;
- }
-
- .el-form-item {
- margin-bottom: 15px;
- }
- }
-
- .add-kv-btn {
- display: inline-block;
- margin-top: 10px;
- margin-left: 5px;
-
- i {
- padding-right: 4px;
- color: #5e6166;
- color: #1989fa;
- font-size: 14px;
- line-height: 14px;
- cursor: pointer;
- }
- }
- }
-
.box-card,
.box-card-service {
margin-top: 25px;
@@ -921,35 +1137,6 @@ export default {
width: 140px;
}
}
-
- .services-container {
- p {
- margin: 0;
- padding: 0;
- line-height: 20px;
- }
-
- .container-name {
- color: #2f3033;
- font-weight: 700;
- }
-
- .el-table {
- .cell {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 5px;
- }
- }
-
- .service-wrap {
- padding-bottom: 20px;
-
- .service-name-tag {
- margin-bottom: 3px;
- }
- }
- }
}
.el-card__header {
@@ -1079,6 +1266,20 @@ export default {
width: 250px;
}
+ .el-form-item__label {
+ text-align: left;
+ }
+
+ .env-form {
+ display: flex;
+
+ .el-form-item {
+ width: 50%;
+ margin-right: 0;
+ margin-bottom: 0;
+ }
+ }
+
.second-title {
color: #606266;
font-size: 14px;
@@ -1105,10 +1306,21 @@ export default {
.el-tag {
background-color: rgba(64, 158, 255, 0.2);
+ }
+
+ .service-form {
+ margin: 10px 0 0 0;
+ padding-left: 10px;
- /* min-width: 500px; */
+ .el-form-item {
+ margin-bottom: 10px;
+ }
- /* text-align: center; */
+ .group {
+ margin-top: 10px;
+ padding: 10px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
}
.service {
@@ -1138,5 +1350,70 @@ export default {
.ops {
margin-top: 25px;
}
+
+ .kv-container {
+ .el-table {
+ .unused {
+ background: #e6effb;
+ }
+
+ .present {
+ background: #fff;
+ }
+
+ .new {
+ background: oldlace;
+ }
+ }
+
+ .el-table__row {
+ .cell {
+ span {
+ font-weight: 400;
+ }
+
+ .operate {
+ font-size: 1.12rem;
+
+ .delete {
+ color: #ff1949;
+ }
+ }
+ }
+ }
+
+ .render-value {
+ display: block;
+ max-width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .add-key-container {
+ .el-form-item__label {
+ display: none;
+ }
+
+ .el-form-item {
+ margin-bottom: 15px;
+ }
+ }
+
+ .add-kv-btn {
+ display: inline-block;
+ margin-top: 10px;
+ margin-left: 5px;
+
+ i {
+ padding-right: 4px;
+ color: #5e6166;
+ color: #1989fa;
+ font-size: 14px;
+ line-height: 14px;
+ cursor: pointer;
+ }
+ }
+ }
}
diff --git a/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
new file mode 100644
index 0000000000..6642c0dc88
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
@@ -0,0 +1,173 @@
+
+
+
+
+ 基本信息
+
+
+
+
+ 服务名称
+
+
+ {{serviceName}}
+
+
+
+
+
+
+ 服务状态
+
+
+
+
+
+
+ {{ scope.row.address }}
+
+
+
+
+
+ {{`${item.protocol}:${item.port}`}}
+ {{`${item.protocol}`}}
+ {{`${item.path}`}}
+
+
+
+
+
+ {{statusTranslation[scope.row.status]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
index 72e0de38cd..dc50bd6ae0 100644
--- a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
+++ b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
@@ -68,7 +68,7 @@
-
+
基本操作
@@ -335,6 +335,7 @@
:serviceName="serviceName"
:containerName="execModal.containerName"
:podName="execModal.podName"
+ :clusterId="clusterId"
:visible="execModal.visible"
ref="debug">
@@ -518,6 +519,9 @@ export default {
originProjectName () {
return (this.$route.query.originProjectName ? this.$route.query.originProjectName : this.projectName)
},
+ clusterId () {
+ return this.$route.query.clusterId
+ },
serviceName () {
return this.$route.params.service_name
},
@@ -527,6 +531,9 @@ export default {
envSource () {
return this.$route.query.envSource || ''
},
+ isProd () {
+ return this.$route.query.isProd === 'true'
+ },
notSupportYaml () {
return '没有找到数据'
},
@@ -562,7 +569,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
getServiceInfo(projectName, serviceName, envName, envType).then((res) => {
if (res.scales) {
if (res.scales.length > 0 && res.scales[0].pods.length > 0) {
@@ -616,7 +623,7 @@ export default {
this.$set(item, 'edit', false)
},
saveImage (item, scaleName, typeUppercase) {
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
const type = typeUppercase.toLowerCase()
item.edit = false
this.$message({
@@ -645,7 +652,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartServiceAPI(projectName, serviceName, envName, scaleName, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -658,7 +665,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
scaleServiceAPI(projectName, serviceName, envName, scaleName, scaleNumber, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -682,7 +689,7 @@ export default {
const ownerQuery = this.envName ? `&envName=${this.envName}` : ''
const projectName = `${this.projectName}${ownerQuery}`
const podName = pod.name
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartPodAPI(podName, projectName, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -705,7 +712,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.exportModal.visible = true
this.exportModal.textObjects = []
this.exportModal.loading = true
@@ -757,7 +764,7 @@ export default {
const projectName = this.projectName
const podName = pod.name
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
podEventAPI(projectName, podName, envName, envType).then((res) => {
this.eventsModal.data = res.map(row => {
@@ -770,7 +777,7 @@ export default {
showScaleEvents (scaleName, type) {
const projectName = this.projectName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
this.eventsModal.name = scaleName
scaleEventAPI(projectName, scaleName, envName, type, envType).then((res) => {
diff --git a/zadig-portal/src/components/projects/guide/helm/delivery.vue b/zadig-portal/src/components/projects/guide/helm/delivery.vue
new file mode 100644
index 0000000000..b70ddc40da
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/delivery.vue
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+ 你可能还需要：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/info_basic.vue b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
new file mode 100644
index 0000000000..5ff30f8867
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
@@ -0,0 +1,307 @@
+
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/runtime.vue b/zadig-portal/src/components/projects/guide/helm/runtime.vue
new file mode 100644
index 0000000000..181c0e1f86
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/runtime.vue
@@ -0,0 +1,450 @@
+
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+ 环境准备
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+
+
+
+
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
index 59381cc743..ac5c0dc891 100644
--- a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
+++ b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
@@ -197,8 +197,8 @@
:show-header="false"
style="width: 100%;">
-
-
+
@@ -208,7 +208,7 @@
@@ -216,8 +216,8 @@
-
-
+
@@ -227,7 +227,7 @@
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
new file mode 100644
index 0000000000..c6f09e9ce6
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+ 产品交付向导
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
new file mode 100644
index 0000000000..5cc8c81904
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+ 第二步
+ 配置服务的构建脚本，后续仍可在项目中重新配置
+
+
+
+
+ 暂无服务，创建服务请在左侧栏点击
+ 创建服务
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
new file mode 100644
index 0000000000..285a57bbd7
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+ 你可能还需要：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
new file mode 100644
index 0000000000..a40638af92
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+ 环境准备
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+
+
+
+
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
new file mode 100644
index 0000000000..52757e9c76
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
@@ -0,0 +1,297 @@
+
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/service_helm_guide.vue b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
new file mode 100644
index 0000000000..dea3abb86e
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+ 第二步
+ 创建服务模板，后续均可在项目中重新配置
+
+
+
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
index cc708097b0..6e2d374c21 100755
--- a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
+++ b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
@@ -185,7 +185,7 @@
-
创建版本
@@ -272,7 +272,7 @@ import virtualListItem from './virtual_list_item'
import workflowBuildRows from '@/components/common/workflow_build_rows.vue'
import workflowTestRows from '@/components/common/workflow_test_rows.vue'
import deployIcons from '@/components/common/deploy_icons'
-import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI } from '@api'
+import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI, getSingleProjectAPI } from '@api'
import virtualScrollList from 'vue-virtual-scroll-list'
export default {
data () {
@@ -300,6 +300,7 @@ export default {
startTaskLoading: false,
fastSelect: false,
createVersion: false,
+ isHelm: false,
versionInfo: {
version: '',
enabled: true,
@@ -446,6 +447,16 @@ export default {
}
},
methods: {
+ async checkProjectFeature (projectName) {
+ const res = await getSingleProjectAPI(projectName)
+ if (res.product_feature) {
+ if (res.product_feature.basic_facility === 'kubernetes') {
+ if (res.product_feature.deploy_type === 'helm') {
+ this.isHelm = true
+ }
+ }
+ }
+ },
changeVirtualData (event, row, index) {
const opt = event ? 0 : -1
const id = this.imageMap[row.name].map(img => img.full).indexOf(row.image) + opt
diff --git a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
index c28565b38f..f6f4f0025e 100755
--- a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
+++ b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
@@ -202,7 +202,6 @@
-
-
+
@@ -201,7 +201,7 @@
@@ -209,8 +209,8 @@
-
-
+
@@ -220,7 +220,7 @@
diff --git a/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
new file mode 100644
index 0000000000..feb8d036c2
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service.vue b/zadig-portal/src/components/projects/service_mgr/service.vue
index b387c98e58..63659a07af 100644
--- a/zadig-portal/src/components/projects/service_mgr/service.vue
+++ b/zadig-portal/src/components/projects/service_mgr/service.vue
@@ -1,318 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无服务，点击
- 创建服务
- 请在左侧选择需要编辑的服务
- 请在左侧选择需要编辑的服务
-
-
-
-
-
-
- 环境更新
-
-
-
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_k8s.vue b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
new file mode 100644
index 0000000000..d57091aa90
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
@@ -0,0 +1,316 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无服务，点击
+ 创建服务
+ 请在左侧选择需要编辑的服务
+ 请在左侧选择需要编辑的服务
+
+
+
+
+
+
+ 环境更新
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_pm.vue b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
new file mode 100644
index 0000000000..9b8e436e8b
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
@@ -0,0 +1,173 @@
+
+
+ 暂无服务，创建服务请在左侧栏点击
+ 创建服务
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
index 54b47700c0..ab6503ca5b 100755
--- a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
+++ b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
@@ -149,7 +149,6 @@
diff --git a/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
new file mode 100644
index 0000000000..9a0ba594b3
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/not_k8s_form.vue
@@ -0,0 +1,1721 @@
+
+
+
+
+ 基础设施
+
+
+
+
+
+
+ Kubernetes
+ 云主机/物理机
+
+
+
@@ -65,6 +88,7 @@
@@ -75,6 +99,8 @@
v-model="projectForm.product_feature.deploy_type">
K8s YAML 部署
+ Helm Chart 部署
@@ -224,7 +250,14 @@ export default {
})
this.$store.dispatch('refreshProjectTemplates')
if (payload.product_feature.basic_facility === 'kubernetes') {
- this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ if (payload.product_feature.deploy_type === 'k8s') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/basic/info?rightbar=step`)
+ }
+ if (payload.product_feature.deploy_type === 'helm') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/helm/info?rightbar=step`)
+ }
+ } else if (payload.product_feature.basic_facility === 'cloud_host') {
+ this.$router.push(`/v1/projects/create/${payload.product_name}/not_k8s/info`)
}
})
},
diff --git a/zadig-portal/src/components/projects/detail_ope/detail.vue b/zadig-portal/src/components/projects/detail_ope/detail.vue
index b12b5a552d..7515ab2935 100644
--- a/zadig-portal/src/components/projects/detail_ope/detail.vue
+++ b/zadig-portal/src/components/projects/detail_ope/detail.vue
@@ -196,6 +196,12 @@
+
+
+ {{`${scope.row.clusterName}`}}
+ {{`${scope.row.clusterType}`}}
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
new file mode 100644
index 0000000000..65a75470b4
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmEnvDialog.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
similarity index 94%
rename from zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
rename to zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
index 902dfbd8a5..b30aaa707a 100644
--- a/zadig-portal/src/components/projects/env/env_detail/components/update_k8s_var_dialog.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateK8sVarDialog.vue
@@ -120,13 +120,7 @@ export default {
type: 'success'
})
}
- ).catch(() => {
- // const description = error.data.description
- // const res = description.match('the following services are modified since last update')
- // if(res) {
- // this.updateEnv(error.data.description)
- // }
- })
+ )
},
updateEnv (res) {
const message = JSON.parse(res.match(/{.+}/g)[0])
diff --git a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
index b693a3e0a8..d959a0ef8d 100644
--- a/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
+++ b/zadig-portal/src/components/projects/env/env_detail/env_detail_comp.vue
@@ -1,134 +1,207 @@
-
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/common/not_k8s/service_list.vue b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
new file mode 100644
index 0000000000..c676cb5d92
--- /dev/null
+++ b/zadig-portal/src/components/projects/common/not_k8s/service_list.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 构建环境
+
+
+
+
+
+
+ {{sys.label}}
+
+ 自定义
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 应用列表
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+
+ 环境变量
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 敏感信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+
+ 缓存策略
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增
+
+
+
+ 构建脚本
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前可用环境变量如下，可在构建脚本中进行引用
+ $WORKSPACE 工作目录
+ $IMAGE 输出镜像名称
+ $SERVICE 构建的服务名称
+ $DIST_DIR 构建出的 Tar 包的目的目录
+ $PKG_FILE 构建出的 Tar 包名称
+ $ENV_NAME 执行的环境名称
+ $BUILD_URL 构建任务的 URL
+ <REPONAME>_PR 构建过程中指定代码仓库使用的 Pull Request 信息
+ <REPONAME>_BRANCH 构建过程中指定代码仓库使用的分支信息
+ <REPONAME>_TAG 构建过程中指定代码仓库使用 Tag 信息 +
+ 变量
+ + $WORKSPACE 工作目录
+ $IMAGE 输出镜像名称
+ $SERVICE 构建的服务名称
+ $DIST_DIR 构建出的 Tar 包的目的目录
+ $PKG_FILE 构建出的 Tar 包名称
+ $ENV_NAME 执行的环境名称
+ $BUILD_URL 构建任务的 URL
+ <REPONAME>_PR 构建过程中指定代码仓库使用的 Pull Request 信息
+ <REPONAME>_BRANCH 构建过程中指定代码仓库使用的分支信息
+ <REPONAME>_TAG 构建过程中指定代码仓库使用 Tag 信息 +
+ 镜像构建
+
+
+ $WORKSPACE/
+
+
+
+
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+
+
+
+ 二进制包归档
+
+
+ /$PKG_FILE
+ $WORKSPACE/
+
+
+
+
+
+
+
+
+ 新增构建步骤
+
+
+ 镜像构建
+ 二进制包归档
+
+
+
+
+
+
+ 资源配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.env_name}}
+
+
+ 创建主机
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 部署配置
+
+
+
+
+
+
+
+
+
+
+
+
+ 本地直连部署
+
+
+
+ 使用 SSH Agent 远程部署
+
+
+
+
+
+
+
+
+
+
+ 本地直连部署：需确保本系统能连通或访问到脚本中的主机地址(含本机)
+
+
+
+ 使用 SSH Agent 远程部署：安全登陆到目标机器，执行部署操作，可在系统设置-主机管理中进行配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级设置
+
+
+
+
+
+
+
+
+
+
+ 健康阈值
+
+
+ ：
+
+
+
+
+
+
+
+ 不健康阈值
+
+
+ ：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 从不健康变为健康的连续探测次数
+
+ 从健康变为不健康的连续探测次数
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+ {{ data.service_name }}
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/delivery/version/detail.vue b/zadig-portal/src/components/projects/delivery/version/detail.vue
index bf452a7488..8e50ca156a 100644
--- a/zadig-portal/src/components/projects/delivery/version/detail.vue
+++ b/zadig-portal/src/components/projects/delivery/version/detail.vue
@@ -488,7 +488,6 @@ export default {
})
}
if (current_version_info.deployInfo) {
- // 交付物部署
current_version_info.deployInfo.forEach(artifactDeploy => {
this.imagesAndConfigs.push({
serviceName: artifactDeploy.serviceName,
@@ -502,9 +501,9 @@ export default {
if (current_version_info.buildInfo) {
current_version_info.buildInfo.forEach(build => {
- // code list
+ // Code list
this.codeLists = this.codeLists.concat(build.commits)
- // jira issue
+ // Jira issues
if (build.issues.length > 0) {
this.jiraIssues.push({
service_name: build.serviceName,
@@ -516,7 +515,7 @@ export default {
if (current_version_info.testInfo) {
current_version_info.testInfo.forEach(test => {
- // test list
+ // Test list
this.testLists = this.testLists.concat(test.testReports)
})
}
@@ -545,7 +544,6 @@ export default {
},
showConfig (data) {
this.exportModal.visible = true
- // 清空，确保在请求返回后再触发editor的mounted
this.exportModal.textObjects = []
this.exportModal.textObjects = this.$utils.mapToArray(data, 'key').map(txt => ({
originalText: txt,
diff --git a/zadig-portal/src/components/projects/detail_ope/create.vue b/zadig-portal/src/components/projects/detail_ope/create.vue
index d1000f8187..01c8137fdc 100644
--- a/zadig-portal/src/components/projects/detail_ope/create.vue
+++ b/zadig-portal/src/components/projects/detail_ope/create.vue
@@ -57,7 +57,30 @@
+ Kubernetes：包括自建 K8s 和云厂商提供容器云服务
+ 云主机/物理机：包括物理机和云厂商提供的云服务器 +
+
+ + 云主机/物理机：包括物理机和云厂商提供的云服务器 +
K8s YAML 部署：使用 K8s 原生的 YAML配置方式部署服务
+ Helm Chart 部署：使用 Helm 工具部署服务
+ Helm Chart 部署：使用 Helm 工具部署服务
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+ 当前版本
+
+
+
+
+
+ {{ scope.row.current_version }}
+
+
+
+
+ 新版本
+
+
+
+
+
+ {{ scope.row.latest_version }}
+
+
+
+
+ 版本对比
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
new file mode 100644
index 0000000000..8dbbd8de13
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/env_detail/components/updateHelmVarDialog.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+ ++ - {{ section.value }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{`${env.envName}`}}
-
+
+
+
-
-
+
+
-
-
+
+
@@ -743,6 +1024,35 @@ export default {
overflow: auto;
font-size: 13px;
+ .helm-yaml-drawer {
+ .el-drawer__header {
+ margin-bottom: 10px;
+
+ :first-child {
+ &:focus {
+ outline: none;
+ }
+ }
+ }
+
+ .el-drawer__body {
+ padding: 20px;
+ }
+
+ .helm-yaml-drawer__content {
+ flex: 1;
+ }
+
+ .helm-yaml-drawer__footer {
+ display: flex;
+ margin-top: 15px;
+ }
+
+ .helm-yaml-drawer__footer button {
+ flex: 1;
+ }
+ }
+
.module-title h1 {
margin-bottom: 30px;
font-weight: 200;
@@ -797,100 +1107,6 @@ export default {
}
}
- .el-form-item__label {
- text-align: left;
- }
-
- .env-form {
- display: flex;
-
- .el-form-item {
- width: 50%;
- margin-right: 0;
- margin-bottom: 0;
- }
- }
-
- .service-form {
- margin: 10px 0 0 0;
- padding-left: 10px;
-
- .el-form-item {
- margin-bottom: 10px;
- }
-
- .group {
- margin-top: 10px;
- padding: 10px;
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
- }
- }
-
- .kv-container {
- .el-table {
- .unused {
- background: #e6effb;
- }
-
- .present {
- background: #fff;
- }
-
- .new {
- background: oldlace;
- }
- }
-
- .el-table__row {
- .cell {
- span {
- font-weight: 400;
- }
-
- .operate {
- font-size: 1.12rem;
-
- .delete {
- color: #ff1949;
- }
- }
- }
- }
-
- .render-value {
- display: block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .add-key-container {
- .el-form-item__label {
- display: none;
- }
-
- .el-form-item {
- margin-bottom: 15px;
- }
- }
-
- .add-kv-btn {
- display: inline-block;
- margin-top: 10px;
- margin-left: 5px;
-
- i {
- padding-right: 4px;
- color: #5e6166;
- color: #1989fa;
- font-size: 14px;
- line-height: 14px;
- cursor: pointer;
- }
- }
- }
-
.box-card,
.box-card-service {
margin-top: 25px;
@@ -921,35 +1137,6 @@ export default {
width: 140px;
}
}
-
- .services-container {
- p {
- margin: 0;
- padding: 0;
- line-height: 20px;
- }
-
- .container-name {
- color: #2f3033;
- font-weight: 700;
- }
-
- .el-table {
- .cell {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 5px;
- }
- }
-
- .service-wrap {
- padding-bottom: 20px;
-
- .service-name-tag {
- margin-bottom: 3px;
- }
- }
- }
}
.el-card__header {
@@ -1079,6 +1266,20 @@ export default {
width: 250px;
}
+ .el-form-item__label {
+ text-align: left;
+ }
+
+ .env-form {
+ display: flex;
+
+ .el-form-item {
+ width: 50%;
+ margin-right: 0;
+ margin-bottom: 0;
+ }
+ }
+
.second-title {
color: #606266;
font-size: 14px;
@@ -1105,10 +1306,21 @@ export default {
.el-tag {
background-color: rgba(64, 158, 255, 0.2);
+ }
+
+ .service-form {
+ margin: 10px 0 0 0;
+ padding-left: 10px;
- /* min-width: 500px; */
+ .el-form-item {
+ margin-bottom: 10px;
+ }
- /* text-align: center; */
+ .group {
+ margin-top: 10px;
+ padding: 10px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
}
.service {
@@ -1138,5 +1350,70 @@ export default {
.ops {
margin-top: 25px;
}
+
+ .kv-container {
+ .el-table {
+ .unused {
+ background: #e6effb;
+ }
+
+ .present {
+ background: #fff;
+ }
+
+ .new {
+ background: oldlace;
+ }
+ }
+
+ .el-table__row {
+ .cell {
+ span {
+ font-weight: 400;
+ }
+
+ .operate {
+ font-size: 1.12rem;
+
+ .delete {
+ color: #ff1949;
+ }
+ }
+ }
+ }
+
+ .render-value {
+ display: block;
+ max-width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .add-key-container {
+ .el-form-item__label {
+ display: none;
+ }
+
+ .el-form-item {
+ margin-bottom: 15px;
+ }
+ }
+
+ .add-kv-btn {
+ display: inline-block;
+ margin-top: 10px;
+ margin-left: 5px;
+
+ i {
+ padding-right: 4px;
+ color: #5e6166;
+ color: #1989fa;
+ font-size: 14px;
+ line-height: 14px;
+ cursor: pointer;
+ }
+ }
+ }
}
diff --git a/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
new file mode 100644
index 0000000000..6642c0dc88
--- /dev/null
+++ b/zadig-portal/src/components/projects/env/inner_env/pm_service_detail.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+ {{`${env.envName}`}}
+ 生产
+ 托管
-
-
-
-
- 新建环境
-
-
+
+
+
+
+ 新建环境
+
+
-
-
-
-
- 基本信息
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 更新时间:
- {{$utils.convertTimestamp(productInfo.update_time)}}
- 命名空间:
- {{ envText }}
- 环境状态:
-
- {{getEnvStatus(productInfo.status,productStatus.updatable)}}
-
- 基本操作:
-
-
+
+
+
+
-
-
+ 删除环境
+
+ 删除环境
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- 所属集群:
+
+ {{currentCluster.production?currentCluster.name+' (生产集群)':currentCluster.name +' (测试集群)'}}
+
+ 本地集群
+ 更新时间:
+ {{$utils.convertTimestamp(productInfo.update_time)}}
+ 命名空间:
+ {{ envText }}
+ 环境状态:
+
+ {{getProdStatus(productInfo.status,productStatus.updatable)}}
+
+ 基本操作:
+
+
+
+ 更新环境变量
+ 更新环境变量
+
+
+
+
+ 更新环境
+ 更新环境
+
+
- 更新环境变量
-
-
-
-
- 更新环境
+
+ 删除环境
+
+ 取消托管
+
+ 删除环境
+
+ 删除环境
+ 环境回收
-
-
-
- 删除环境
-
+
+
+
+ 更新环境变量
+
+
+ 更新环境
+
+
+
+ 删除环境
+
取消托管
- 环境回收
-
-
- 错误信息:
-
- {{productInfo.error}}
-
- 错误信息:
+
+ {{productInfo.error}}
+
+
- 服务列表
- 共计 {{ envTotal }} 个服务
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.service_name }}
-
-
-
-
-
-
- 模板对比
-
-
+
+ {{calcPmServiceStatus(scope.row.env_statuses)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+
+ {{ scope.row.ready?scope.row.ready:'N/A' }}
+
+
+
+ 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
+
-
-
-
-
- {{ scope.row.product_name }}
-
-
-
-
- {{ scope.row.ready?scope.row.ready:'N/A' }}
-
-
-
- 状态{{`(${runningContainerService}/${containerServiceList.length})`}}
-
-
-
-
-
- {{scope.row.status}}
-
-
-
-
-
-
-
- {{imageNameSplit(image) }}
-
+
+
+ {{scope.row.status}}
+
-
-
-
-
-
-
-
- {{ingress.host}}
-
-
+
+
+
+
+
+ {{imageNameSplit(image) }}
+
+
- N/A
-
-
+
+
+
+
+
+
+ {{ingress.host}}
+
+
+
+ N/A
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.product_name }}
+
+
+
+ 状态
-
-
-
+
-
-
-
-
-
-
- {{section.value}}
+
+ 服务列表
+ 共计 {{ envTotal }} 个服务
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.service_name }}
+
+
+
+
+
+
+ 模板对比
+
+
-
-
-
-
+
-
+
{{section.value}}
+ 实际正常的服务/预期的正常服务数量
+
实际正常的服务/预期的正常服务数量
-
- 实际正常的服务/预期的正常服务数量
+
数据加载中 ~
-数据已加载完毕 ~
-
+
+ {{name}}
+
+
+
+ N/A
+
+ 数据加载中 ~
+数据已加载完毕 ~
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
index 72e0de38cd..dc50bd6ae0 100644
--- a/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
+++ b/zadig-portal/src/components/projects/env/inner_env/service_detail.vue
@@ -68,7 +68,7 @@
+
+
+
+
+
+
+ 基本信息
+
+
+ 服务名称
+
+
+
+ {{serviceName}}
+
+
+
+ 服务状态
+
+
+
+
+
+
+ {{ scope.row.address }}
+
+
+
+
+
+
+
+ {{statusTranslation[scope.row.status]}}
+
+
+
+
+
+
+
+ {{`${item.protocol}:${item.port}`}}
+ {{`${item.protocol}`}}
+ {{`${item.path}`}}
+
+
+
+
-
-
+
@@ -208,7 +208,7 @@
@@ -216,8 +216,8 @@
-
-
+
@@ -227,7 +227,7 @@
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
new file mode 100644
index 0000000000..c6f09e9ce6
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/container/step_not_k8s.vue
@@ -0,0 +1,104 @@
+
+
-
创建版本
@@ -272,7 +272,7 @@ import virtualListItem from './virtual_list_item'
import workflowBuildRows from '@/components/common/workflow_build_rows.vue'
import workflowTestRows from '@/components/common/workflow_test_rows.vue'
import deployIcons from '@/components/common/deploy_icons'
-import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI } from '@api'
+import { listProductAPI, precreateWorkflowTaskAPI, getAllBranchInfoAPI, runWorkflowAPI, getBuildTargetsAPI, getRegistryWhenBuildAPI, imagesAPI, getSingleProjectAPI } from '@api'
import virtualScrollList from 'vue-virtual-scroll-list'
export default {
data () {
@@ -300,6 +300,7 @@ export default {
startTaskLoading: false,
fastSelect: false,
createVersion: false,
+ isHelm: false,
versionInfo: {
version: '',
enabled: true,
@@ -446,6 +447,16 @@ export default {
}
},
methods: {
+ async checkProjectFeature (projectName) {
+ const res = await getSingleProjectAPI(projectName)
+ if (res.product_feature) {
+ if (res.product_feature.basic_facility === 'kubernetes') {
+ if (res.product_feature.deploy_type === 'helm') {
+ this.isHelm = true
+ }
+ }
+ }
+ },
changeVirtualData (event, row, index) {
const opt = event ? 0 : -1
const id = this.imageMap[row.name].map(img => img.full).indexOf(row.image) + opt
diff --git a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
index c28565b38f..f6f4f0025e 100755
--- a/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
+++ b/zadig-portal/src/components/projects/pipeline/workflow_multi_task_detail/task_detail_build.vue
@@ -202,7 +202,6 @@
-
-
+
@@ -201,7 +201,7 @@
@@ -209,8 +209,8 @@
-
-
+
@@ -220,7 +220,7 @@
diff --git a/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
new file mode 100644
index 0000000000..feb8d036c2
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/not_k8s/updateEnv.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service.vue b/zadig-portal/src/components/projects/service_mgr/service.vue
index b387c98e58..63659a07af 100644
--- a/zadig-portal/src/components/projects/service_mgr/service.vue
+++ b/zadig-portal/src/components/projects/service_mgr/service.vue
@@ -1,318 +1,46 @@
-
基本操作
@@ -335,6 +335,7 @@
:serviceName="serviceName"
:containerName="execModal.containerName"
:podName="execModal.podName"
+ :clusterId="clusterId"
:visible="execModal.visible"
ref="debug">
@@ -518,6 +519,9 @@ export default {
originProjectName () {
return (this.$route.query.originProjectName ? this.$route.query.originProjectName : this.projectName)
},
+ clusterId () {
+ return this.$route.query.clusterId
+ },
serviceName () {
return this.$route.params.service_name
},
@@ -527,6 +531,9 @@ export default {
envSource () {
return this.$route.query.envSource || ''
},
+ isProd () {
+ return this.$route.query.isProd === 'true'
+ },
notSupportYaml () {
return '没有找到数据'
},
@@ -562,7 +569,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
getServiceInfo(projectName, serviceName, envName, envType).then((res) => {
if (res.scales) {
if (res.scales.length > 0 && res.scales[0].pods.length > 0) {
@@ -616,7 +623,7 @@ export default {
this.$set(item, 'edit', false)
},
saveImage (item, scaleName, typeUppercase) {
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
const type = typeUppercase.toLowerCase()
item.edit = false
this.$message({
@@ -645,7 +652,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartServiceAPI(projectName, serviceName, envName, scaleName, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -658,7 +665,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
scaleServiceAPI(projectName, serviceName, envName, scaleName, scaleNumber, type, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -682,7 +689,7 @@ export default {
const ownerQuery = this.envName ? `&envName=${this.envName}` : ''
const projectName = `${this.projectName}${ownerQuery}`
const podName = pod.name
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
restartPodAPI(podName, projectName, envType).then((res) => {
this.fetchServiceData()
this.$message({
@@ -705,7 +712,7 @@ export default {
const projectName = this.projectName
const serviceName = this.serviceName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.exportModal.visible = true
this.exportModal.textObjects = []
this.exportModal.loading = true
@@ -757,7 +764,7 @@ export default {
const projectName = this.projectName
const podName = pod.name
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
podEventAPI(projectName, podName, envName, envType).then((res) => {
this.eventsModal.data = res.map(row => {
@@ -770,7 +777,7 @@ export default {
showScaleEvents (scaleName, type) {
const projectName = this.projectName
const envName = this.envName ? this.envName : ''
- const envType = ''
+ const envType = this.isProd ? 'prod' : ''
this.eventsModal.visible = true
this.eventsModal.name = scaleName
scaleEventAPI(projectName, scaleName, envName, type, envType).then((res) => {
diff --git a/zadig-portal/src/components/projects/guide/helm/delivery.vue b/zadig-portal/src/components/projects/guide/helm/delivery.vue
new file mode 100644
index 0000000000..b70ddc40da
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/delivery.vue
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/info_basic.vue b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
new file mode 100644
index 0000000000..5ff30f8867
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/info_basic.vue
@@ -0,0 +1,307 @@
+
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+ + 你可能还需要： +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/helm/runtime.vue b/zadig-portal/src/components/projects/guide/helm/runtime.vue
new file mode 100644
index 0000000000..181c0e1f86
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/helm/runtime.vue
@@ -0,0 +1,450 @@
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2 套测试环境
+ dev,qa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3 条工作流
+
+ {{projectName}}-workflow-dev , {{projectName}}-workflow-qa ,
+ {{projectName}}-workflow-ops
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
index 59381cc743..ac5c0dc891 100644
--- a/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
+++ b/zadig-portal/src/components/projects/guide/k8s/container/service_aside.vue
@@ -197,8 +197,8 @@
:show-header="false"
style="width: 100%;">
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+ 环境准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开发环境：dev
+
+ ，开发日常自测、业务联调
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+ 开发工作流：{{projectName}}-workflow-dev，应用日常升级，用于开发自测和联调
+
+
+ 测试工作流：{{projectName}}-workflow-qa，应用按需升级，用于自动化测试和业务验收
+
+
+ 运维工作流：{{projectName}}-workflow-ops，业务按需发布，用于版本升级和业务上线
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
new file mode 100644
index 0000000000..5cc8c81904
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_config.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+ + 产品交付向导 +
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
new file mode 100644
index 0000000000..285a57bbd7
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_delivery.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+
+ 第二步
+ 配置服务的构建脚本，后续仍可在项目中重新配置
+
+
+
+
+
+
+
+ 暂无服务，创建服务请在左侧栏点击
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
new file mode 100644
index 0000000000..a40638af92
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_deploy.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+
+
+
+ 第四步
+ 运行工作流触发服务的自动化交付
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ `${scope.row.env_name}`}}
+
+
+
+
+
+
+
+
+
+ 构建部署
+
+
+
+ 交付物部署
+
+
+
+ 测试
+
+
+ 分发
+
+
+
+
+
+ {{$utils.convertTimestamp(scope.row.update_time)}}
+
+
+
+
+ 点击运行
+
+
+
+
+
+
+
+
+
+ {{item.host}}
+
+
+
+ + 你可能还需要： +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
new file mode 100644
index 0000000000..52757e9c76
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/not_k8s/not_k8s_info.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+ 第三步
+ 将服务加入运行环境，并准备对应的交付工作流，后续均可在项目中进行配置
+
+
+
+
+
+
+ 环境正在准备中，可点击 “下一步” 或者
+ 查看环境状态
+
+
+
+
+ 环境准备
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开发环境：dev
+
+ ，开发日常自测、业务联调
+ {{env.err_message}}
+
+
+ 测试环境：qa
+
+ ，测试环境（自动化测试、业务验收）
+ {{env.err_message}}
+
+
+
+
+
+
+
+
+
+ 工作流准备
+
+
+
+
+
+
+
+
+
+
+
+
+ 开发工作流：{{projectName}}-workflow-dev，应用日常升级，用于开发自测和联调
+
+
+ 测试工作流：{{projectName}}-workflow-qa，应用按需升级，用于自动化测试和业务验收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/guide/service_helm_guide.vue b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
new file mode 100644
index 0000000000..dea3abb86e
--- /dev/null
+++ b/zadig-portal/src/components/projects/guide/service_helm_guide.vue
@@ -0,0 +1,159 @@
+
+
+
+ 恭喜你成功创建新的项目 {{this.projectName}}
+
+
+
+
+
+
+
+ 第一步
+ 对项目的流程做初步定义后，后续可在项目中进行调整。当您创建好服务后，我们会为你做如下的智能交付准备。KodeRover
+ 会自动生成以下资源：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2 套测试环境
+ dev,qa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2 条工作流
+
+ {{projectName}}-workflow-dev , {{projectName}}-workflow-qa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
index cc708097b0..6e2d374c21 100755
--- a/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
+++ b/zadig-portal/src/components/projects/pipeline/common/run_workflow.vue
@@ -185,7 +185,7 @@
+
+
+
+
+
+
+ 第二步
+ 创建服务模板，后续均可在项目中重新配置
+
+
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无服务，点击
请在左侧选择需要编辑的服务
-请在左侧选择需要编辑的服务
-
-
-
- 环境更新
-
-
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_k8s.vue b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
new file mode 100644
index 0000000000..d57091aa90
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_k8s.vue
@@ -0,0 +1,316 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/service_mgr/service_pm.vue b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
new file mode 100644
index 0000000000..9b8e436e8b
--- /dev/null
+++ b/zadig-portal/src/components/projects/service_mgr/service_pm.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无服务，点击
请在左侧选择需要编辑的服务
+请在左侧选择需要编辑的服务
+
+
+
+ 环境更新
+
+
+
+
+
+
+
diff --git a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
index 54b47700c0..ab6503ca5b 100755
--- a/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
+++ b/zadig-portal/src/components/projects/test/common/function/container/task_detail_test.vue
@@ -149,7 +149,6 @@
+
+
+
+
+
+ 暂无服务，创建服务请在左侧栏点击
+
+
+
+
+
-