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
0736022d
Commit
0736022d
authored
6 years ago
by
Mike Lundy
Browse files
Options
Download
Patches
Plain Diff
[tiller] make update --force --dry-run obey dry-run
parent
0a59f5fe
release-2.17
dev-v2
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
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
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/tiller/release_update.go
+10
-2
pkg/tiller/release_update.go
with
10 additions
and
2 deletions
+10
-2
pkg/tiller/release_update.go
+
10
−
2
View file @
0736022d
...
...
@@ -161,6 +161,10 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
Timeout
:
req
.
Timeout
,
Wait
:
req
.
Wait
,
})
// update new release with next revision number so as to append to the old release's history
newRelease
.
Version
=
oldRelease
.
Version
+
1
res
:=
&
services
.
UpdateReleaseResponse
{
Release
:
newRelease
}
if
err
!=
nil
{
s
.
Log
(
"failed update prepare step: %s"
,
err
)
...
...
@@ -172,6 +176,12 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
return
res
,
err
}
if
req
.
DryRun
{
s
.
Log
(
"dry run for %s"
,
newRelease
.
Name
)
res
.
Release
.
Info
.
Description
=
"Dry run complete"
return
res
,
nil
}
// From here on out, the release is considered to be in Status_DELETING or Status_DELETED
// state. There is no turning back.
oldRelease
.
Info
.
Status
.
Code
=
release
.
Status_DELETING
...
...
@@ -218,8 +228,6 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
}
}
// update new release with next revision number so as to append to the old release's history
newRelease
.
Version
=
oldRelease
.
Version
+
1
s
.
recordRelease
(
newRelease
,
false
)
if
err
:=
s
.
ReleaseModule
.
Update
(
oldRelease
,
newRelease
,
req
,
s
.
env
);
err
!=
nil
{
msg
:=
fmt
.
Sprintf
(
"Upgrade %q failed: %s"
,
newRelease
.
Name
,
err
)
...
...
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