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
574ee4e6
Commit
574ee4e6
authored
Oct 18, 2016
by
Matt Butcher
Committed by
GitHub
Oct 18, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1391 from technosophos/fix/no-objects
fix(tiller): fix wording for a few errors
parents
b42f0675
8d32bd2a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
client.go
pkg/kube/client.go
+2
-2
client_test.go
pkg/kube/client_test.go
+1
-1
No files found.
pkg/kube/client.go
View file @
574ee4e6
...
@@ -229,7 +229,7 @@ func (c *Client) Update(namespace string, currentReader, targetReader io.Reader)
...
@@ -229,7 +229,7 @@ func (c *Client) Update(namespace string, currentReader, targetReader io.Reader)
// Namespace will set the namespace
// Namespace will set the namespace
func
(
c
*
Client
)
Delete
(
namespace
string
,
reader
io
.
Reader
)
error
{
func
(
c
*
Client
)
Delete
(
namespace
string
,
reader
io
.
Reader
)
error
{
return
perform
(
c
,
namespace
,
reader
,
func
(
info
*
resource
.
Info
)
error
{
return
perform
(
c
,
namespace
,
reader
,
func
(
info
*
resource
.
Info
)
error
{
log
.
Printf
(
"Starting delete for %s
"
,
info
.
Name
)
log
.
Printf
(
"Starting delete for %s
%s"
,
info
.
Name
,
info
.
Mapping
.
GroupVersionKind
.
Kind
)
reaper
,
err
:=
c
.
Reaper
(
info
.
Mapping
)
reaper
,
err
:=
c
.
Reaper
(
info
.
Mapping
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -307,7 +307,7 @@ func perform(c *Client, namespace string, reader io.Reader, fn ResourceActorFunc
...
@@ -307,7 +307,7 @@ func perform(c *Client, namespace string, reader io.Reader, fn ResourceActorFunc
return
err
return
err
}
}
if
count
==
0
{
if
count
==
0
{
return
fmt
.
Errorf
(
"no objects
passed to create
"
)
return
fmt
.
Errorf
(
"no objects
visited
"
)
}
}
return
nil
return
nil
}
}
...
...
pkg/kube/client_test.go
View file @
574ee4e6
...
@@ -84,7 +84,7 @@ func TestPerform(t *testing.T) {
...
@@ -84,7 +84,7 @@ func TestPerform(t *testing.T) {
namespace
:
"test"
,
namespace
:
"test"
,
reader
:
strings
.
NewReader
(
""
),
reader
:
strings
.
NewReader
(
""
),
err
:
true
,
err
:
true
,
errMessage
:
"no objects
passed to create
"
,
errMessage
:
"no objects
visited
"
,
},
},
}
}
...
...
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