Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
1105 Внедрение механизмов обеспечения безопасности цепочки поставки программных проектов
Legacy
scanned-projects
helm
Commits
e02802ba
Commit
e02802ba
authored
7 years ago
by
Michelle Noorali
Browse files
Options
Download
Patches
Plain Diff
ref(pkg/tiller): clarify reuseValues comment
parent
9266731d
main
Release
add-codeql
dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible
dependabot/go_modules/github.com/lib/pq-1.10.9
dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0
dependabot/go_modules/golang.org/x/crypto-0.9.0
dependabot/go_modules/golang.org/x/term-0.8.0
dependabot/go_modules/k8s.io/klog/v2-2.100.1
dev-v2
feat-v3/event-emitter-lua
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
release-2.17
release-3.0
release-3.1
release-3.10
release-3.11
release-3.12
release-3.2
release-3.3
release-3.4
release-3.5
release-3.6
release-3.6.1
release-3.6.2
release-3.7
release-3.8
release-3.9
release-v3.0.0-beta.4
v3.12.0
v3.12.0-rc.1
v3.12.0-dev.1
v3.11.3
v3.11.2
v3.11.1
v3.11.0
v3.11.0-rc.2
v3.11.0-rc.1
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.10.0-rc.1
v3.9.4
v3.9.3
v3.9.2
v3.9.1
v3.9.0
v3.9.0-rc.1
v3.8.2
v3.8.1
v3.8.0
v3.8.0-rc.2
v3.8.0-rc.1
v3.7.2
v3.7.1
v3.7.0
v3.7.0-rc.3
v3.7.0-rc.2
v3.7.0-rc.1
v3.6.3
v3.6.2
v3.6.1
v3.6.0
v3.6.0-rc.1
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.5.0-rc.2
v3.5.0-rc.1
v3.4.2
v3.4.1
v3.4.0
v3.4.0-rc.1
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.3.0-rc.2
v3.3.0-rc.1
v3.2.4
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.2.0-rc.1
v3.1.3
v3.1.2
v3.1.1
v3.1.0
v3.1.0-rc.3
v3.1.0-rc.2
v3.1.0-rc.1
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v3.0.0-rc.4
v3.0.0-rc.3
v3.0.0-rc.2
v3.0.0-rc.1
v3.0.0-beta.5
v3.0.0-beta.4
v3.0.0-beta.3
v3.0.0-beta.2
v3.0.0-beta.1
v3.0.0-alpha.2
v3.0.0-alpha.1
v2.17.0
v2.17.0-rc.1
v2.16.12
v2.16.11
v2.16.10
v2.16.9
v2.16.8
v2.16.7
v2.16.6
v2.16.5
v2.16.4
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.16.0-rc.2
v2.16.0-rc.1
v2.15.2
v2.15.1
v2.15.0
v2.15.0-rc.2
v2.15.0-rc.1
v2.14.3
v2.14.2
v2.14.1
v2.14.0
v2.14.0-rc.2
v2.14.0-rc.1
v2.13.1
v2.13.1-rc.1
v2.13.0
v2.13.0-rc.2
v2.13.0-rc.1
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc.2
v2.12.0-rc.1
v2.11.0
v2.11.0-rc.4
v2.11.0-rc.3
v2.11.0-rc.2
v2.11.0-rc.1
v2.10.0
v2.10.0-rc.3
v2.10.0-rc.2
v2.10.0-rc.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/tiller/release_update.go
+1
-1
pkg/tiller/release_update.go
pkg/tiller/release_update_test.go
+1
-1
pkg/tiller/release_update_test.go
with
2 additions
and
2 deletions
+2
-2
pkg/tiller/release_update.go
+
1
−
1
View file @
e02802ba
...
@@ -80,7 +80,7 @@ func (s *ReleaseServer) prepareUpdate(req *services.UpdateReleaseRequest) (*rele
...
@@ -80,7 +80,7 @@ func (s *ReleaseServer) prepareUpdate(req *services.UpdateReleaseRequest) (*rele
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
//
If new values were not supplied in the upgrade, re-use the existing values.
//
determine if values will be reused
if
err
:=
s
.
reuseValues
(
req
,
currentRelease
);
err
!=
nil
{
if
err
:=
s
.
reuseValues
(
req
,
currentRelease
);
err
!=
nil
{
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/tiller/release_update_test.go
+
1
−
1
View file @
e02802ba
...
@@ -260,7 +260,7 @@ func TestUpdateRelease_ReuseValues(t *testing.T) {
...
@@ -260,7 +260,7 @@ func TestUpdateRelease_ReuseValues(t *testing.T) {
t
.
Errorf
(
"Expected chart values to be %q, got %q"
,
expect
,
res
.
Release
.
Chart
.
Values
.
Raw
)
t
.
Errorf
(
"Expected chart values to be %q, got %q"
,
expect
,
res
.
Release
.
Chart
.
Values
.
Raw
)
}
}
// This should have the newly-passed overrides and any other computed values. `name: value` comes from release Config via releaseStub()
// This should have the newly-passed overrides and any other computed values. `name: value` comes from release Config via releaseStub()
expect
=
"name: value
\n
name2: val2"
expect
=
"name: value
\n
name2: val2
\n
"
if
res
.
Release
.
Config
!=
nil
&&
res
.
Release
.
Config
.
Raw
!=
expect
{
if
res
.
Release
.
Config
!=
nil
&&
res
.
Release
.
Config
.
Raw
!=
expect
{
t
.
Errorf
(
"Expected request config to be %q, got %q"
,
expect
,
res
.
Release
.
Config
.
Raw
)
t
.
Errorf
(
"Expected request config to be %q, got %q"
,
expect
,
res
.
Release
.
Config
.
Raw
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets