Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
9a1bc1ae
Commit
9a1bc1ae
authored
Jun 05, 2017
by
Matt Butcher
Committed by
GitHub
Jun 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2540 from yan234280533/uninstall-name-check
adjust the check parameter order for uninstall
parents
577f8a82
d3b14db3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
release_uninstall.go
pkg/tiller/release_uninstall.go
+6
-6
No files found.
pkg/tiller/release_uninstall.go
View file @
9a1bc1ae
...
...
@@ -30,12 +30,6 @@ import (
// UninstallRelease deletes all of the resources associated with this release, and marks the release DELETED.
func
(
s
*
ReleaseServer
)
UninstallRelease
(
c
ctx
.
Context
,
req
*
services
.
UninstallReleaseRequest
)
(
*
services
.
UninstallReleaseResponse
,
error
)
{
err
:=
s
.
env
.
Releases
.
LockRelease
(
req
.
Name
)
if
err
!=
nil
{
return
nil
,
err
}
defer
s
.
env
.
Releases
.
UnlockRelease
(
req
.
Name
)
if
!
ValidName
.
MatchString
(
req
.
Name
)
{
s
.
Log
(
"uninstall: Release not found: %s"
,
req
.
Name
)
return
nil
,
errMissingRelease
...
...
@@ -45,6 +39,12 @@ func (s *ReleaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR
return
nil
,
fmt
.
Errorf
(
"release name %q exceeds max length of %d"
,
req
.
Name
,
releaseNameMaxLen
)
}
err
:=
s
.
env
.
Releases
.
LockRelease
(
req
.
Name
)
if
err
!=
nil
{
return
nil
,
err
}
defer
s
.
env
.
Releases
.
UnlockRelease
(
req
.
Name
)
rels
,
err
:=
s
.
env
.
Releases
.
History
(
req
.
Name
)
if
err
!=
nil
{
s
.
Log
(
"uninstall: Release not loaded: %s"
,
req
.
Name
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment