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
276bb9b1
Unverified
Commit
276bb9b1
authored
Jul 24, 2019
by
Tariq Ibrahim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix golint issues reported by make test
Signed-off-by:
Tariq Ibrahim
<
tariq181290@gmail.com
>
parent
7ab62324
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
8 deletions
+17
-8
client.go
pkg/kube/client.go
+13
-5
client_test.go
pkg/kube/client_test.go
+1
-1
chartfile.go
pkg/lint/rules/chartfile.go
+2
-2
environment.go
pkg/tiller/environment/environment.go
+1
-0
No files found.
pkg/kube/client.go
View file @
276bb9b1
...
...
@@ -314,7 +314,14 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
return
buf
.
String
(),
nil
}
// Deprecated; use UpdateWithOptions instead
// Update reads the current configuration and a target configuration from io.reader
// and creates resources that don't already exist, updates resources that have been modified
// in the target configuration and deletes resources from the current configuration that are
// not present in the target configuration.
//
// Namespace will set the namespaces.
//
// Deprecated: use UpdateWithOptions instead.
func
(
c
*
Client
)
Update
(
namespace
string
,
originalReader
,
targetReader
io
.
Reader
,
force
bool
,
recreate
bool
,
timeout
int64
,
shouldWait
bool
)
error
{
return
c
.
UpdateWithOptions
(
namespace
,
originalReader
,
targetReader
,
UpdateOptions
{
Force
:
force
,
...
...
@@ -334,12 +341,13 @@ type UpdateOptions struct {
CleanupOnFail
bool
}
// UpdateWithOptions reads
in
the current configuration and a target configuration from io.reader
// and creates resources that don't already exist
s
, updates resources that have been modified
// UpdateWithOptions reads the current configuration and a target configuration from io.reader
// and creates resources that don't already exist, updates resources that have been modified
// in the target configuration and deletes resources from the current configuration that are
// not present in the target configuration.
//
// Namespace will set the namespaces.
// Namespace will set the namespaces. UpdateOptions provides additional parameters to control
// update behavior.
func
(
c
*
Client
)
UpdateWithOptions
(
namespace
string
,
originalReader
,
targetReader
io
.
Reader
,
opts
UpdateOptions
)
error
{
original
,
err
:=
c
.
BuildUnstructured
(
namespace
,
originalReader
)
if
err
!=
nil
{
...
...
@@ -552,7 +560,7 @@ func (c *Client) WatchUntilReady(namespace string, reader io.Reader, timeout int
return
perform
(
infos
,
c
.
watchTimeout
(
time
.
Duration
(
timeout
)
*
time
.
Second
))
}
// Wa
tch
UntilCRDEstablished polls the given CRD until it reaches the established
// Wa
it
UntilCRDEstablished polls the given CRD until it reaches the established
// state. A CRD needs to reach the established state before CRs can be created.
//
// If a naming conflict condition is found, this function will return an error.
...
...
pkg/kube/client_test.go
View file @
276bb9b1
...
...
@@ -558,7 +558,7 @@ func TestWaitUntilCRDEstablished(t *testing.T) {
}
else
{
crd
=
crdWithConditions
}
requestCount
+=
1
requestCount
++
return
newResponse
(
200
,
&
crd
)
}),
}
...
...
pkg/lint/rules/chartfile.go
View file @
276bb9b1
...
...
@@ -51,7 +51,7 @@ func Chartfile(linter *support.Linter) {
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartNameDirMatch
(
linter
.
ChartDir
,
chartFile
))
// Chart metadata
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartA
pi
Version
(
chartFile
))
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartA
PI
Version
(
chartFile
))
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartVersion
(
chartFile
))
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartEngine
(
chartFile
))
linter
.
RunLinterRule
(
support
.
ErrorSev
,
chartFileName
,
validateChartMaintainer
(
chartFile
))
...
...
@@ -97,7 +97,7 @@ func validateChartNameDirMatch(chartDir string, cf *chart.Metadata) error {
return
nil
}
func
validateChartA
pi
Version
(
cf
*
chart
.
Metadata
)
error
{
func
validateChartA
PI
Version
(
cf
*
chart
.
Metadata
)
error
{
if
cf
.
ApiVersion
==
""
{
return
errors
.
New
(
"apiVersion is required"
)
}
...
...
pkg/tiller/environment/environment.go
View file @
276bb9b1
...
...
@@ -255,6 +255,7 @@ func (p *PrintingKubeClient) WaitAndGetCompletedPodPhase(namespace string, reade
return
v1
.
PodUnknown
,
err
}
// WaitUntilCRDEstablished implements KubeClient WaitUntilCRDEstablished.
func
(
p
*
PrintingKubeClient
)
WaitUntilCRDEstablished
(
reader
io
.
Reader
,
timeout
time
.
Duration
)
error
{
_
,
err
:=
io
.
Copy
(
p
.
Out
,
reader
)
return
err
...
...
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