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
5937e1a2
Commit
5937e1a2
authored
Mar 23, 2017
by
Maciej Kwiek
Committed by
Maciej Kwiek
May 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ReleaseServer.ReleaseModule has Status method
Both local and remote Release module implement release status check.
parent
52c54b09
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
4 deletions
+30
-4
rudder.go
cmd/rudder/rudder.go
+7
-2
client.go
pkg/rudder/client.go
+11
-0
release_modules.go
pkg/tiller/release_modules.go
+11
-0
release_server.go
pkg/tiller/release_server.go
+1
-2
No files found.
cmd/rudder/rudder.go
View file @
5937e1a2
...
...
@@ -94,8 +94,13 @@ func (r *ReleaseModuleServiceServer) UpgradeRelease(ctx context.Context, in *rud
return
&
rudderAPI
.
UpgradeReleaseResponse
{},
err
}
func
(
r
*
ReleaseModuleServiceServer
)
ReleaseStatus
(
c
ontext
.
Context
,
*
rudderAPI
.
ReleaseStatusRequest
)
(
*
rudderAPI
.
ReleaseStatusResponse
,
error
)
{
func
(
r
*
ReleaseModuleServiceServer
)
ReleaseStatus
(
c
tx
context
.
Context
,
in
*
rudderAPI
.
ReleaseStatusRequest
)
(
*
rudderAPI
.
ReleaseStatusResponse
,
error
)
{
grpclog
.
Print
(
"status"
)
return
&
rudderAPI
.
ReleaseStatusResponse
{},
nil
resp
,
err
:=
kubeClient
.
Get
(
in
.
Release
.
Namespace
,
bytes
.
NewBufferString
(
in
.
Release
.
Manifest
))
in
.
Release
.
Info
.
Status
.
Resources
=
resp
return
&
rudderAPI
.
ReleaseStatusResponse
{
Release
:
in
.
Release
,
Info
:
in
.
Release
.
Info
,
},
err
}
pkg/rudder/client.go
View file @
5937e1a2
...
...
@@ -66,3 +66,14 @@ func RollbackRelease(req *rudderAPI.RollbackReleaseRequest) (*rudderAPI.Rollback
client
:=
rudderAPI
.
NewReleaseModuleServiceClient
(
conn
)
return
client
.
RollbackRelease
(
context
.
Background
(),
req
)
}
// ReleaseStatus calls Rudder ReleaseStatus method which should perform update
func
ReleaseStatus
(
req
*
rudderAPI
.
ReleaseStatusRequest
)
(
*
rudderAPI
.
ReleaseStatusResponse
,
error
)
{
conn
,
err
:=
grpc
.
Dial
(
grpcAddr
,
grpc
.
WithInsecure
())
if
err
!=
nil
{
return
nil
,
err
}
defer
conn
.
Close
()
client
:=
rudderAPI
.
NewReleaseModuleServiceClient
(
conn
)
return
client
.
ReleaseStatus
(
context
.
Background
(),
req
)
}
pkg/tiller/release_modules.go
View file @
5937e1a2
...
...
@@ -31,6 +31,7 @@ type ReleaseModule interface {
Create
(
r
*
release
.
Release
,
req
*
services
.
InstallReleaseRequest
,
env
*
environment
.
Environment
)
error
Update
(
current
,
target
*
release
.
Release
,
req
*
services
.
UpdateReleaseRequest
,
env
*
environment
.
Environment
)
error
Rollback
(
current
,
target
*
release
.
Release
,
req
*
services
.
RollbackReleaseRequest
,
env
*
environment
.
Environment
)
error
Status
(
r
*
release
.
Release
,
req
*
services
.
GetReleaseStatusRequest
,
env
*
environment
.
Environment
)
(
string
,
error
)
}
// LocalReleaseModule is a local implementation of ReleaseModule
...
...
@@ -54,6 +55,10 @@ func (m *LocalReleaseModule) Rollback(current, target *release.Release, req *ser
return
env
.
KubeClient
.
Update
(
target
.
Namespace
,
c
,
t
,
req
.
Recreate
,
req
.
Timeout
,
req
.
Wait
)
}
func
(
m
*
LocalReleaseModule
)
Status
(
r
*
release
.
Release
,
req
*
services
.
GetReleaseStatusRequest
,
env
*
environment
.
Environment
)
(
string
,
error
)
{
return
env
.
KubeClient
.
Get
(
r
.
Namespace
,
bytes
.
NewBufferString
(
r
.
Manifest
))
}
// RemoteReleaseModule is a ReleaseModule which calls Rudder service to operate on a release
type
RemoteReleaseModule
struct
{}
...
...
@@ -89,3 +94,9 @@ func (m *RemoteReleaseModule) Rollback(current, target *release.Release, req *se
_
,
err
:=
rudder
.
RollbackRelease
(
rollback
)
return
err
}
func
(
m
*
RemoteReleaseModule
)
Status
(
r
*
release
.
Release
,
req
*
services
.
GetReleaseStatusRequest
,
env
*
environment
.
Environment
)
(
string
,
error
)
{
statusRequest
:=
&
rudderAPI
.
ReleaseStatusRequest
{
Release
:
r
}
resp
,
err
:=
rudder
.
ReleaseStatus
(
statusRequest
)
return
resp
.
Info
.
Status
.
Resources
,
err
}
pkg/tiller/release_server.go
View file @
5937e1a2
...
...
@@ -262,8 +262,7 @@ func (s *ReleaseServer) GetReleaseStatus(c ctx.Context, req *services.GetRelease
// Ok, we got the status of the release as we had jotted down, now we need to match the
// manifest we stashed away with reality from the cluster.
kubeCli
:=
s
.
env
.
KubeClient
resp
,
err
:=
kubeCli
.
Get
(
rel
.
Namespace
,
bytes
.
NewBufferString
(
rel
.
Manifest
))
resp
,
err
:=
s
.
ReleaseModule
.
Status
(
rel
,
req
,
s
.
env
)
if
sc
==
release
.
Status_DELETED
||
sc
==
release
.
Status_FAILED
{
// Skip errors if this is already deleted or failed.
return
statusResp
,
nil
...
...
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