|
|
@ -337,19 +337,19 @@ func (h *Client) install(ctx context.Context, req *rls.InstallReleaseRequest) (*
|
|
|
|
|
|
|
|
|
|
|
|
// Executes tiller.UninstallRelease RPC.
|
|
|
|
// Executes tiller.UninstallRelease RPC.
|
|
|
|
func (h *Client) delete(ctx context.Context, namespace string, req *rls.UninstallReleaseRequest) (*rls.UninstallReleaseResponse, error) {
|
|
|
|
func (h *Client) delete(ctx context.Context, namespace string, req *rls.UninstallReleaseRequest) (*rls.UninstallReleaseResponse, error) {
|
|
|
|
c, err := grpc.Dial(h.opts.host, grpc.WithInsecure())
|
|
|
|
/* c, err := grpc.Dial(h.opts.host, grpc.WithInsecure())
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defer c.Close()
|
|
|
|
defer c.Close()
|
|
|
|
|
|
|
|
|
|
|
|
rlc := rls.NewReleaseServiceClient(c)
|
|
|
|
rlc := rls.NewReleaseServiceClient(c)
|
|
|
|
return rlc.UninstallRelease(ctx, req)
|
|
|
|
return rlc.UninstallRelease(ctx, req)*/
|
|
|
|
resp := &rls.UninstallReleaseResponse{}
|
|
|
|
resp := &rls.UninstallReleaseResponse{}
|
|
|
|
client, err := getRESTClient()
|
|
|
|
client, err := getRESTClient()
|
|
|
|
// TODO handle response
|
|
|
|
// TODO handle response
|
|
|
|
release := new(hapi.Release)
|
|
|
|
//release := new(hapi.Release)
|
|
|
|
err = client.RESTClient().Delete().Namespace(namespace).Resource("releases").Name(req.Name).Do().Into(release)
|
|
|
|
err = client.RESTClient().Delete().Namespace(namespace).Resource("releases").Name(req.Name).Do().Error()
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return resp, err
|
|
|
|
return resp, err
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -447,15 +447,10 @@ func (h *Client) status(ctx context.Context, namespace string, req *rls.GetRelea
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return resp, err
|
|
|
|
return resp, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
duration := time.Duration(5) * time.Second
|
|
|
|
duration := time.Duration(2) * time.Second
|
|
|
|
release := new(hapi.Release)
|
|
|
|
release := new(hapi.Release)
|
|
|
|
for i := 0; i <= 10; i++ {
|
|
|
|
|
|
|
|
err = client.RESTClient().Get().Namespace(namespace).Resource("releases").Name(req.Name).Do().Into(release) // TODO handle namespace
|
|
|
|
err = client.RESTClient().Get().Namespace(namespace).Resource("releases").Name(req.Name).Do().Into(release) // TODO handle namespace
|
|
|
|
if err == nil {
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
time.Sleep(duration)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return resp, err
|
|
|
|
return resp, err
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -463,7 +458,7 @@ func (h *Client) status(ctx context.Context, namespace string, req *rls.GetRelea
|
|
|
|
releaseVersion := new(hapi.ReleaseVersion)
|
|
|
|
releaseVersion := new(hapi.ReleaseVersion)
|
|
|
|
name := req.Name + "-v" + strconv.Itoa(int(v))
|
|
|
|
name := req.Name + "-v" + strconv.Itoa(int(v))
|
|
|
|
|
|
|
|
|
|
|
|
for i := 0; i <= 10; i++ {
|
|
|
|
for i := 0; i <= 20; i++ {
|
|
|
|
err = client.RESTClient().Get().Namespace(namespace).Resource("releaseversions").Name(name).Do().Into(releaseVersion) // TODO handle namespace
|
|
|
|
err = client.RESTClient().Get().Namespace(namespace).Resource("releaseversions").Name(name).Do().Into(releaseVersion) // TODO handle namespace
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
time.Sleep(duration)
|
|
|
|
time.Sleep(duration)
|
|
|
|