From d418610c2108f0c1268071c6da8ec4ed16d75a1b Mon Sep 17 00:00:00 2001 From: tamal Date: Thu, 23 Mar 2017 18:59:13 -0700 Subject: [PATCH] Add SummarizeReleases api. --- _proto/hapi/release/release.proto | 24 + _proto/hapi/services/tiller.proto | 33 ++ pkg/proto/hapi/chart/chart.pb.go | 2 +- pkg/proto/hapi/chart/config.pb.go | 16 +- pkg/proto/hapi/chart/metadata.pb.go | 107 +++- pkg/proto/hapi/chart/template.pb.go | 16 +- pkg/proto/hapi/release/hook.pb.go | 38 +- pkg/proto/hapi/release/info.pb.go | 9 +- pkg/proto/hapi/release/release.pb.go | 134 ++++- pkg/proto/hapi/release/status.pb.go | 23 +- pkg/proto/hapi/release/test_run.pb.go | 23 +- pkg/proto/hapi/release/test_suite.pb.go | 2 +- pkg/proto/hapi/services/tiller.pb.go | 649 ++++++++++++++++++++---- pkg/proto/hapi/version/version.pb.go | 23 +- pkg/tiller/release_server.go | 131 +++-- 15 files changed, 1065 insertions(+), 165 deletions(-) diff --git a/_proto/hapi/release/release.proto b/_proto/hapi/release/release.proto index 4a6afa0fe..1214b940c 100644 --- a/_proto/hapi/release/release.proto +++ b/_proto/hapi/release/release.proto @@ -20,6 +20,7 @@ import "hapi/release/hook.proto"; import "hapi/release/info.proto"; import "hapi/chart/config.proto"; import "hapi/chart/chart.proto"; +import "hapi/chart/metadata.proto"; option go_package = "release"; @@ -51,3 +52,26 @@ message Release { // Namespace is the kubernetes namespace of the release. string namespace = 8; } + +// ReleaseSummary summaries a deployment of a chart, together with the chart +// metadata and the variables used to deploy that chart. +message ReleaseSummary { + // Name is the name of the release + string name = 1; + + // Info provides information about a release + hapi.release.Info info = 2; + + // ChartMetadata is the metadata of chart that was released. + hapi.chart.Metadata chart_metadata = 3; + + // Config is the set of extra Values added to the chart. + // These values override the default values inside of the chart. + hapi.chart.Config config = 4; + + // Version is an int32 which represents the version of the release. + int32 version = 5; + + // Namespace is the kubernetes namespace of the release. + string namespace = 6; +} diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto index f47a47f14..3fe717105 100644 --- a/_proto/hapi/services/tiller.proto +++ b/_proto/hapi/services/tiller.proto @@ -47,6 +47,13 @@ service ReleaseService { rpc ListReleases(ListReleasesRequest) returns (stream ListReleasesResponse) { } + // SummarizeReleases retrieves summary of release history. + // TODO: Allow filtering the set of releases by + // release status. By default, SummarizeReleases returns the releases who + // current status is "Active". + rpc SummarizeReleases(SummarizeReleasesRequest) returns (SummarizeReleasesResponse) { + } + // GetReleasesStatus retrieves status information for the specified release. rpc GetReleaseStatus(GetReleaseStatusRequest) returns (GetReleaseStatusResponse) { } @@ -148,6 +155,32 @@ message ListReleasesResponse { repeated hapi.release.Release releases = 4; } +// SummarizeReleasesRequest requests a list of release summaries. +// +// Releases can be sorted according to a few pre-determined sort stategies. +message SummarizeReleasesRequest { + // SortBy is the sort field that the ListReleases server should sort data before returning. + ListSort.SortBy sort_by = 1; + + // Filter is a regular expression used to filter which releases should be listed. + // + // Anything that matches the regexp will be included in the results. + string filter = 2; + + // SortOrder is the ordering directive used for sorting. + ListSort.SortOrder sort_order = 3; + + repeated hapi.release.Status.Code status_codes = 6; + // Namespace is the filter to select releases only from a specific namespace. + string namespace = 4; +} + +// SummarizeReleasesResponse is a list of release summaries. +message SummarizeReleasesResponse { + // Releases is the list of found release objects. + repeated hapi.release.ReleaseSummary releases = 1; +} + // GetReleaseStatusRequest is a request to get the status of a release. message GetReleaseStatusRequest { // Name is the name of the release diff --git a/pkg/proto/hapi/chart/chart.pb.go b/pkg/proto/hapi/chart/chart.pb.go index c3afc3f44..dbb188e91 100644 --- a/pkg/proto/hapi/chart/chart.pb.go +++ b/pkg/proto/hapi/chart/chart.pb.go @@ -101,7 +101,7 @@ func init() { proto.RegisterFile("hapi/chart/chart.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ // 242 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, 0x10, 0x86, 0x15, 0x4a, 0x0a, 0x1c, 0x2c, 0x58, 0x08, 0x4c, 0xa7, 0x8a, 0x09, 0x75, 0x70, 0x50, 0x11, 0x0f, 0x00, 0xcc, 0x2c, 0x16, 0x13, 0xdb, 0xb5, 0xb9, 0xa4, 0x91, 0x52, 0x3b, 0xaa, 0x5d, 0xa4, 0xbe, 0x3b, 0x03, 0xea, 0xd9, 0xa6, 0x09, 0xea, 0x12, 0x29, 0xf7, 0x7d, 0xff, 0xe5, 0xbf, diff --git a/pkg/proto/hapi/chart/config.pb.go b/pkg/proto/hapi/chart/config.pb.go index a7b61885a..4a8b36d89 100644 --- a/pkg/proto/hapi/chart/config.pb.go +++ b/pkg/proto/hapi/chart/config.pb.go @@ -24,6 +24,13 @@ func (m *Config) String() string { return proto.CompactTextString(m) func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (m *Config) GetRaw() string { + if m != nil { + return m.Raw + } + return "" +} + func (m *Config) GetValues() map[string]*Value { if m != nil { return m.Values @@ -41,6 +48,13 @@ func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (m *Value) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + func init() { proto.RegisterType((*Config)(nil), "hapi.chart.Config") proto.RegisterType((*Value)(nil), "hapi.chart.Value") @@ -50,7 +64,7 @@ func init() { proto.RegisterFile("hapi/chart/config.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ // 182 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x48, 0x2c, 0xc8, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x48, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0x48, 0x2c, 0x2a, 0xd1, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x02, 0x49, 0xe8, 0x81, 0x25, 0x94, 0x16, 0x30, 0x72, 0xb1, 0x39, 0x83, 0x25, 0x85, 0x04, 0xb8, 0x98, 0x8b, 0x12, 0xcb, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go index 5feee0bf4..cce36f9b0 100644 --- a/pkg/proto/hapi/chart/metadata.pb.go +++ b/pkg/proto/hapi/chart/metadata.pb.go @@ -47,6 +47,20 @@ func (m *Maintainer) String() string { return proto.CompactTextString func (*Maintainer) ProtoMessage() {} func (*Maintainer) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (m *Maintainer) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Maintainer) GetEmail() string { + if m != nil { + return m.Email + } + return "" +} + // Metadata for a Chart file. This models the structure of a Chart.yaml file. // // Spec: https://k8s.io/helm/blob/master/docs/design/chart_format.md#the-chart-file @@ -86,6 +100,48 @@ func (m *Metadata) String() string { return proto.CompactTextString(m func (*Metadata) ProtoMessage() {} func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } +func (m *Metadata) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Metadata) GetHome() string { + if m != nil { + return m.Home + } + return "" +} + +func (m *Metadata) GetSources() []string { + if m != nil { + return m.Sources + } + return nil +} + +func (m *Metadata) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + +func (m *Metadata) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *Metadata) GetKeywords() []string { + if m != nil { + return m.Keywords + } + return nil +} + func (m *Metadata) GetMaintainers() []*Maintainer { if m != nil { return m.Maintainers @@ -93,6 +149,55 @@ func (m *Metadata) GetMaintainers() []*Maintainer { return nil } +func (m *Metadata) GetEngine() string { + if m != nil { + return m.Engine + } + return "" +} + +func (m *Metadata) GetIcon() string { + if m != nil { + return m.Icon + } + return "" +} + +func (m *Metadata) GetApiVersion() string { + if m != nil { + return m.ApiVersion + } + return "" +} + +func (m *Metadata) GetCondition() string { + if m != nil { + return m.Condition + } + return "" +} + +func (m *Metadata) GetTags() string { + if m != nil { + return m.Tags + } + return "" +} + +func (m *Metadata) GetAppVersion() string { + if m != nil { + return m.AppVersion + } + return "" +} + +func (m *Metadata) GetDeprecated() bool { + if m != nil { + return m.Deprecated + } + return false +} + func init() { proto.RegisterType((*Maintainer)(nil), "hapi.chart.Maintainer") proto.RegisterType((*Metadata)(nil), "hapi.chart.Metadata") @@ -103,7 +208,7 @@ func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ // 339 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x4b, 0xeb, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x4b, 0xeb, 0x40, 0x14, 0xc5, 0x5f, 0x5e, 0x9a, 0x7f, 0x37, 0xef, 0x3d, 0xca, 0xf0, 0x28, 0xa3, 0x88, 0x84, 0xae, 0xb2, 0x4a, 0x41, 0x41, 0x5c, 0x0b, 0xe2, 0x42, 0xdb, 0x4a, 0xf0, 0x0f, 0xb8, 0x1b, 0x93, 0x4b, 0x3b, 0x68, 0x66, 0xc2, 0xcc, 0xa8, 0xf8, 0xe5, 0xfc, 0x6c, 0x32, 0x93, 0xa4, 0xcd, 0xc2, 0xdd, diff --git a/pkg/proto/hapi/chart/template.pb.go b/pkg/proto/hapi/chart/template.pb.go index 2bed587b5..416269d18 100644 --- a/pkg/proto/hapi/chart/template.pb.go +++ b/pkg/proto/hapi/chart/template.pb.go @@ -29,6 +29,20 @@ func (m *Template) String() string { return proto.CompactTextString(m func (*Template) ProtoMessage() {} func (*Template) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } +func (m *Template) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Template) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + func init() { proto.RegisterType((*Template)(nil), "hapi.chart.Template") } @@ -37,7 +51,7 @@ func init() { proto.RegisterFile("hapi/chart/template.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ // 107 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x48, 0x2c, 0xc8, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x48, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0x48, 0x2c, 0x2a, 0xd1, 0x2f, 0x49, 0xcd, 0x2d, 0xc8, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x02, 0x49, 0xe9, 0x81, 0xa5, 0x94, 0x8c, 0xb8, 0x38, 0x42, 0xa0, 0xb2, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, diff --git a/pkg/proto/hapi/release/hook.pb.go b/pkg/proto/hapi/release/hook.pb.go index 956ca15f3..eecaa527b 100644 --- a/pkg/proto/hapi/release/hook.pb.go +++ b/pkg/proto/hapi/release/hook.pb.go @@ -17,6 +17,7 @@ It has these top-level messages: Hook Info Release + ReleaseSummary Status TestRun TestSuite @@ -107,6 +108,41 @@ func (m *Hook) String() string { return proto.CompactTextString(m) } func (*Hook) ProtoMessage() {} func (*Hook) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *Hook) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Hook) GetKind() string { + if m != nil { + return m.Kind + } + return "" +} + +func (m *Hook) GetPath() string { + if m != nil { + return m.Path + } + return "" +} + +func (m *Hook) GetManifest() string { + if m != nil { + return m.Manifest + } + return "" +} + +func (m *Hook) GetEvents() []Hook_Event { + if m != nil { + return m.Events + } + return nil +} + func (m *Hook) GetLastRun() *google_protobuf.Timestamp { if m != nil { return m.LastRun @@ -123,7 +159,7 @@ func init() { proto.RegisterFile("hapi/release/hook.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ // 354 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x90, 0xdd, 0x6e, 0xa2, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xdd, 0x6e, 0xa2, 0x40, 0x18, 0x86, 0x17, 0x41, 0xd0, 0xd1, 0x75, 0x67, 0x27, 0x9b, 0xec, 0xc4, 0x93, 0x35, 0x1e, 0x79, 0x34, 0x6c, 0x6c, 0x7a, 0x01, 0xa8, 0xd3, 0xd6, 0x48, 0xd0, 0x0c, 0x90, 0x26, 0x3d, 0x21, 0x98, 0x8e, 0x4a, 0x14, 0x86, 0x08, 0xf6, 0x72, 0x7a, 0x55, 0xbd, 0xa0, 0x66, 0x86, 0x9f, 0x34, 0xe9, diff --git a/pkg/proto/hapi/release/info.pb.go b/pkg/proto/hapi/release/info.pb.go index a73dcab2f..9485ad058 100644 --- a/pkg/proto/hapi/release/info.pb.go +++ b/pkg/proto/hapi/release/info.pb.go @@ -58,6 +58,13 @@ func (m *Info) GetDeleted() *google_protobuf.Timestamp { return nil } +func (m *Info) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + func init() { proto.RegisterType((*Info)(nil), "hapi.release.Info") } @@ -66,7 +73,7 @@ func init() { proto.RegisterFile("hapi/release/info.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ // 235 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x31, 0x4f, 0xc3, 0x30, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8f, 0x31, 0x4f, 0xc3, 0x30, 0x10, 0x85, 0x95, 0x52, 0x5a, 0xd5, 0x6d, 0x19, 0x2c, 0x24, 0x42, 0x16, 0x22, 0xa6, 0x0e, 0xc8, 0x91, 0x80, 0x1d, 0x81, 0xba, 0xb0, 0x06, 0x26, 0x16, 0xe4, 0xe2, 0x73, 0xb1, 0xe4, 0xe6, 0x2c, 0xfb, 0x3a, 0xf0, 0x2f, 0xf8, 0xc9, 0xa8, 0xb6, 0x83, 0xd2, 0xa9, 0xab, 0xbf, 0xf7, 0x3e, 0xbf, diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go index 72255e3e2..468f3f086 100644 --- a/pkg/proto/hapi/release/release.pb.go +++ b/pkg/proto/hapi/release/release.pb.go @@ -9,6 +9,7 @@ import fmt "fmt" import math "math" import hapi_chart "k8s.io/helm/pkg/proto/hapi/chart" import hapi_chart3 "k8s.io/helm/pkg/proto/hapi/chart" +import hapi_chart1 "k8s.io/helm/pkg/proto/hapi/chart" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -42,6 +43,13 @@ func (m *Release) String() string { return proto.CompactTextString(m) func (*Release) ProtoMessage() {} func (*Release) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (m *Release) GetName() string { + if m != nil { + return m.Name + } + return "" +} + func (m *Release) GetInfo() *Info { if m != nil { return m.Info @@ -63,6 +71,13 @@ func (m *Release) GetConfig() *hapi_chart.Config { return nil } +func (m *Release) GetManifest() string { + if m != nil { + return m.Manifest + } + return "" +} + func (m *Release) GetHooks() []*Hook { if m != nil { return m.Hooks @@ -70,28 +85,113 @@ func (m *Release) GetHooks() []*Hook { return nil } +func (m *Release) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} + +func (m *Release) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + +// ReleaseSummary summaries a deployment of a chart, together with the chart +// metadata and the variables used to deploy that chart. +type ReleaseSummary struct { + // Name is the name of the release + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + // Info provides information about a release + Info *Info `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"` + // ChartMetadata is the metadata of chart that was released. + ChartMetadata *hapi_chart1.Metadata `protobuf:"bytes,3,opt,name=chart_metadata,json=chartMetadata" json:"chart_metadata,omitempty"` + // Config is the set of extra Values added to the chart. + // These values override the default values inside of the chart. + Config *hapi_chart.Config `protobuf:"bytes,4,opt,name=config" json:"config,omitempty"` + // Version is an int32 which represents the version of the release. + Version int32 `protobuf:"varint,5,opt,name=version" json:"version,omitempty"` + // Namespace is the kubernetes namespace of the release. + Namespace string `protobuf:"bytes,6,opt,name=namespace" json:"namespace,omitempty"` +} + +func (m *ReleaseSummary) Reset() { *m = ReleaseSummary{} } +func (m *ReleaseSummary) String() string { return proto.CompactTextString(m) } +func (*ReleaseSummary) ProtoMessage() {} +func (*ReleaseSummary) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } + +func (m *ReleaseSummary) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *ReleaseSummary) GetInfo() *Info { + if m != nil { + return m.Info + } + return nil +} + +func (m *ReleaseSummary) GetChartMetadata() *hapi_chart1.Metadata { + if m != nil { + return m.ChartMetadata + } + return nil +} + +func (m *ReleaseSummary) GetConfig() *hapi_chart.Config { + if m != nil { + return m.Config + } + return nil +} + +func (m *ReleaseSummary) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} + +func (m *ReleaseSummary) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + func init() { proto.RegisterType((*Release)(nil), "hapi.release.Release") + proto.RegisterType((*ReleaseSummary)(nil), "hapi.release.ReleaseSummary") } func init() { proto.RegisterFile("hapi/release/release.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 256 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x90, 0xbf, 0x4e, 0xc3, 0x40, - 0x0c, 0xc6, 0x95, 0x36, 0x7f, 0x1a, 0xc3, 0x82, 0x07, 0xb0, 0x22, 0x86, 0x88, 0x01, 0x22, 0x86, - 0x54, 0x82, 0x37, 0x80, 0x05, 0xd6, 0x1b, 0xd9, 0x8e, 0xe8, 0x42, 0x4e, 0xa5, 0xe7, 0x28, 0x17, - 0xf1, 0x2c, 0x3c, 0x2e, 0xba, 0x3f, 0x85, 0x94, 0x2e, 0x4e, 0xec, 0xdf, 0xa7, 0xcf, 0xdf, 0x19, - 0xaa, 0x41, 0x8e, 0x7a, 0x3b, 0xa9, 0x4f, 0x25, 0xad, 0x3a, 0x7c, 0xdb, 0x71, 0xe2, 0x99, 0xf1, - 0xdc, 0xb1, 0x36, 0xce, 0xaa, 0xab, 0x23, 0xe5, 0xc0, 0xbc, 0x0b, 0xb2, 0x7f, 0x40, 0x9b, 0x9e, - 0x8f, 0x40, 0x37, 0xc8, 0x69, 0xde, 0x76, 0x6c, 0x7a, 0xfd, 0x11, 0xc1, 0xe5, 0x12, 0xb8, 0x1a, - 0xe6, 0x37, 0xdf, 0x2b, 0x28, 0x44, 0xf0, 0x41, 0x84, 0xd4, 0xc8, 0xbd, 0xa2, 0xa4, 0x4e, 0x9a, - 0x52, 0xf8, 0x7f, 0xbc, 0x85, 0xd4, 0xd9, 0xd3, 0xaa, 0x4e, 0x9a, 0xb3, 0x07, 0x6c, 0x97, 0xf9, - 0xda, 0x57, 0xd3, 0xb3, 0xf0, 0x1c, 0xef, 0x20, 0xf3, 0xb6, 0xb4, 0xf6, 0xc2, 0x8b, 0x20, 0x0c, - 0x9b, 0x9e, 0x5d, 0x15, 0x81, 0xe3, 0x3d, 0xe4, 0x21, 0x18, 0xa5, 0x4b, 0xcb, 0xa8, 0xf4, 0x44, - 0x44, 0x05, 0x56, 0xb0, 0xd9, 0x4b, 0xa3, 0x7b, 0x65, 0x67, 0xca, 0x7c, 0xa8, 0xdf, 0x1e, 0x1b, - 0xc8, 0xdc, 0x41, 0x2c, 0xe5, 0xf5, 0xfa, 0x34, 0xd9, 0x0b, 0xf3, 0x4e, 0x04, 0x01, 0x12, 0x14, - 0x5f, 0x6a, 0xb2, 0x9a, 0x0d, 0x15, 0x75, 0xd2, 0x64, 0xe2, 0xd0, 0xe2, 0x35, 0x94, 0xee, 0x91, - 0x76, 0x94, 0x9d, 0xa2, 0x8d, 0x5f, 0xf0, 0x37, 0x78, 0x2a, 0xdf, 0x8a, 0x68, 0xf7, 0x9e, 0xfb, - 0x63, 0x3d, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x8f, 0xec, 0x97, 0xbb, 0x01, 0x00, 0x00, + // 324 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x3d, 0x4b, 0xfc, 0x40, + 0x10, 0xc6, 0xc9, 0x5d, 0x5e, 0x2e, 0xf3, 0xff, 0x7b, 0xe0, 0x20, 0xba, 0x06, 0x8b, 0x70, 0x85, + 0x06, 0x8b, 0x1c, 0x68, 0x69, 0xa7, 0x8d, 0x16, 0x36, 0x6b, 0x67, 0x23, 0x6b, 0xdc, 0x98, 0x70, + 0x66, 0x37, 0x24, 0x51, 0xf0, 0x9b, 0xf8, 0x25, 0xfd, 0x0e, 0xb2, 0x2f, 0xd1, 0xbd, 0x13, 0x04, + 0xb1, 0xd9, 0x64, 0xe6, 0xf7, 0xb0, 0xf3, 0xcc, 0x93, 0x40, 0x52, 0xb1, 0xb6, 0x5e, 0x76, 0xfc, + 0x89, 0xb3, 0x9e, 0x8f, 0xcf, 0xbc, 0xed, 0xe4, 0x20, 0xf1, 0xbf, 0x62, 0xb9, 0xed, 0x25, 0x7b, + 0x6b, 0xca, 0x4a, 0xca, 0x95, 0x91, 0x6d, 0x80, 0x5a, 0x94, 0x72, 0x0d, 0x14, 0x15, 0xeb, 0x86, + 0x65, 0x21, 0x45, 0x59, 0x3f, 0x5a, 0xb0, 0xeb, 0x02, 0x75, 0xda, 0xfe, 0xbe, 0xd3, 0x6f, 0xf8, + 0xc0, 0x1e, 0xd8, 0xc0, 0x0c, 0x5a, 0xbc, 0x4d, 0x20, 0xa2, 0x66, 0x04, 0x22, 0xf8, 0x82, 0x35, + 0x9c, 0x78, 0xa9, 0x97, 0xc5, 0x54, 0xbf, 0xe3, 0x21, 0xf8, 0x6a, 0x32, 0x99, 0xa4, 0x5e, 0xf6, + 0xef, 0x04, 0x73, 0xd7, 0x7a, 0x7e, 0x25, 0x4a, 0x49, 0x35, 0xc7, 0x23, 0x08, 0xf4, 0xfd, 0x64, + 0xaa, 0x85, 0xdb, 0x46, 0x68, 0x4c, 0x5c, 0xa8, 0x93, 0x1a, 0x8e, 0xc7, 0x10, 0x1a, 0xcf, 0xc4, + 0x77, 0xaf, 0xb4, 0x4a, 0x4d, 0xa8, 0x55, 0x60, 0x02, 0xb3, 0x86, 0x89, 0xba, 0xe4, 0xfd, 0x40, + 0x02, 0x6d, 0xea, 0xb3, 0xc6, 0x0c, 0x02, 0x95, 0x55, 0x4f, 0xc2, 0x74, 0xfa, 0xdd, 0xd9, 0xa5, + 0x94, 0x2b, 0x6a, 0x04, 0x48, 0x20, 0x7a, 0xe1, 0x5d, 0x5f, 0x4b, 0x41, 0xa2, 0xd4, 0xcb, 0x02, + 0x3a, 0x96, 0x78, 0x00, 0xb1, 0x5a, 0xb2, 0x6f, 0x59, 0xc1, 0xc9, 0x4c, 0x0f, 0xf8, 0x6a, 0x2c, + 0xde, 0x3d, 0x98, 0xdb, 0x68, 0x6e, 0x9e, 0x9b, 0x86, 0x75, 0xaf, 0x7f, 0x4a, 0xe8, 0x0c, 0xe6, + 0x7a, 0xc9, 0xbb, 0xf1, 0x0b, 0xd8, 0xa8, 0x76, 0xdc, 0x00, 0xae, 0x2d, 0xa3, 0x5b, 0xba, 0x1e, + 0xcb, 0x5f, 0xa5, 0xe6, 0xec, 0x1b, 0xfc, 0xb0, 0x6f, 0xb8, 0xb1, 0xef, 0x79, 0x7c, 0x1b, 0x59, + 0xdb, 0xf7, 0xa1, 0xfe, 0x39, 0x4e, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcf, 0xa5, 0xc6, 0x66, + 0xc6, 0x02, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/status.pb.go b/pkg/proto/hapi/release/status.pb.go index 29144b7ca..0098207a7 100644 --- a/pkg/proto/hapi/release/status.pb.go +++ b/pkg/proto/hapi/release/status.pb.go @@ -69,6 +69,27 @@ func (m *Status) String() string { return proto.CompactTextString(m) func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } +func (m *Status) GetCode() Status_Code { + if m != nil { + return m.Code + } + return Status_UNKNOWN +} + +func (m *Status) GetResources() string { + if m != nil { + return m.Resources + } + return "" +} + +func (m *Status) GetNotes() string { + if m != nil { + return m.Notes + } + return "" +} + func (m *Status) GetLastTestSuiteRun() *TestSuite { if m != nil { return m.LastTestSuiteRun @@ -85,7 +106,7 @@ func init() { proto.RegisterFile("hapi/release/status.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ // 291 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0xdf, 0x6a, 0xc2, 0x30, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xdf, 0x6a, 0xc2, 0x30, 0x14, 0xc6, 0x57, 0xad, 0x3a, 0x8f, 0x22, 0x21, 0x1b, 0xac, 0xca, 0x06, 0xc5, 0xab, 0xde, 0xac, 0x05, 0xf7, 0x04, 0xdb, 0x12, 0x87, 0xac, 0x54, 0x69, 0x2b, 0xfb, 0x73, 0x53, 0xaa, 0x9e, 0x39, 0xa1, 0x34, 0xd2, 0x24, 0x17, 0x7b, 0x88, 0xbd, 0xf3, 0x68, 0x2b, 0x74, 0x5e, 0x7e, 0xf9, 0xfd, diff --git a/pkg/proto/hapi/release/test_run.pb.go b/pkg/proto/hapi/release/test_run.pb.go index 51b3e72f9..79fce4ab4 100644 --- a/pkg/proto/hapi/release/test_run.pb.go +++ b/pkg/proto/hapi/release/test_run.pb.go @@ -51,6 +51,27 @@ func (m *TestRun) String() string { return proto.CompactTextString(m) func (*TestRun) ProtoMessage() {} func (*TestRun) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} } +func (m *TestRun) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *TestRun) GetStatus() TestRun_Status { + if m != nil { + return m.Status + } + return TestRun_UNKNOWN +} + +func (m *TestRun) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + func (m *TestRun) GetStartedAt() *google_protobuf.Timestamp { if m != nil { return m.StartedAt @@ -74,7 +95,7 @@ func init() { proto.RegisterFile("hapi/release/test_run.proto", fileDescriptor4) var fileDescriptor4 = []byte{ // 265 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x41, 0x4b, 0xfb, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8f, 0x41, 0x4b, 0xfb, 0x40, 0x14, 0xc4, 0xff, 0xc9, 0xbf, 0x26, 0x64, 0x53, 0x24, 0xec, 0x29, 0x54, 0xc1, 0xd0, 0x53, 0x4e, 0xbb, 0x50, 0xbd, 0x78, 0xf0, 0x10, 0x4b, 0x05, 0x51, 0x22, 0x6c, 0x1a, 0x04, 0x2f, 0x65, 0xab, 0xaf, 0x35, 0x90, 0x64, 0x43, 0xf6, 0xe5, 0x8b, 0xf8, 0x89, 0x65, 0x93, 0xad, 0x78, 0xf3, 0xf6, diff --git a/pkg/proto/hapi/release/test_suite.pb.go b/pkg/proto/hapi/release/test_suite.pb.go index 27fe45ac5..f168bf1d2 100644 --- a/pkg/proto/hapi/release/test_suite.pb.go +++ b/pkg/proto/hapi/release/test_suite.pb.go @@ -58,7 +58,7 @@ func init() { proto.RegisterFile("hapi/release/test_suite.proto", fileDescriptor var fileDescriptor5 = []byte{ // 207 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0xc1, 0x4a, 0x86, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8f, 0xc1, 0x4a, 0x86, 0x40, 0x14, 0x85, 0x31, 0x21, 0x71, 0x74, 0x35, 0x10, 0x88, 0x11, 0x49, 0x2b, 0x57, 0x33, 0x60, 0xab, 0x16, 0x2d, 0xec, 0x11, 0xcc, 0x55, 0x1b, 0x19, 0xeb, 0x66, 0xc2, 0xe8, 0x0c, 0x73, 0xef, 0xbc, 0x5a, 0xcf, 0x17, 0xea, 0x18, 0x41, 0x8b, 0x7f, 0xfd, 0x7d, 0xe7, 0x9c, 0x7b, 0xd9, 0xdd, 0x97, diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go index 4e772dd0d..0b89569dd 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -12,6 +12,8 @@ It has these top-level messages: ListReleasesRequest ListSort ListReleasesResponse + SummarizeReleasesRequest + SummarizeReleasesResponse GetReleaseStatusRequest GetReleaseStatusResponse GetReleaseContentRequest @@ -138,6 +140,55 @@ func (m *ListReleasesRequest) String() string { return proto.CompactT func (*ListReleasesRequest) ProtoMessage() {} func (*ListReleasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *ListReleasesRequest) GetLimit() int64 { + if m != nil { + return m.Limit + } + return 0 +} + +func (m *ListReleasesRequest) GetOffset() string { + if m != nil { + return m.Offset + } + return "" +} + +func (m *ListReleasesRequest) GetSortBy() ListSort_SortBy { + if m != nil { + return m.SortBy + } + return ListSort_UNKNOWN +} + +func (m *ListReleasesRequest) GetFilter() string { + if m != nil { + return m.Filter + } + return "" +} + +func (m *ListReleasesRequest) GetSortOrder() ListSort_SortOrder { + if m != nil { + return m.SortOrder + } + return ListSort_ASC +} + +func (m *ListReleasesRequest) GetStatusCodes() []hapi_release3.Status_Code { + if m != nil { + return m.StatusCodes + } + return nil +} + +func (m *ListReleasesRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + // ListSort defines sorting fields on a release list. type ListSort struct { } @@ -165,6 +216,27 @@ func (m *ListReleasesResponse) String() string { return proto.Compact func (*ListReleasesResponse) ProtoMessage() {} func (*ListReleasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (m *ListReleasesResponse) GetCount() int64 { + if m != nil { + return m.Count + } + return 0 +} + +func (m *ListReleasesResponse) GetNext() string { + if m != nil { + return m.Next + } + return "" +} + +func (m *ListReleasesResponse) GetTotal() int64 { + if m != nil { + return m.Total + } + return 0 +} + func (m *ListReleasesResponse) GetReleases() []*hapi_release5.Release { if m != nil { return m.Releases @@ -172,6 +244,81 @@ func (m *ListReleasesResponse) GetReleases() []*hapi_release5.Release { return nil } +// SummarizeReleasesRequest requests a list of release summaries. +// +// Releases can be sorted according to a few pre-determined sort stategies. +type SummarizeReleasesRequest struct { + // SortBy is the sort field that the ListReleases server should sort data before returning. + SortBy ListSort_SortBy `protobuf:"varint,1,opt,name=sort_by,json=sortBy,enum=hapi.services.tiller.ListSort_SortBy" json:"sort_by,omitempty"` + // Filter is a regular expression used to filter which releases should be listed. + // + // Anything that matches the regexp will be included in the results. + Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"` + // SortOrder is the ordering directive used for sorting. + SortOrder ListSort_SortOrder `protobuf:"varint,3,opt,name=sort_order,json=sortOrder,enum=hapi.services.tiller.ListSort_SortOrder" json:"sort_order,omitempty"` + StatusCodes []hapi_release3.Status_Code `protobuf:"varint,6,rep,packed,name=status_codes,json=statusCodes,enum=hapi.release.Status_Code" json:"status_codes,omitempty"` + // Namespace is the filter to select releases only from a specific namespace. + Namespace string `protobuf:"bytes,4,opt,name=namespace" json:"namespace,omitempty"` +} + +func (m *SummarizeReleasesRequest) Reset() { *m = SummarizeReleasesRequest{} } +func (m *SummarizeReleasesRequest) String() string { return proto.CompactTextString(m) } +func (*SummarizeReleasesRequest) ProtoMessage() {} +func (*SummarizeReleasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } + +func (m *SummarizeReleasesRequest) GetSortBy() ListSort_SortBy { + if m != nil { + return m.SortBy + } + return ListSort_UNKNOWN +} + +func (m *SummarizeReleasesRequest) GetFilter() string { + if m != nil { + return m.Filter + } + return "" +} + +func (m *SummarizeReleasesRequest) GetSortOrder() ListSort_SortOrder { + if m != nil { + return m.SortOrder + } + return ListSort_ASC +} + +func (m *SummarizeReleasesRequest) GetStatusCodes() []hapi_release3.Status_Code { + if m != nil { + return m.StatusCodes + } + return nil +} + +func (m *SummarizeReleasesRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + +// SummarizeReleasesResponse is a list of release summaries. +type SummarizeReleasesResponse struct { + // Releases is the list of found release objects. + Releases []*hapi_release5.ReleaseSummary `protobuf:"bytes,1,rep,name=releases" json:"releases,omitempty"` +} + +func (m *SummarizeReleasesResponse) Reset() { *m = SummarizeReleasesResponse{} } +func (m *SummarizeReleasesResponse) String() string { return proto.CompactTextString(m) } +func (*SummarizeReleasesResponse) ProtoMessage() {} +func (*SummarizeReleasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } + +func (m *SummarizeReleasesResponse) GetReleases() []*hapi_release5.ReleaseSummary { + if m != nil { + return m.Releases + } + return nil +} + // GetReleaseStatusRequest is a request to get the status of a release. type GetReleaseStatusRequest struct { // Name is the name of the release @@ -183,7 +330,21 @@ type GetReleaseStatusRequest struct { func (m *GetReleaseStatusRequest) Reset() { *m = GetReleaseStatusRequest{} } func (m *GetReleaseStatusRequest) String() string { return proto.CompactTextString(m) } func (*GetReleaseStatusRequest) ProtoMessage() {} -func (*GetReleaseStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (*GetReleaseStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } + +func (m *GetReleaseStatusRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *GetReleaseStatusRequest) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} // GetReleaseStatusResponse is the response indicating the status of the named release. type GetReleaseStatusResponse struct { @@ -198,7 +359,14 @@ type GetReleaseStatusResponse struct { func (m *GetReleaseStatusResponse) Reset() { *m = GetReleaseStatusResponse{} } func (m *GetReleaseStatusResponse) String() string { return proto.CompactTextString(m) } func (*GetReleaseStatusResponse) ProtoMessage() {} -func (*GetReleaseStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (*GetReleaseStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } + +func (m *GetReleaseStatusResponse) GetName() string { + if m != nil { + return m.Name + } + return "" +} func (m *GetReleaseStatusResponse) GetInfo() *hapi_release4.Info { if m != nil { @@ -207,6 +375,13 @@ func (m *GetReleaseStatusResponse) GetInfo() *hapi_release4.Info { return nil } +func (m *GetReleaseStatusResponse) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + // GetReleaseContentRequest is a request to get the contents of a release. type GetReleaseContentRequest struct { // The name of the release @@ -218,7 +393,21 @@ type GetReleaseContentRequest struct { func (m *GetReleaseContentRequest) Reset() { *m = GetReleaseContentRequest{} } func (m *GetReleaseContentRequest) String() string { return proto.CompactTextString(m) } func (*GetReleaseContentRequest) ProtoMessage() {} -func (*GetReleaseContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (*GetReleaseContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } + +func (m *GetReleaseContentRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *GetReleaseContentRequest) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} // GetReleaseContentResponse is a response containing the contents of a release. type GetReleaseContentResponse struct { @@ -229,7 +418,7 @@ type GetReleaseContentResponse struct { func (m *GetReleaseContentResponse) Reset() { *m = GetReleaseContentResponse{} } func (m *GetReleaseContentResponse) String() string { return proto.CompactTextString(m) } func (*GetReleaseContentResponse) ProtoMessage() {} -func (*GetReleaseContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } +func (*GetReleaseContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *GetReleaseContentResponse) GetRelease() *hapi_release5.Release { if m != nil { @@ -264,7 +453,14 @@ type UpdateReleaseRequest struct { func (m *UpdateReleaseRequest) Reset() { *m = UpdateReleaseRequest{} } func (m *UpdateReleaseRequest) String() string { return proto.CompactTextString(m) } func (*UpdateReleaseRequest) ProtoMessage() {} -func (*UpdateReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (*UpdateReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } + +func (m *UpdateReleaseRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} func (m *UpdateReleaseRequest) GetChart() *hapi_chart3.Chart { if m != nil { @@ -280,6 +476,48 @@ func (m *UpdateReleaseRequest) GetValues() *hapi_chart.Config { return nil } +func (m *UpdateReleaseRequest) GetDryRun() bool { + if m != nil { + return m.DryRun + } + return false +} + +func (m *UpdateReleaseRequest) GetDisableHooks() bool { + if m != nil { + return m.DisableHooks + } + return false +} + +func (m *UpdateReleaseRequest) GetRecreate() bool { + if m != nil { + return m.Recreate + } + return false +} + +func (m *UpdateReleaseRequest) GetTimeout() int64 { + if m != nil { + return m.Timeout + } + return 0 +} + +func (m *UpdateReleaseRequest) GetResetValues() bool { + if m != nil { + return m.ResetValues + } + return false +} + +func (m *UpdateReleaseRequest) GetWait() bool { + if m != nil { + return m.Wait + } + return false +} + // UpdateReleaseResponse is the response to an update request. type UpdateReleaseResponse struct { Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"` @@ -288,7 +526,7 @@ type UpdateReleaseResponse struct { func (m *UpdateReleaseResponse) Reset() { *m = UpdateReleaseResponse{} } func (m *UpdateReleaseResponse) String() string { return proto.CompactTextString(m) } func (*UpdateReleaseResponse) ProtoMessage() {} -func (*UpdateReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (*UpdateReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *UpdateReleaseResponse) GetRelease() *hapi_release5.Release { if m != nil { @@ -318,7 +556,56 @@ type RollbackReleaseRequest struct { func (m *RollbackReleaseRequest) Reset() { *m = RollbackReleaseRequest{} } func (m *RollbackReleaseRequest) String() string { return proto.CompactTextString(m) } func (*RollbackReleaseRequest) ProtoMessage() {} -func (*RollbackReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } +func (*RollbackReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } + +func (m *RollbackReleaseRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *RollbackReleaseRequest) GetDryRun() bool { + if m != nil { + return m.DryRun + } + return false +} + +func (m *RollbackReleaseRequest) GetDisableHooks() bool { + if m != nil { + return m.DisableHooks + } + return false +} + +func (m *RollbackReleaseRequest) GetVersion() int32 { + if m != nil { + return m.Version + } + return 0 +} + +func (m *RollbackReleaseRequest) GetRecreate() bool { + if m != nil { + return m.Recreate + } + return false +} + +func (m *RollbackReleaseRequest) GetTimeout() int64 { + if m != nil { + return m.Timeout + } + return 0 +} + +func (m *RollbackReleaseRequest) GetWait() bool { + if m != nil { + return m.Wait + } + return false +} // RollbackReleaseResponse is the response to an update request. type RollbackReleaseResponse struct { @@ -328,7 +615,7 @@ type RollbackReleaseResponse struct { func (m *RollbackReleaseResponse) Reset() { *m = RollbackReleaseResponse{} } func (m *RollbackReleaseResponse) String() string { return proto.CompactTextString(m) } func (*RollbackReleaseResponse) ProtoMessage() {} -func (*RollbackReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } +func (*RollbackReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } func (m *RollbackReleaseResponse) GetRelease() *hapi_release5.Release { if m != nil { @@ -367,7 +654,7 @@ type InstallReleaseRequest struct { func (m *InstallReleaseRequest) Reset() { *m = InstallReleaseRequest{} } func (m *InstallReleaseRequest) String() string { return proto.CompactTextString(m) } func (*InstallReleaseRequest) ProtoMessage() {} -func (*InstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (*InstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } func (m *InstallReleaseRequest) GetChart() *hapi_chart3.Chart { if m != nil { @@ -383,6 +670,55 @@ func (m *InstallReleaseRequest) GetValues() *hapi_chart.Config { return nil } +func (m *InstallReleaseRequest) GetDryRun() bool { + if m != nil { + return m.DryRun + } + return false +} + +func (m *InstallReleaseRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *InstallReleaseRequest) GetDisableHooks() bool { + if m != nil { + return m.DisableHooks + } + return false +} + +func (m *InstallReleaseRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + +func (m *InstallReleaseRequest) GetReuseName() bool { + if m != nil { + return m.ReuseName + } + return false +} + +func (m *InstallReleaseRequest) GetTimeout() int64 { + if m != nil { + return m.Timeout + } + return 0 +} + +func (m *InstallReleaseRequest) GetWait() bool { + if m != nil { + return m.Wait + } + return false +} + // InstallReleaseResponse is the response from a release installation. type InstallReleaseResponse struct { Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"` @@ -391,7 +727,7 @@ type InstallReleaseResponse struct { func (m *InstallReleaseResponse) Reset() { *m = InstallReleaseResponse{} } func (m *InstallReleaseResponse) String() string { return proto.CompactTextString(m) } func (*InstallReleaseResponse) ProtoMessage() {} -func (*InstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } +func (*InstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } func (m *InstallReleaseResponse) GetRelease() *hapi_release5.Release { if m != nil { @@ -415,7 +751,35 @@ type UninstallReleaseRequest struct { func (m *UninstallReleaseRequest) Reset() { *m = UninstallReleaseRequest{} } func (m *UninstallReleaseRequest) String() string { return proto.CompactTextString(m) } func (*UninstallReleaseRequest) ProtoMessage() {} -func (*UninstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } +func (*UninstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } + +func (m *UninstallReleaseRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *UninstallReleaseRequest) GetDisableHooks() bool { + if m != nil { + return m.DisableHooks + } + return false +} + +func (m *UninstallReleaseRequest) GetPurge() bool { + if m != nil { + return m.Purge + } + return false +} + +func (m *UninstallReleaseRequest) GetTimeout() int64 { + if m != nil { + return m.Timeout + } + return 0 +} // UninstallReleaseResponse represents a successful response to an uninstall request. type UninstallReleaseResponse struct { @@ -428,7 +792,7 @@ type UninstallReleaseResponse struct { func (m *UninstallReleaseResponse) Reset() { *m = UninstallReleaseResponse{} } func (m *UninstallReleaseResponse) String() string { return proto.CompactTextString(m) } func (*UninstallReleaseResponse) ProtoMessage() {} -func (*UninstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } +func (*UninstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } func (m *UninstallReleaseResponse) GetRelease() *hapi_release5.Release { if m != nil { @@ -437,6 +801,13 @@ func (m *UninstallReleaseResponse) GetRelease() *hapi_release5.Release { return nil } +func (m *UninstallReleaseResponse) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + // GetVersionRequest requests for version information. type GetVersionRequest struct { } @@ -444,7 +815,7 @@ type GetVersionRequest struct { func (m *GetVersionRequest) Reset() { *m = GetVersionRequest{} } func (m *GetVersionRequest) String() string { return proto.CompactTextString(m) } func (*GetVersionRequest) ProtoMessage() {} -func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } +func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } type GetVersionResponse struct { Version *hapi_version.Version `protobuf:"bytes,1,opt,name=Version" json:"Version,omitempty"` @@ -453,7 +824,7 @@ type GetVersionResponse struct { func (m *GetVersionResponse) Reset() { *m = GetVersionResponse{} } func (m *GetVersionResponse) String() string { return proto.CompactTextString(m) } func (*GetVersionResponse) ProtoMessage() {} -func (*GetVersionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } +func (*GetVersionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } func (m *GetVersionResponse) GetVersion() *hapi_version.Version { if m != nil { @@ -473,7 +844,21 @@ type GetHistoryRequest struct { func (m *GetHistoryRequest) Reset() { *m = GetHistoryRequest{} } func (m *GetHistoryRequest) String() string { return proto.CompactTextString(m) } func (*GetHistoryRequest) ProtoMessage() {} -func (*GetHistoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } +func (*GetHistoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } + +func (m *GetHistoryRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *GetHistoryRequest) GetMax() int32 { + if m != nil { + return m.Max + } + return 0 +} // GetHistoryResponse is received in response to a GetHistory rpc. type GetHistoryResponse struct { @@ -483,7 +868,7 @@ type GetHistoryResponse struct { func (m *GetHistoryResponse) Reset() { *m = GetHistoryResponse{} } func (m *GetHistoryResponse) String() string { return proto.CompactTextString(m) } func (*GetHistoryResponse) ProtoMessage() {} -func (*GetHistoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } +func (*GetHistoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } func (m *GetHistoryResponse) GetReleases() []*hapi_release5.Release { if m != nil { @@ -505,7 +890,28 @@ type TestReleaseRequest struct { func (m *TestReleaseRequest) Reset() { *m = TestReleaseRequest{} } func (m *TestReleaseRequest) String() string { return proto.CompactTextString(m) } func (*TestReleaseRequest) ProtoMessage() {} -func (*TestReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } +func (*TestReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } + +func (m *TestReleaseRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *TestReleaseRequest) GetTimeout() int64 { + if m != nil { + return m.Timeout + } + return 0 +} + +func (m *TestReleaseRequest) GetCleanup() bool { + if m != nil { + return m.Cleanup + } + return false +} // TestReleaseResponse represents a message from executing a test type TestReleaseResponse struct { @@ -515,12 +921,21 @@ type TestReleaseResponse struct { func (m *TestReleaseResponse) Reset() { *m = TestReleaseResponse{} } func (m *TestReleaseResponse) String() string { return proto.CompactTextString(m) } func (*TestReleaseResponse) ProtoMessage() {} -func (*TestReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } +func (*TestReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } + +func (m *TestReleaseResponse) GetMsg() string { + if m != nil { + return m.Msg + } + return "" +} func init() { proto.RegisterType((*ListReleasesRequest)(nil), "hapi.services.tiller.ListReleasesRequest") proto.RegisterType((*ListSort)(nil), "hapi.services.tiller.ListSort") proto.RegisterType((*ListReleasesResponse)(nil), "hapi.services.tiller.ListReleasesResponse") + proto.RegisterType((*SummarizeReleasesRequest)(nil), "hapi.services.tiller.SummarizeReleasesRequest") + proto.RegisterType((*SummarizeReleasesResponse)(nil), "hapi.services.tiller.SummarizeReleasesResponse") proto.RegisterType((*GetReleaseStatusRequest)(nil), "hapi.services.tiller.GetReleaseStatusRequest") proto.RegisterType((*GetReleaseStatusResponse)(nil), "hapi.services.tiller.GetReleaseStatusResponse") proto.RegisterType((*GetReleaseContentRequest)(nil), "hapi.services.tiller.GetReleaseContentRequest") @@ -549,7 +964,7 @@ var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion3 +const _ = grpc.SupportPackageIsVersion4 // Client API for ReleaseService service @@ -559,6 +974,11 @@ type ReleaseServiceClient interface { // release status. By default, ListAllReleases returns the releases who // current status is "Active". ListReleases(ctx context.Context, in *ListReleasesRequest, opts ...grpc.CallOption) (ReleaseService_ListReleasesClient, error) + // SummarizeReleases retrieves summary of release history. + // TODO: Allow filtering the set of releases by + // release status. By default, SummarizeReleases returns the releases who + // current status is "Active". + SummarizeReleases(ctx context.Context, in *SummarizeReleasesRequest, opts ...grpc.CallOption) (*SummarizeReleasesResponse, error) // GetReleasesStatus retrieves status information for the specified release. GetReleaseStatus(ctx context.Context, in *GetReleaseStatusRequest, opts ...grpc.CallOption) (*GetReleaseStatusResponse, error) // GetReleaseContent retrieves the release content (chart + value) for the specified release. @@ -619,6 +1039,15 @@ func (x *releaseServiceListReleasesClient) Recv() (*ListReleasesResponse, error) return m, nil } +func (c *releaseServiceClient) SummarizeReleases(ctx context.Context, in *SummarizeReleasesRequest, opts ...grpc.CallOption) (*SummarizeReleasesResponse, error) { + out := new(SummarizeReleasesResponse) + err := grpc.Invoke(ctx, "/hapi.services.tiller.ReleaseService/SummarizeReleases", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *releaseServiceClient) GetReleaseStatus(ctx context.Context, in *GetReleaseStatusRequest, opts ...grpc.CallOption) (*GetReleaseStatusResponse, error) { out := new(GetReleaseStatusResponse) err := grpc.Invoke(ctx, "/hapi.services.tiller.ReleaseService/GetReleaseStatus", in, out, c.cc, opts...) @@ -731,6 +1160,11 @@ type ReleaseServiceServer interface { // release status. By default, ListAllReleases returns the releases who // current status is "Active". ListReleases(*ListReleasesRequest, ReleaseService_ListReleasesServer) error + // SummarizeReleases retrieves summary of release history. + // TODO: Allow filtering the set of releases by + // release status. By default, SummarizeReleases returns the releases who + // current status is "Active". + SummarizeReleases(context.Context, *SummarizeReleasesRequest) (*SummarizeReleasesResponse, error) // GetReleasesStatus retrieves status information for the specified release. GetReleaseStatus(context.Context, *GetReleaseStatusRequest) (*GetReleaseStatusResponse, error) // GetReleaseContent retrieves the release content (chart + value) for the specified release. @@ -776,6 +1210,24 @@ func (x *releaseServiceListReleasesServer) Send(m *ListReleasesResponse) error { return x.ServerStream.SendMsg(m) } +func _ReleaseService_SummarizeReleases_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SummarizeReleasesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ReleaseServiceServer).SummarizeReleases(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/hapi.services.tiller.ReleaseService/SummarizeReleases", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ReleaseServiceServer).SummarizeReleases(ctx, req.(*SummarizeReleasesRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _ReleaseService_GetReleaseStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetReleaseStatusRequest) if err := dec(in); err != nil { @@ -945,6 +1397,10 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ ServiceName: "hapi.services.tiller.ReleaseService", HandlerType: (*ReleaseServiceServer)(nil), Methods: []grpc.MethodDesc{ + { + MethodName: "SummarizeReleases", + Handler: _ReleaseService_SummarizeReleases_Handler, + }, { MethodName: "GetReleaseStatus", Handler: _ReleaseService_GetReleaseStatus_Handler, @@ -990,84 +1446,89 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: fileDescriptor0, + Metadata: "hapi/services/tiller.proto", } func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1162 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0xe3, 0xc4, - 0x17, 0xaf, 0xe3, 0x7c, 0x9e, 0x76, 0xfb, 0x4f, 0xa7, 0x5f, 0xae, 0xf5, 0x07, 0x15, 0x23, 0x68, - 0x76, 0x61, 0x53, 0x08, 0x57, 0x48, 0x08, 0xa9, 0xdb, 0x8d, 0xda, 0x42, 0xe9, 0x4a, 0xce, 0x76, - 0x91, 0x10, 0x22, 0x72, 0x93, 0x49, 0x6b, 0xd6, 0xf1, 0x04, 0xcf, 0xb8, 0x6c, 0x6f, 0xb9, 0xe3, - 0x51, 0xe0, 0x29, 0x78, 0x02, 0x5e, 0x80, 0x97, 0x41, 0x9e, 0x0f, 0xd7, 0xe3, 0xda, 0xad, 0xe9, - 0x4d, 0x3c, 0x33, 0xe7, 0xcc, 0xf9, 0xf8, 0x9d, 0x33, 0xbf, 0x99, 0x80, 0x7d, 0xe5, 0x2d, 0xfc, - 0x7d, 0x8a, 0xa3, 0x6b, 0x7f, 0x82, 0xe9, 0x3e, 0xf3, 0x83, 0x00, 0x47, 0xfd, 0x45, 0x44, 0x18, - 0x41, 0x1b, 0x89, 0xac, 0xaf, 0x64, 0x7d, 0x21, 0xb3, 0xb7, 0xf8, 0x8e, 0xc9, 0x95, 0x17, 0x31, - 0xf1, 0x2b, 0xb4, 0xed, 0xed, 0xec, 0x3a, 0x09, 0x67, 0xfe, 0xa5, 0x14, 0x08, 0x17, 0x11, 0x0e, - 0xb0, 0x47, 0xb1, 0xfa, 0x6a, 0x9b, 0x94, 0xcc, 0x0f, 0x67, 0x44, 0x0a, 0x76, 0x34, 0x01, 0x65, - 0x1e, 0x8b, 0xa9, 0x66, 0xef, 0x1a, 0x47, 0xd4, 0x27, 0xa1, 0xfa, 0x0a, 0x99, 0xf3, 0x57, 0x0d, - 0xd6, 0x4f, 0x7d, 0xca, 0x5c, 0xb1, 0x91, 0xba, 0xf8, 0x97, 0x18, 0x53, 0x86, 0x36, 0xa0, 0x11, - 0xf8, 0x73, 0x9f, 0x59, 0xc6, 0xae, 0xd1, 0x33, 0x5d, 0x31, 0x41, 0x5b, 0xd0, 0x24, 0xb3, 0x19, - 0xc5, 0xcc, 0xaa, 0xed, 0x1a, 0xbd, 0x8e, 0x2b, 0x67, 0xe8, 0x6b, 0x68, 0x51, 0x12, 0xb1, 0xf1, - 0xc5, 0x8d, 0x65, 0xee, 0x1a, 0xbd, 0xd5, 0xc1, 0x47, 0xfd, 0x22, 0x28, 0xfa, 0x89, 0xa7, 0x11, - 0x89, 0x58, 0x3f, 0xf9, 0x79, 0x71, 0xe3, 0x36, 0x29, 0xff, 0x26, 0x76, 0x67, 0x7e, 0xc0, 0x70, - 0x64, 0xd5, 0x85, 0x5d, 0x31, 0x43, 0x47, 0x00, 0xdc, 0x2e, 0x89, 0xa6, 0x38, 0xb2, 0x1a, 0xdc, - 0x74, 0xaf, 0x82, 0xe9, 0x57, 0x89, 0xbe, 0xdb, 0xa1, 0x6a, 0x88, 0xbe, 0x82, 0x15, 0x01, 0xc9, - 0x78, 0x42, 0xa6, 0x98, 0x5a, 0xcd, 0x5d, 0xb3, 0xb7, 0x3a, 0xd8, 0x11, 0xa6, 0x14, 0xc2, 0x23, - 0x01, 0xda, 0x21, 0x99, 0x62, 0x77, 0x59, 0xa8, 0x27, 0x63, 0x8a, 0xfe, 0x0f, 0x9d, 0xd0, 0x9b, - 0x63, 0xba, 0xf0, 0x26, 0xd8, 0x6a, 0xf1, 0x08, 0x6f, 0x17, 0x9c, 0x9f, 0xa0, 0xad, 0x9c, 0x3b, - 0x03, 0x68, 0x8a, 0xd4, 0xd0, 0x32, 0xb4, 0xce, 0xcf, 0xbe, 0x3d, 0x7b, 0xf5, 0xfd, 0x59, 0x77, - 0x09, 0xb5, 0xa1, 0x7e, 0x76, 0xf0, 0xdd, 0xb0, 0x6b, 0xa0, 0x35, 0x78, 0x72, 0x7a, 0x30, 0x7a, - 0x3d, 0x76, 0x87, 0xa7, 0xc3, 0x83, 0xd1, 0xf0, 0x65, 0xb7, 0xe6, 0xbc, 0x0f, 0x9d, 0x34, 0x66, - 0xd4, 0x02, 0xf3, 0x60, 0x74, 0x28, 0xb6, 0xbc, 0x1c, 0x8e, 0x0e, 0xbb, 0x86, 0xf3, 0xbb, 0x01, - 0x1b, 0x7a, 0x89, 0xe8, 0x82, 0x84, 0x14, 0x27, 0x35, 0x9a, 0x90, 0x38, 0x4c, 0x6b, 0xc4, 0x27, - 0x08, 0x41, 0x3d, 0xc4, 0xef, 0x54, 0x85, 0xf8, 0x38, 0xd1, 0x64, 0x84, 0x79, 0x01, 0xaf, 0x8e, - 0xe9, 0x8a, 0x09, 0xfa, 0x1c, 0xda, 0x32, 0x75, 0x6a, 0xd5, 0x77, 0xcd, 0xde, 0xf2, 0x60, 0x53, - 0x07, 0x44, 0x7a, 0x74, 0x53, 0x35, 0xe7, 0x08, 0xb6, 0x8f, 0xb0, 0x8a, 0x44, 0xe0, 0xa5, 0x3a, - 0x26, 0xf1, 0xeb, 0xcd, 0x31, 0x0f, 0x26, 0xf1, 0xeb, 0xcd, 0x31, 0xb2, 0xa0, 0x25, 0xdb, 0x8d, - 0x87, 0xd3, 0x70, 0xd5, 0xd4, 0x61, 0x60, 0xdd, 0x35, 0x24, 0xf3, 0x2a, 0xb2, 0xf4, 0x31, 0xd4, - 0x93, 0x66, 0xe7, 0x66, 0x96, 0x07, 0x48, 0x8f, 0xf3, 0x24, 0x9c, 0x11, 0x97, 0xcb, 0xf5, 0x52, - 0x99, 0xf9, 0x52, 0x1d, 0x67, 0xbd, 0x1e, 0x92, 0x90, 0xe1, 0x90, 0x3d, 0x2e, 0xfe, 0x53, 0xd8, - 0x29, 0xb0, 0x24, 0x13, 0xd8, 0x87, 0x96, 0x0c, 0x8d, 0x5b, 0x2b, 0xc5, 0x55, 0x69, 0x39, 0x7f, - 0xd6, 0x60, 0xe3, 0x7c, 0x31, 0xf5, 0x18, 0x56, 0xa2, 0x7b, 0x82, 0xda, 0x83, 0x06, 0x27, 0x0d, - 0x89, 0xc5, 0x9a, 0xb0, 0x2d, 0x98, 0xe5, 0x30, 0xf9, 0x75, 0x85, 0x1c, 0x3d, 0x83, 0xe6, 0xb5, - 0x17, 0xc4, 0x98, 0x72, 0x20, 0x52, 0xd4, 0xa4, 0x26, 0x67, 0x1c, 0x57, 0x6a, 0xa0, 0x6d, 0x68, - 0x4d, 0xa3, 0x9b, 0x71, 0x14, 0x87, 0xfc, 0x08, 0xb6, 0xdd, 0xe6, 0x34, 0xba, 0x71, 0xe3, 0x10, - 0x7d, 0x08, 0x4f, 0xa6, 0x3e, 0xf5, 0x2e, 0x02, 0x3c, 0xbe, 0x22, 0xe4, 0x2d, 0xe5, 0xa7, 0xb0, - 0xed, 0xae, 0xc8, 0xc5, 0xe3, 0x64, 0x0d, 0xd9, 0x49, 0x27, 0x4d, 0x22, 0xec, 0x31, 0x6c, 0x35, - 0xb9, 0x3c, 0x9d, 0x27, 0x18, 0x32, 0x7f, 0x8e, 0x49, 0xcc, 0xf8, 0xd1, 0x31, 0x5d, 0x35, 0x45, - 0x1f, 0xc0, 0x4a, 0x84, 0x29, 0x66, 0x63, 0x19, 0x65, 0x9b, 0xef, 0x5c, 0xe6, 0x6b, 0x6f, 0x44, - 0x58, 0x08, 0xea, 0xbf, 0x7a, 0x3e, 0xb3, 0x3a, 0x5c, 0xc4, 0xc7, 0xce, 0x31, 0x6c, 0xe6, 0xb0, - 0x7a, 0x2c, 0xec, 0x7f, 0x1b, 0xb0, 0xe5, 0x92, 0x20, 0xb8, 0xf0, 0x26, 0x6f, 0x2b, 0x00, 0x9f, - 0xc1, 0xa8, 0x76, 0x3f, 0x46, 0x66, 0x01, 0x46, 0x99, 0x5e, 0xaa, 0x6b, 0xbd, 0xa4, 0xa1, 0xd7, - 0x28, 0x47, 0xaf, 0xa9, 0xa3, 0xa7, 0xa0, 0x69, 0x65, 0xa0, 0xf9, 0x06, 0xb6, 0xef, 0xe4, 0xf3, - 0x58, 0x70, 0xfe, 0xa8, 0xc1, 0xe6, 0x49, 0x48, 0x99, 0x17, 0x04, 0x39, 0x6c, 0xd2, 0x06, 0x34, - 0x2a, 0x37, 0x60, 0xed, 0xbf, 0x34, 0xa0, 0xa9, 0x81, 0xab, 0x2a, 0x51, 0xcf, 0x54, 0xa2, 0x52, - 0x53, 0x6a, 0x54, 0xd0, 0xcc, 0x51, 0x01, 0x7a, 0x0f, 0x20, 0xc2, 0x31, 0xc5, 0x63, 0x6e, 0x5c, - 0x80, 0xd8, 0xe1, 0x2b, 0x67, 0xf2, 0xe4, 0x2b, 0xdc, 0xdb, 0xc5, 0xb8, 0x67, 0x5b, 0xf2, 0x04, - 0xb6, 0xf2, 0x50, 0x3d, 0x16, 0xf6, 0xdf, 0x0c, 0xd8, 0x3e, 0x0f, 0xfd, 0x42, 0xe0, 0x8b, 0x9a, - 0xf2, 0x0e, 0x14, 0xb5, 0x02, 0x28, 0x36, 0xa0, 0xb1, 0x88, 0xa3, 0x4b, 0x2c, 0xa1, 0x15, 0x93, - 0x6c, 0x8e, 0x75, 0x2d, 0x47, 0x67, 0x0c, 0xd6, 0xdd, 0x18, 0x1e, 0x99, 0x51, 0x12, 0x75, 0x4a, - 0xdd, 0x1d, 0x41, 0xd3, 0xce, 0x3a, 0xac, 0x1d, 0x61, 0xf6, 0x46, 0x1c, 0x00, 0x99, 0x9e, 0x33, - 0x04, 0x94, 0x5d, 0xbc, 0xf5, 0x27, 0x97, 0x74, 0x7f, 0xea, 0x1d, 0xa3, 0xf4, 0x95, 0x96, 0xf3, - 0x25, 0xb7, 0x7d, 0xec, 0x53, 0x46, 0xa2, 0x9b, 0xfb, 0xa0, 0xeb, 0x82, 0x39, 0xf7, 0xde, 0x49, - 0x66, 0x4f, 0x86, 0xce, 0x11, 0x8f, 0x20, 0xdd, 0x2a, 0x23, 0xc8, 0xde, 0x93, 0x46, 0xb5, 0x7b, - 0xf2, 0x47, 0x40, 0xaf, 0x71, 0x7a, 0x65, 0x3f, 0x70, 0xc5, 0xa8, 0x22, 0xd4, 0xf4, 0x46, 0xb3, - 0xa0, 0x35, 0x09, 0xb0, 0x17, 0xc6, 0x0b, 0x59, 0x36, 0x35, 0x75, 0xf6, 0x60, 0x5d, 0xb3, 0x2e, - 0xe3, 0x4c, 0xf2, 0xa1, 0x97, 0xd2, 0x7a, 0x32, 0x1c, 0xfc, 0xd3, 0x86, 0x55, 0x75, 0xc7, 0x8a, - 0xf7, 0x12, 0xf2, 0x61, 0x25, 0xfb, 0x98, 0x40, 0x4f, 0xcb, 0x9f, 0x53, 0xb9, 0x37, 0xa1, 0xfd, - 0xac, 0x8a, 0xaa, 0x88, 0xc5, 0x59, 0xfa, 0xcc, 0x40, 0x14, 0xba, 0xf9, 0x3b, 0x1e, 0x3d, 0x2f, - 0xb6, 0x51, 0xf2, 0xa8, 0xb0, 0xfb, 0x55, 0xd5, 0x95, 0x5b, 0x74, 0xcd, 0xab, 0xaf, 0x5f, 0xcc, - 0xe8, 0x41, 0x33, 0xfa, 0x5b, 0xc0, 0xde, 0xaf, 0xac, 0x9f, 0xfa, 0xfd, 0x19, 0x9e, 0x68, 0xb7, - 0x12, 0x2a, 0x41, 0xab, 0xe8, 0x9a, 0xb7, 0x3f, 0xa9, 0xa4, 0x9b, 0xfa, 0x9a, 0xc3, 0xaa, 0x4e, - 0x37, 0xa8, 0xc4, 0x40, 0x21, 0x7f, 0xdb, 0x9f, 0x56, 0x53, 0x4e, 0xdd, 0x51, 0xe8, 0xe6, 0xd9, - 0xa0, 0xac, 0x8e, 0x25, 0xcc, 0x55, 0x56, 0xc7, 0x32, 0x92, 0x71, 0x96, 0x90, 0x07, 0x70, 0x4b, - 0x06, 0x68, 0xaf, 0xb4, 0x20, 0x3a, 0x87, 0xd8, 0xbd, 0x87, 0x15, 0x53, 0x17, 0x0b, 0xf8, 0x5f, - 0xee, 0xb6, 0x44, 0x25, 0xd0, 0x14, 0x3f, 0x12, 0xec, 0xe7, 0x15, 0xb5, 0x73, 0x49, 0x49, 0x7e, - 0xb9, 0x27, 0x29, 0x9d, 0xbc, 0xee, 0x49, 0x2a, 0x47, 0x55, 0xce, 0x12, 0xf2, 0x61, 0xd5, 0x8d, - 0x43, 0xe9, 0x3a, 0x61, 0x09, 0x54, 0xb2, 0xfb, 0x2e, 0x3f, 0xd9, 0x4f, 0x2b, 0x68, 0xde, 0x9e, - 0xef, 0x17, 0xf0, 0x43, 0x5b, 0xa9, 0x5e, 0x34, 0xf9, 0xdf, 0xc9, 0x2f, 0xfe, 0x0d, 0x00, 0x00, - 0xff, 0xff, 0xf9, 0x32, 0x44, 0xf7, 0x1f, 0x0f, 0x00, 0x00, + // 1236 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xae, 0xe3, 0xfc, 0x9e, 0x76, 0x4b, 0x3a, 0xdb, 0x6d, 0x5d, 0x6b, 0x41, 0xc5, 0x08, 0x9a, + 0x5d, 0xd8, 0x94, 0x0d, 0x37, 0x20, 0x21, 0xa4, 0x6e, 0x37, 0x6a, 0x0b, 0xa5, 0x2b, 0x39, 0xdb, + 0x45, 0x42, 0x88, 0xc8, 0x4d, 0x26, 0xad, 0x59, 0xc7, 0x0e, 0x9e, 0x71, 0xd9, 0x70, 0xc9, 0x1d, + 0x4f, 0xc0, 0x33, 0xc0, 0x53, 0xf0, 0x04, 0xdc, 0xf0, 0x42, 0xc8, 0xf3, 0xe3, 0x7a, 0x1c, 0x3b, + 0x35, 0xe5, 0x86, 0x9b, 0x64, 0x66, 0xce, 0x99, 0xf3, 0xf3, 0x9d, 0x93, 0x6f, 0x8e, 0x02, 0xe6, + 0x95, 0x33, 0x73, 0xf7, 0x09, 0x0e, 0xaf, 0xdd, 0x11, 0x26, 0xfb, 0xd4, 0xf5, 0x3c, 0x1c, 0x76, + 0x67, 0x61, 0x40, 0x03, 0xb4, 0x19, 0xcb, 0xba, 0x52, 0xd6, 0xe5, 0x32, 0x73, 0x8b, 0xdd, 0x18, + 0x5d, 0x39, 0x21, 0xe5, 0x9f, 0x5c, 0xdb, 0xdc, 0x4e, 0x9f, 0x07, 0xfe, 0xc4, 0xbd, 0x14, 0x02, + 0xee, 0x22, 0xc4, 0x1e, 0x76, 0x08, 0x96, 0xdf, 0xca, 0x25, 0x29, 0x73, 0xfd, 0x49, 0x20, 0x04, + 0x3b, 0x8a, 0x80, 0x50, 0x87, 0x46, 0x44, 0xb1, 0x77, 0x8d, 0x43, 0xe2, 0x06, 0xbe, 0xfc, 0xe6, + 0x32, 0xeb, 0xcf, 0x0a, 0xdc, 0x3f, 0x75, 0x09, 0xb5, 0xf9, 0x45, 0x62, 0xe3, 0x1f, 0x23, 0x4c, + 0x28, 0xda, 0x84, 0x9a, 0xe7, 0x4e, 0x5d, 0x6a, 0x68, 0xbb, 0x5a, 0x47, 0xb7, 0xf9, 0x06, 0x6d, + 0x41, 0x3d, 0x98, 0x4c, 0x08, 0xa6, 0x46, 0x65, 0x57, 0xeb, 0xb4, 0x6c, 0xb1, 0x43, 0x5f, 0x40, + 0x83, 0x04, 0x21, 0x1d, 0x5e, 0xcc, 0x0d, 0x7d, 0x57, 0xeb, 0xac, 0xf7, 0xde, 0xef, 0xe6, 0x41, + 0xd1, 0x8d, 0x3d, 0x0d, 0x82, 0x90, 0x76, 0xe3, 0x8f, 0x67, 0x73, 0xbb, 0x4e, 0xd8, 0x77, 0x6c, + 0x77, 0xe2, 0x7a, 0x14, 0x87, 0x46, 0x95, 0xdb, 0xe5, 0x3b, 0x74, 0x04, 0xc0, 0xec, 0x06, 0xe1, + 0x18, 0x87, 0x46, 0x8d, 0x99, 0xee, 0x94, 0x30, 0xfd, 0x22, 0xd6, 0xb7, 0x5b, 0x44, 0x2e, 0xd1, + 0xe7, 0xb0, 0xc6, 0x21, 0x19, 0x8e, 0x82, 0x31, 0x26, 0x46, 0x7d, 0x57, 0xef, 0xac, 0xf7, 0x76, + 0xb8, 0x29, 0x89, 0xf0, 0x80, 0x83, 0x76, 0x18, 0x8c, 0xb1, 0xbd, 0xca, 0xd5, 0xe3, 0x35, 0x41, + 0x0f, 0xa1, 0xe5, 0x3b, 0x53, 0x4c, 0x66, 0xce, 0x08, 0x1b, 0x0d, 0x16, 0xe1, 0xcd, 0x81, 0xf5, + 0x3d, 0x34, 0xa5, 0x73, 0xab, 0x07, 0x75, 0x9e, 0x1a, 0x5a, 0x85, 0xc6, 0xf9, 0xd9, 0x57, 0x67, + 0x2f, 0xbe, 0x39, 0x6b, 0xaf, 0xa0, 0x26, 0x54, 0xcf, 0x0e, 0xbe, 0xee, 0xb7, 0x35, 0xb4, 0x01, + 0xf7, 0x4e, 0x0f, 0x06, 0x2f, 0x87, 0x76, 0xff, 0xb4, 0x7f, 0x30, 0xe8, 0x3f, 0x6f, 0x57, 0xac, + 0x77, 0xa0, 0x95, 0xc4, 0x8c, 0x1a, 0xa0, 0x1f, 0x0c, 0x0e, 0xf9, 0x95, 0xe7, 0xfd, 0xc1, 0x61, + 0x5b, 0xb3, 0x7e, 0xd5, 0x60, 0x53, 0x2d, 0x11, 0x99, 0x05, 0x3e, 0xc1, 0x71, 0x8d, 0x46, 0x41, + 0xe4, 0x27, 0x35, 0x62, 0x1b, 0x84, 0xa0, 0xea, 0xe3, 0x37, 0xb2, 0x42, 0x6c, 0x1d, 0x6b, 0xd2, + 0x80, 0x3a, 0x1e, 0xab, 0x8e, 0x6e, 0xf3, 0x0d, 0x7a, 0x0a, 0x4d, 0x91, 0x3a, 0x31, 0xaa, 0xbb, + 0x7a, 0x67, 0xb5, 0xf7, 0x40, 0x05, 0x44, 0x78, 0xb4, 0x13, 0x35, 0xeb, 0xb7, 0x0a, 0x18, 0x83, + 0x68, 0x3a, 0x75, 0x42, 0xf7, 0x67, 0x9c, 0xed, 0x99, 0x54, 0x17, 0x68, 0xff, 0xad, 0x0b, 0x2a, + 0x4b, 0xba, 0x40, 0xff, 0x5f, 0x74, 0x41, 0x35, 0xdb, 0x05, 0xe7, 0xb0, 0x93, 0x03, 0x8c, 0xa8, + 0xd4, 0xa7, 0x29, 0xa4, 0x35, 0x86, 0xf4, 0xc3, 0x5c, 0xa4, 0xb9, 0x85, 0x79, 0x0a, 0xf0, 0x23, + 0xd8, 0x3e, 0xc2, 0xb2, 0xf4, 0x3c, 0x34, 0x09, 0x77, 0x5c, 0x68, 0x67, 0x8a, 0x19, 0xd6, 0x71, + 0xa1, 0x9d, 0x29, 0x46, 0x06, 0x34, 0xc4, 0xef, 0x9b, 0x61, 0x58, 0xb3, 0xe5, 0xd6, 0xa2, 0x60, + 0x2c, 0x1a, 0x12, 0xe1, 0xe5, 0x59, 0xfa, 0x00, 0xaa, 0x31, 0xbb, 0x30, 0x33, 0xab, 0x3d, 0xa4, + 0x86, 0x7b, 0xe2, 0x4f, 0x02, 0x9b, 0xc9, 0x55, 0x54, 0xf4, 0x2c, 0x2a, 0xc7, 0x69, 0xaf, 0x87, + 0x81, 0x4f, 0xb1, 0x4f, 0xef, 0x16, 0xff, 0x29, 0xec, 0xe4, 0x58, 0x12, 0x09, 0xec, 0x43, 0x43, + 0x84, 0xc6, 0xac, 0x15, 0x36, 0xb2, 0xd4, 0xb2, 0xfe, 0xa8, 0xc0, 0xe6, 0xf9, 0x6c, 0xec, 0x50, + 0x59, 0xab, 0x65, 0x41, 0xed, 0x41, 0x8d, 0xb1, 0xb4, 0xc0, 0x62, 0x83, 0xdb, 0xe6, 0x54, 0x7e, + 0x18, 0x7f, 0xda, 0x5c, 0x8e, 0x1e, 0x43, 0xfd, 0xda, 0xf1, 0x22, 0x4c, 0x18, 0x10, 0x09, 0x6a, + 0x42, 0x93, 0x51, 0xbc, 0x2d, 0x34, 0xd0, 0x36, 0x34, 0xc6, 0xe1, 0x7c, 0x18, 0x46, 0x3e, 0xeb, + 0xa5, 0xa6, 0x5d, 0x1f, 0x87, 0x73, 0x3b, 0xf2, 0xd1, 0x7b, 0x70, 0x6f, 0xec, 0x12, 0xe7, 0xc2, + 0xc3, 0xc3, 0xab, 0x20, 0x78, 0x4d, 0x18, 0xed, 0x35, 0xed, 0x35, 0x71, 0x78, 0x1c, 0x9f, 0x21, + 0x33, 0x6e, 0xa8, 0x51, 0x88, 0x1d, 0x8a, 0x8d, 0x3a, 0x93, 0x27, 0xfb, 0x18, 0x43, 0xea, 0x4e, + 0x71, 0x10, 0x51, 0xc6, 0x55, 0xba, 0x2d, 0xb7, 0xe8, 0x5d, 0x58, 0x0b, 0x31, 0xc1, 0x74, 0x28, + 0xa2, 0x6c, 0xb2, 0x9b, 0xab, 0xec, 0xec, 0x15, 0x0f, 0x0b, 0x41, 0xf5, 0x27, 0xc7, 0xa5, 0x46, + 0x8b, 0x89, 0xd8, 0xda, 0x3a, 0x86, 0x07, 0x19, 0xac, 0xee, 0x0a, 0xfb, 0x5f, 0x1a, 0x6c, 0xd9, + 0x81, 0xe7, 0x5d, 0x38, 0xa3, 0xd7, 0x25, 0x80, 0x4f, 0x61, 0x54, 0x59, 0x8e, 0x91, 0x9e, 0x83, + 0x51, 0xaa, 0x97, 0xaa, 0x4a, 0x2f, 0x29, 0xe8, 0xd5, 0x8a, 0xd1, 0xab, 0xab, 0xe8, 0x49, 0x68, + 0x1a, 0x29, 0x68, 0xbe, 0x84, 0xed, 0x85, 0x7c, 0xee, 0x0a, 0xce, 0xef, 0x15, 0x78, 0x70, 0xe2, + 0x13, 0xea, 0x78, 0x5e, 0x06, 0x9b, 0xa4, 0x01, 0xb5, 0xd2, 0x0d, 0x58, 0xf9, 0x37, 0x0d, 0xa8, + 0x2b, 0xe0, 0xca, 0x4a, 0x54, 0x53, 0x95, 0x28, 0xd5, 0x94, 0x0a, 0x15, 0xd4, 0x33, 0x54, 0x80, + 0xde, 0x06, 0x08, 0x71, 0x44, 0xf0, 0x90, 0x19, 0xe7, 0x20, 0xb6, 0xd8, 0xc9, 0x99, 0xf8, 0xe5, + 0x4b, 0xdc, 0x9b, 0xf9, 0xb8, 0xa7, 0x5b, 0xf2, 0x04, 0xb6, 0xb2, 0x50, 0xdd, 0x15, 0xf6, 0x5f, + 0x34, 0xd8, 0x3e, 0xf7, 0xdd, 0x5c, 0xe0, 0xf3, 0x9a, 0x72, 0x01, 0x8a, 0x4a, 0x0e, 0x14, 0x9b, + 0x50, 0x9b, 0x45, 0xe1, 0x25, 0x16, 0xd0, 0xf2, 0x4d, 0x3a, 0xc7, 0xaa, 0x92, 0xa3, 0x35, 0x04, + 0x63, 0x31, 0x86, 0x3b, 0x66, 0x14, 0x47, 0x9d, 0x50, 0x77, 0x8b, 0xd3, 0xb4, 0x75, 0x1f, 0x36, + 0x8e, 0x30, 0x7d, 0xc5, 0x7f, 0x00, 0x22, 0x3d, 0xab, 0x0f, 0x28, 0x7d, 0x78, 0xe3, 0x4f, 0x1c, + 0xa9, 0xfe, 0xe4, 0xe0, 0x28, 0xf5, 0xa5, 0x96, 0xf5, 0x19, 0xb3, 0x7d, 0xec, 0x12, 0x1a, 0x84, + 0xf3, 0x65, 0xd0, 0xb5, 0x41, 0x9f, 0x3a, 0x6f, 0x04, 0xb3, 0xc7, 0x4b, 0xeb, 0x88, 0x45, 0x90, + 0x5c, 0x15, 0x11, 0x3c, 0x5d, 0x78, 0x2e, 0x6f, 0x1d, 0x4c, 0xbe, 0x03, 0xf4, 0x12, 0x27, 0x33, + 0xd2, 0x2d, 0x4f, 0x8c, 0x2c, 0x42, 0x45, 0x6d, 0x34, 0x03, 0x1a, 0x23, 0x0f, 0x3b, 0x7e, 0x34, + 0x13, 0x65, 0x93, 0x5b, 0x6b, 0x0f, 0xee, 0x2b, 0xd6, 0x45, 0x9c, 0x71, 0x3e, 0xe4, 0x52, 0x58, + 0x8f, 0x97, 0xbd, 0xbf, 0x5b, 0xb0, 0x2e, 0xdf, 0x58, 0x3e, 0x9a, 0x20, 0x17, 0xd6, 0xd2, 0xd3, + 0x1b, 0x7a, 0x54, 0x3c, 0xb9, 0x64, 0x06, 0x2a, 0xf3, 0x71, 0x19, 0x55, 0x1e, 0x8b, 0xb5, 0xf2, + 0xb1, 0x86, 0xae, 0x61, 0x63, 0x61, 0x06, 0x41, 0xdd, 0x7c, 0x23, 0x45, 0x53, 0x9c, 0xb9, 0x5f, + 0x5a, 0x5f, 0x7a, 0x46, 0x04, 0xda, 0xd9, 0xd9, 0x02, 0x3d, 0xc9, 0x37, 0x53, 0x30, 0xcc, 0x98, + 0xdd, 0xb2, 0xea, 0x89, 0xd3, 0x6b, 0xd6, 0x75, 0xea, 0x40, 0x80, 0x6e, 0x35, 0xa3, 0xce, 0x20, + 0x45, 0xc9, 0x16, 0x4e, 0x1a, 0xd6, 0x0a, 0xfa, 0x01, 0xee, 0x29, 0xaf, 0x21, 0x2a, 0xa8, 0x52, + 0xde, 0x78, 0x61, 0x7e, 0x58, 0x4a, 0x37, 0xf1, 0x35, 0x85, 0x75, 0x95, 0xe6, 0x50, 0x81, 0x81, + 0xdc, 0x77, 0xc3, 0xfc, 0xa8, 0x9c, 0x72, 0xba, 0x8e, 0x59, 0x16, 0x2a, 0xaa, 0x63, 0x01, 0x63, + 0x16, 0xd5, 0xb1, 0x88, 0xdc, 0xac, 0x15, 0xe4, 0x00, 0xdc, 0x90, 0x10, 0xda, 0x2b, 0x2c, 0x88, + 0xca, 0x5d, 0x66, 0xe7, 0x76, 0xc5, 0xc4, 0xc5, 0x0c, 0xde, 0xca, 0xbc, 0xd2, 0xa8, 0x00, 0x9a, + 0xfc, 0xe1, 0xc4, 0x7c, 0x52, 0x52, 0x3b, 0x93, 0x94, 0xe0, 0xb5, 0x25, 0x49, 0xa9, 0xa4, 0xb9, + 0x24, 0xa9, 0x0c, 0x45, 0x5a, 0x2b, 0xc8, 0x85, 0x75, 0x3b, 0xf2, 0x85, 0xeb, 0x98, 0x9d, 0x50, + 0xc1, 0xed, 0x45, 0x5e, 0x34, 0x1f, 0x95, 0xd0, 0xbc, 0xe1, 0x95, 0x67, 0xf0, 0x6d, 0x53, 0xaa, + 0x5e, 0xd4, 0xd9, 0xff, 0x06, 0x9f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x36, 0x74, 0x25, 0x9d, + 0x08, 0x11, 0x00, 0x00, } diff --git a/pkg/proto/hapi/version/version.pb.go b/pkg/proto/hapi/version/version.pb.go index 79771408e..e3d8a7096 100644 --- a/pkg/proto/hapi/version/version.pb.go +++ b/pkg/proto/hapi/version/version.pb.go @@ -40,6 +40,27 @@ func (m *Version) String() string { return proto.CompactTextString(m) func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *Version) GetSemVer() string { + if m != nil { + return m.SemVer + } + return "" +} + +func (m *Version) GetGitCommit() string { + if m != nil { + return m.GitCommit + } + return "" +} + +func (m *Version) GetGitTreeState() string { + if m != nil { + return m.GitTreeState + } + return "" +} + func init() { proto.RegisterType((*Version)(nil), "hapi.version.Version") } @@ -48,7 +69,7 @@ func init() { proto.RegisterFile("hapi/version/version.proto", fileDescriptor0) var fileDescriptor0 = []byte{ // 151 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x48, 0x2c, 0xc8, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x48, 0x2c, 0xc8, 0xd4, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x20, 0x39, 0x3d, 0xa8, 0x98, 0x52, 0x3a, 0x17, 0x7b, 0x18, 0x84, 0x29, 0x24, 0xce, 0xc5, 0x5e, 0x9c, 0x9a, 0x1b, 0x5f, 0x96, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index 873d2335a..ba75b9962 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -95,57 +95,22 @@ func NewReleaseServer(env *environment.Environment, clientset internalclientset. } } +type ListRequest interface { + GetSortBy() services.ListSort_SortBy + GetFilter() string + GetSortOrder() services.ListSort_SortOrder + GetStatusCodes() []release.Status_Code + GetNamespace() string +} + // ListReleases lists the releases found by the server. func (s *ReleaseServer) ListReleases(req *services.ListReleasesRequest, stream services.ReleaseService_ListReleasesServer) error { - if len(req.StatusCodes) == 0 { - req.StatusCodes = []release.Status_Code{release.Status_DEPLOYED} - } - - //rels, err := s.env.Releases.ListDeployed() - rels, err := s.env.Releases.ListFilterAll(func(r *release.Release) bool { - for _, sc := range req.StatusCodes { - if sc == r.Info.Status.Code { - return true - } - } - return false - }) + rels, err := s.listReleases(req) if err != nil { return err } - if req.Namespace != "" { - rels, err = filterByNamespace(req.Namespace, rels) - if err != nil { - return err - } - } - - if len(req.Filter) != 0 { - rels, err = filterReleases(req.Filter, rels) - if err != nil { - return err - } - } - total := int64(len(rels)) - - switch req.SortBy { - case services.ListSort_NAME: - relutil.SortByName(rels) - case services.ListSort_LAST_RELEASED: - relutil.SortByDate(rels) - } - - if req.SortOrder == services.ListSort_DESC { - ll := len(rels) - rr := make([]*release.Release, ll) - for i, item := range rels { - rr[ll-i-1] = item - } - rels = rr - } - l := int64(len(rels)) if req.Offset != "" { @@ -187,6 +152,84 @@ func (s *ReleaseServer) ListReleases(req *services.ListReleasesRequest, stream s return stream.Send(res) } +// func (s *ReleaseServer) GetVersion(c ctx.Context, req *services.GetVersionRequest) (*services.GetVersionResponse, error) { + +// ListReleases lists the releases found by the server. +func (s *ReleaseServer) SummarizeReleases(c ctx.Context, req *services.SummarizeReleasesRequest) (*services.SummarizeReleasesResponse, error) { + rels, err := s.listReleases(req) + if err != nil { + return nil, err + } + + summaries := make([]*release.ReleaseSummary, len(rels)) + for i, rel := range rels { + s := &release.ReleaseSummary{ + Name: rel.Name, + Info: rel.Info, + ChartMetadata: rel.Chart.Metadata, + Config: rel.Config, + Version: rel.Version, + Namespace: rel.Namespace, + } + summaries[i] = s + } + + res := &services.SummarizeReleasesResponse{ + Releases: summaries, + } + return res, nil +} + +func (s *ReleaseServer) listReleases(req ListRequest) ([]*release.Release, error) { + statusCodes := req.GetStatusCodes() + if len(statusCodes) == 0 { + statusCodes = []release.Status_Code{release.Status_DEPLOYED} + } + + //rels, err := s.env.Releases.ListDeployed() + rels, err := s.env.Releases.ListFilterAll(func(r *release.Release) bool { + for _, sc := range statusCodes { + if sc == r.Info.Status.Code { + return true + } + } + return false + }) + if err != nil { + return nil, err + } + + if req.GetNamespace() != "" { + rels, err = filterByNamespace(req.GetNamespace(), rels) + if err != nil { + return nil, err + } + } + + if len(req.GetFilter()) != 0 { + rels, err = filterReleases(req.GetFilter(), rels) + if err != nil { + return nil, err + } + } + switch req.GetSortBy() { + case services.ListSort_NAME: + relutil.SortByName(rels) + case services.ListSort_LAST_RELEASED: + relutil.SortByDate(rels) + } + + if req.GetSortOrder() == services.ListSort_DESC { + ll := len(rels) + rr := make([]*release.Release, ll) + for i, item := range rels { + rr[ll-i-1] = item + } + rels = rr + } + return rels, nil +} + func filterByNamespace(namespace string, rels []*release.Release) ([]*release.Release, error) { matches := []*release.Release{} for _, r := range rels {