|
|
@ -18,6 +18,7 @@ package helm // import "k8s.io/helm/pkg/helm"
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
|
|
|
|
"github.com/golang/protobuf/ptypes"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"gopkg.in/square/go-jose.v1/json"
|
|
|
|
"gopkg.in/square/go-jose.v1/json"
|
|
|
@ -300,6 +301,16 @@ func (h *Client) install(ctx context.Context, req *rls.InstallReleaseRequest) (*
|
|
|
|
resp.Release.Manifest = release.Spec.Manifest
|
|
|
|
resp.Release.Manifest = release.Spec.Manifest
|
|
|
|
resp.Release.Info = new(rs.Info)
|
|
|
|
resp.Release.Info = new(rs.Info)
|
|
|
|
resp.Release.Info.Status = release.Status.Status
|
|
|
|
resp.Release.Info.Status = release.Status.Status
|
|
|
|
|
|
|
|
firstDeployed, err := ptypes.TimestampProto(release.Status.FirstDeployed.Time)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return resp, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resp.Release.Info.FirstDeployed = firstDeployed
|
|
|
|
|
|
|
|
lastDeployed, err := ptypes.TimestampProto(release.Status.LastDeployed.Time)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return resp, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resp.Release.Info.FirstDeployed = lastDeployed
|
|
|
|
return resp, nil
|
|
|
|
return resp, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -348,7 +359,7 @@ func (h *Client) update(ctx context.Context,namespace string, req *rls.UpdateRel
|
|
|
|
release.Spec.Recreate = req.Recreate
|
|
|
|
release.Spec.Recreate = req.Recreate
|
|
|
|
release.Spec.Timeout = req.Timeout
|
|
|
|
release.Spec.Timeout = req.Timeout
|
|
|
|
release.Spec.Chart.Inline = req.Chart
|
|
|
|
release.Spec.Chart.Inline = req.Chart
|
|
|
|
release.Spec.Version = release.Spec.Version
|
|
|
|
release.Spec.Version = release.Spec.Version + 1
|
|
|
|
// update the release
|
|
|
|
// update the release
|
|
|
|
updatedRelease := new(hapi.Release)
|
|
|
|
updatedRelease := new(hapi.Release)
|
|
|
|
err = client.RESTClient().Put().Namespace(namespace).Resource("releases").Name(release.Name).Body(release).Do().Into(updatedRelease)
|
|
|
|
err = client.RESTClient().Put().Namespace(namespace).Resource("releases").Name(release.Name).Body(release).Do().Into(updatedRelease)
|
|
|
@ -439,9 +450,21 @@ func (h *Client) status(ctx context.Context, namespace string, req *rls.GetRelea
|
|
|
|
resp.Namespace = release.Namespace
|
|
|
|
resp.Namespace = release.Namespace
|
|
|
|
resp.Info = new(rs.Info)
|
|
|
|
resp.Info = new(rs.Info)
|
|
|
|
resp.Info.Status = releaseVersion.Status.Status
|
|
|
|
resp.Info.Status = releaseVersion.Status.Status
|
|
|
|
/* *resp.Info.FirstDeployed = releaseVersion.Status.FirstDeployed //TODO
|
|
|
|
f, err := ptypes.TimestampProto(releaseVersion.Status.FirstDeployed.Time)
|
|
|
|
*resp.Info.LastDeployed = releaseVersion.Status.LastDeployed
|
|
|
|
if err != nil {
|
|
|
|
*resp.Info.Deleted = releaseVersion.Status.Deleted*/
|
|
|
|
return resp, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resp.Info.FirstDeployed = f
|
|
|
|
|
|
|
|
l, err := ptypes.TimestampProto(releaseVersion.Status.LastDeployed.Time)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return resp, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resp.Info.LastDeployed = l
|
|
|
|
|
|
|
|
d, err := ptypes.TimestampProto(releaseVersion.Status.LastDeployed.Time)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return resp, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resp.Info.Deleted = d
|
|
|
|
return resp, nil
|
|
|
|
return resp, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|