Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KubeSphere
kubesphere
提交
9fc0f8d8
K
kubesphere
项目概览
KubeSphere
/
kubesphere
通知
144
Star
32
Fork
5
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
2
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
2
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9fc0f8d8
编写于
3月 24, 2021
作者:
L
LiHui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix: remove checks of the exists of release when delete app and repo
Signed-off-by:
N
LiHui
<
andrewli@yunify.com
>
上级
542eb180
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
49 deletion
+17
-49
pkg/kapis/openpitrix/v1/handler.go
pkg/kapis/openpitrix/v1/handler.go
+6
-1
pkg/models/openpitrix/applications.go
pkg/models/openpitrix/applications.go
+2
-11
pkg/models/openpitrix/applicationversions.go
pkg/models/openpitrix/applicationversions.go
+0
-22
pkg/models/openpitrix/release.go
pkg/models/openpitrix/release.go
+5
-0
pkg/models/openpitrix/repos.go
pkg/models/openpitrix/repos.go
+4
-15
未找到文件。
pkg/kapis/openpitrix/v1/handler.go
浏览文件 @
9fc0f8d8
...
...
@@ -20,6 +20,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"io/ioutil"
apierrors
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/api"
...
...
@@ -595,7 +596,11 @@ func (h *openpitrixHandler) GetAppVersionFiles(req *restful.Request, resp *restf
if
err
!=
nil
{
klog
.
Errorln
(
err
)
handleOpenpitrixError
(
resp
,
err
)
if
apierrors
.
IsNotFound
(
err
)
{
api
.
HandleNotFound
(
resp
,
nil
,
err
)
}
else
{
api
.
HandleBadRequest
(
resp
,
nil
,
err
)
}
return
}
...
...
pkg/models/openpitrix/applications.go
浏览文件 @
9fc0f8d8
...
...
@@ -324,25 +324,16 @@ func (c *applicationOperator) DeleteApp(id string) error {
app
,
err
:=
c
.
appLister
.
Get
(
id
)
if
err
!=
nil
{
if
apierrors
.
IsNotFound
(
err
)
{
klog
.
V
(
4
)
.
Infof
(
"app %s has been deleted"
,
id
)
return
nil
}
else
{
klog
.
Error
(
err
)
return
nil
klog
.
Error
f
(
"get app %s failed, error: %s"
,
id
,
err
)
return
err
}
}
ls
:=
map
[
string
]
string
{
constants
.
ChartApplicationIdLabelKey
:
app
.
GetHelmApplicationId
(),
}
releases
,
err
:=
c
.
rlsLister
.
List
(
labels
.
SelectorFromSet
(
ls
))
if
err
!=
nil
&&
!
apierrors
.
IsNotFound
(
err
)
{
klog
.
Error
(
err
)
return
err
}
else
if
len
(
releases
)
>
0
{
return
fmt
.
Errorf
(
"app %s has releases not deleted"
,
id
)
}
list
,
err
:=
c
.
versionLister
.
List
(
labels
.
SelectorFromSet
(
ls
))
if
err
!=
nil
{
...
...
pkg/models/openpitrix/applicationversions.go
浏览文件 @
9fc0f8d8
...
...
@@ -114,28 +114,6 @@ func (c *applicationOperator) DeleteAppVersion(id string) error {
return
actionNotPermitted
}
// check release
rls
,
err
:=
c
.
rlsLister
.
List
(
labels
.
SelectorFromSet
(
map
[
string
]
string
{
constants
.
ChartApplicationVersionIdLabelKey
:
id
}))
if
err
!=
nil
&&
!
apierrors
.
IsNotFound
(
err
)
{
return
err
}
if
len
(
rls
)
>
0
{
klog
.
V
(
4
)
.
Infof
(
"There are releases use data from app version %s"
,
id
)
infoMap
:=
make
(
map
[
string
]
string
)
allString
:=
&
bytes
.
Buffer
{}
for
_
,
r
:=
range
rls
{
info
:=
fmt
.
Sprintf
(
"%s/%s"
,
r
.
GetWorkspace
(),
r
.
GetRlsNamespace
())
if
_
,
exists
:=
infoMap
[
info
];
!
exists
{
infoMap
[
info
]
=
""
allString
.
WriteString
(
info
)
if
len
(
infoMap
)
>
1
{
allString
.
WriteString
(
","
)
}
}
}
return
fmt
.
Errorf
(
"release exists: %s"
,
allString
.
String
())
}
// Delete data in storage
err
=
c
.
backingStoreClient
.
Delete
(
dataKeyInStorage
(
appVersion
.
GetWorkspace
(),
id
))
if
err
!=
nil
{
...
...
pkg/models/openpitrix/release.go
浏览文件 @
9fc0f8d8
...
...
@@ -267,6 +267,11 @@ func (c *releaseOperator) ListApplications(workspace, clusterName, namespace str
ls
[
constants
.
ChartApplicationVersionIdLabelKey
]
=
versionId
}
repoId
:=
conditions
.
Match
[
RepoId
]
if
repoId
!=
""
{
ls
[
constants
.
ChartRepoIdLabelKey
]
=
repoId
}
if
workspace
!=
""
{
ls
[
constants
.
WorkspaceLabelKey
]
=
workspace
}
...
...
pkg/models/openpitrix/repos.go
浏览文件 @
9fc0f8d8
...
...
@@ -16,7 +16,6 @@ package openpitrix
import
(
"context"
"encoding/json"
"fmt"
"github.com/go-openapi/strfmt"
apierrors
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
@@ -126,7 +125,7 @@ func (c *repoOperator) CreateRepo(repo *v1alpha1.HelmRepo) (*CreateRepoResponse,
repo
.
Spec
.
Description
=
stringutils
.
ShortenString
(
repo
.
Spec
.
Description
,
DescriptionLen
)
_
,
err
=
c
.
repoClient
.
HelmRepos
()
.
Create
(
context
.
TODO
(),
repo
,
metav1
.
CreateOptions
{})
if
err
!=
nil
{
klog
.
Errorf
(
"create helm repo failed, repo
d
_id: %s, error: %s"
,
repo
.
GetHelmRepoId
(),
err
)
klog
.
Errorf
(
"create helm repo failed, repo_id: %s, error: %s"
,
repo
.
GetHelmRepoId
(),
err
)
return
nil
,
err
}
else
{
klog
.
V
(
4
)
.
Infof
(
"create helm repo success, repo_id: %s"
,
repo
.
GetHelmRepoId
())
...
...
@@ -136,20 +135,10 @@ func (c *repoOperator) CreateRepo(repo *v1alpha1.HelmRepo) (*CreateRepoResponse,
}
func
(
c
*
repoOperator
)
DeleteRepo
(
id
string
)
error
{
ls
:=
map
[
string
]
string
{
constants
.
ChartRepoIdLabelKey
:
id
,
}
releases
,
err
:=
c
.
rlsLister
.
List
(
labels
.
SelectorFromSet
(
ls
))
if
err
!=
nil
&&
apierrors
.
IsNotFound
(
err
)
{
return
err
}
else
if
len
(
releases
)
>
0
{
return
fmt
.
Errorf
(
"repo %s has releases not deleted"
,
id
)
}
var
err
error
err
=
c
.
repoClient
.
HelmRepos
()
.
Delete
(
context
.
TODO
(),
id
,
metav1
.
DeleteOptions
{})
if
err
!=
nil
&&
apierrors
.
IsNotFound
(
err
)
{
klog
.
Error
(
err
)
if
err
!=
nil
&&
!
apierrors
.
IsNotFound
(
err
)
{
klog
.
Error
f
(
"delete repo %s failed, error: %s"
,
id
,
err
)
return
err
}
klog
.
V
(
4
)
.
Infof
(
"repo %s deleted"
,
id
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录