From b18f7f75238d2778d18efd7ca61e4d96ef6619de Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Mon, 19 Dec 2016 11:16:38 -0800 Subject: [PATCH] fix(*): Fixes protobuf name The generated version of the protobuf did not match the `.proto` file. This caused issues when a new protobuf change was added --- pkg/helm/client.go | 2 +- pkg/proto/hapi/services/tiller.pb.go | 137 ++++++++++++++------------- pkg/tiller/release_server.go | 4 +- 3 files changed, 72 insertions(+), 71 deletions(-) diff --git a/pkg/helm/client.go b/pkg/helm/client.go index eef5c13e9..91e666362 100644 --- a/pkg/helm/client.go +++ b/pkg/helm/client.go @@ -133,7 +133,7 @@ func (h *Client) UpdateRelease(rlsName string, chstr string, opts ...UpdateOptio req.DryRun = h.opts.dryRun req.Name = rlsName req.DisableHooks = h.opts.disableHooks - req.Restart = h.opts.recreate + req.Recreate = h.opts.recreate ctx := NewContext() if h.opts.before != nil { diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go index af85058c0..5ba233292 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -247,7 +247,7 @@ type UpdateReleaseRequest struct { // DisableHooks causes the server to skip running any hooks for the upgrade. DisableHooks bool `protobuf:"varint,5,opt,name=disable_hooks,json=disableHooks" json:"disable_hooks,omitempty"` // Performs pods restart for resources if applicable - Restart bool `protobuf:"varint,6,opt,name=restart,json=restart" json:"restart,omitempty"` + Recreate bool `protobuf:"varint,6,opt,name=recreate" json:"recreate,omitempty"` } func (m *UpdateReleaseRequest) Reset() { *m = UpdateReleaseRequest{} } @@ -296,7 +296,7 @@ type RollbackReleaseRequest struct { // Version is the version of the release to deploy. Version int32 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"` // Performs pods restart for resources if applicable - Restart bool `protobuf:"varint,5,opt,name=restart,json=restart" json:"restart,omitempty"` + Recreate bool `protobuf:"varint,5,opt,name=recreate" json:"recreate,omitempty"` } func (m *RollbackReleaseRequest) Reset() { *m = RollbackReleaseRequest{} } @@ -424,7 +424,7 @@ func (*GetVersionRequest) ProtoMessage() {} func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } type GetVersionResponse struct { - Version *hapi_version.Version `protobuf:"bytes,1,opt,name=Version,json=version" json:"Version,omitempty"` + Version *hapi_version.Version `protobuf:"bytes,1,opt,name=Version" json:"Version,omitempty"` } func (m *GetVersionResponse) Reset() { *m = GetVersionResponse{} } @@ -884,69 +884,70 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1010 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0x5f, 0x6f, 0xe3, 0x44, - 0x10, 0xaf, 0x93, 0x34, 0x7f, 0xa6, 0x7f, 0x48, 0xf7, 0xd2, 0xc6, 0xb5, 0x00, 0x45, 0x46, 0x70, - 0xe1, 0xe0, 0x52, 0x08, 0x4f, 0x48, 0x08, 0xa9, 0x97, 0x8b, 0xd2, 0x42, 0xc9, 0x49, 0x1b, 0x0a, - 0x12, 0x0f, 0x44, 0x6e, 0xb2, 0xb9, 0x9a, 0x73, 0xbc, 0xc1, 0xbb, 0xa9, 0x2e, 0xef, 0xbc, 0xf0, - 0x35, 0xf8, 0x1e, 0x7c, 0x27, 0xde, 0x79, 0x41, 0xde, 0x3f, 0x6e, 0xec, 0xd8, 0x39, 0x93, 0x17, - 0xdb, 0xbb, 0x33, 0x3b, 0xf3, 0x9b, 0xdf, 0xec, 0xcc, 0x24, 0x60, 0xdd, 0x3b, 0x0b, 0xf7, 0x82, - 0x91, 0xe0, 0xc1, 0x9d, 0x10, 0x76, 0xc1, 0x5d, 0xcf, 0x23, 0x41, 0x67, 0x11, 0x50, 0x4e, 0x51, - 0x23, 0x94, 0x75, 0xb4, 0xac, 0x23, 0x65, 0xd6, 0x99, 0x38, 0x31, 0xb9, 0x77, 0x02, 0x2e, 0x9f, - 0x52, 0xdb, 0x6a, 0xae, 0xef, 0x53, 0x7f, 0xe6, 0xbe, 0x56, 0x02, 0xe9, 0x22, 0x20, 0x1e, 0x71, - 0x18, 0xd1, 0xef, 0xd8, 0x21, 0x2d, 0x73, 0xfd, 0x19, 0x55, 0x82, 0xf3, 0x98, 0x80, 0x71, 0x87, - 0x2f, 0x59, 0xcc, 0xde, 0x03, 0x09, 0x98, 0x4b, 0x7d, 0xfd, 0x96, 0x32, 0xfb, 0xaf, 0x02, 0x3c, - 0xb9, 0x71, 0x19, 0xc7, 0xf2, 0x20, 0xc3, 0xe4, 0xf7, 0x25, 0x61, 0x1c, 0x35, 0x60, 0xdf, 0x73, - 0xe7, 0x2e, 0x37, 0x8d, 0x96, 0xd1, 0x2e, 0x62, 0xb9, 0x40, 0x67, 0x50, 0xa6, 0xb3, 0x19, 0x23, - 0xdc, 0x2c, 0xb4, 0x8c, 0x76, 0x0d, 0xab, 0x15, 0xfa, 0x16, 0x2a, 0x8c, 0x06, 0x7c, 0x7c, 0xb7, - 0x32, 0x8b, 0x2d, 0xa3, 0x7d, 0xdc, 0xfd, 0xb8, 0x93, 0x46, 0x45, 0x27, 0xf4, 0x34, 0xa2, 0x01, - 0xef, 0x84, 0x8f, 0x17, 0x2b, 0x5c, 0x66, 0xe2, 0x1d, 0xda, 0x9d, 0xb9, 0x1e, 0x27, 0x81, 0x59, - 0x92, 0x76, 0xe5, 0x0a, 0x0d, 0x00, 0x84, 0x5d, 0x1a, 0x4c, 0x49, 0x60, 0xee, 0x0b, 0xd3, 0xed, - 0x1c, 0xa6, 0x5f, 0x85, 0xfa, 0xb8, 0xc6, 0xf4, 0x27, 0xfa, 0x06, 0x0e, 0x25, 0x25, 0xe3, 0x09, - 0x9d, 0x12, 0x66, 0x96, 0x5b, 0xc5, 0xf6, 0x71, 0xf7, 0x5c, 0x9a, 0xd2, 0x0c, 0x8f, 0x24, 0x69, - 0x3d, 0x3a, 0x25, 0xf8, 0x40, 0xaa, 0x87, 0xdf, 0xcc, 0xfe, 0x15, 0xaa, 0xda, 0xbc, 0xdd, 0x85, - 0xb2, 0x04, 0x8f, 0x0e, 0xa0, 0x72, 0x3b, 0xfc, 0x7e, 0xf8, 0xea, 0xe7, 0x61, 0x7d, 0x0f, 0x55, - 0xa1, 0x34, 0xbc, 0xfc, 0xa1, 0x5f, 0x37, 0xd0, 0x09, 0x1c, 0xdd, 0x5c, 0x8e, 0x7e, 0x1c, 0xe3, - 0xfe, 0x4d, 0xff, 0x72, 0xd4, 0x7f, 0x59, 0x2f, 0xd8, 0x1f, 0x42, 0x2d, 0x42, 0x85, 0x2a, 0x50, - 0xbc, 0x1c, 0xf5, 0xe4, 0x91, 0x97, 0xfd, 0x51, 0xaf, 0x6e, 0xd8, 0x7f, 0x1a, 0xd0, 0x88, 0x27, - 0x81, 0x2d, 0xa8, 0xcf, 0x48, 0x98, 0x85, 0x09, 0x5d, 0xfa, 0x51, 0x16, 0xc4, 0x02, 0x21, 0x28, - 0xf9, 0xe4, 0xad, 0xce, 0x81, 0xf8, 0x0e, 0x35, 0x39, 0xe5, 0x8e, 0x27, 0xf8, 0x2f, 0x62, 0xb9, - 0x40, 0x5f, 0x42, 0x55, 0x05, 0xc7, 0xcc, 0x52, 0xab, 0xd8, 0x3e, 0xe8, 0x9e, 0xc6, 0x43, 0x56, - 0x1e, 0x71, 0xa4, 0x66, 0x0f, 0xa0, 0x39, 0x20, 0x1a, 0x89, 0x64, 0x44, 0xdf, 0x89, 0xd0, 0xaf, - 0x33, 0x27, 0x02, 0x4c, 0xe8, 0xd7, 0x99, 0x13, 0x64, 0x42, 0x45, 0x5d, 0x28, 0x01, 0x67, 0x1f, - 0xeb, 0xa5, 0xcd, 0xc1, 0xdc, 0x34, 0xa4, 0xe2, 0x4a, 0xb3, 0xf4, 0x09, 0x94, 0xc2, 0xeb, 0x2c, - 0xcc, 0x1c, 0x74, 0x51, 0x1c, 0xe7, 0xb5, 0x3f, 0xa3, 0x58, 0xc8, 0xd1, 0xfb, 0x50, 0x0b, 0xf5, - 0xd9, 0xc2, 0x99, 0x10, 0x11, 0x6d, 0x0d, 0x3f, 0x6e, 0xd8, 0x57, 0xeb, 0x5e, 0x7b, 0xd4, 0xe7, - 0xc4, 0xe7, 0xbb, 0xe1, 0xbf, 0x81, 0xf3, 0x14, 0x4b, 0x2a, 0x80, 0x0b, 0xa8, 0x28, 0x68, 0xc2, - 0x5a, 0x26, 0xaf, 0x5a, 0xcb, 0xfe, 0xdb, 0x80, 0xc6, 0xed, 0x62, 0xea, 0x70, 0xa2, 0x45, 0x5b, - 0x40, 0x3d, 0x85, 0x7d, 0xd1, 0x16, 0x14, 0x17, 0x27, 0xd2, 0xb6, 0xec, 0x1d, 0xbd, 0xf0, 0x89, - 0xa5, 0x1c, 0x3d, 0x83, 0xf2, 0x83, 0xe3, 0x2d, 0x09, 0x13, 0x44, 0x44, 0xac, 0x29, 0x4d, 0xd1, - 0x53, 0xb0, 0xd2, 0x40, 0x4d, 0xa8, 0x4c, 0x83, 0xd5, 0x38, 0x58, 0xfa, 0xa2, 0xc8, 0xaa, 0xb8, - 0x3c, 0x0d, 0x56, 0x78, 0xe9, 0xa3, 0x8f, 0xe0, 0x68, 0xea, 0x32, 0xe7, 0xce, 0x23, 0xe3, 0x7b, - 0x4a, 0xdf, 0x30, 0x51, 0x67, 0x55, 0x7c, 0xa8, 0x36, 0xaf, 0xc2, 0x3d, 0xfb, 0x0a, 0x4e, 0x13, - 0xf0, 0x77, 0x65, 0xe2, 0x0f, 0x03, 0xce, 0x30, 0xf5, 0xbc, 0x3b, 0x67, 0xf2, 0x26, 0x07, 0x17, - 0x6b, 0xb0, 0x0b, 0xdb, 0x61, 0x17, 0x37, 0x61, 0xaf, 0xa7, 0xb7, 0x14, 0x4f, 0xef, 0x77, 0xd0, - 0xdc, 0x40, 0xb1, 0x6b, 0x48, 0xff, 0x1a, 0x70, 0x7a, 0xed, 0x33, 0xee, 0x78, 0x5e, 0x22, 0xa2, - 0x28, 0x93, 0x46, 0xee, 0x4c, 0x16, 0xfe, 0x4f, 0x26, 0x8b, 0x31, 0x4a, 0x34, 0x7f, 0xa5, 0x35, - 0xfe, 0xf2, 0x64, 0x37, 0x5e, 0x53, 0xe5, 0x44, 0x4d, 0xa1, 0x0f, 0x00, 0x02, 0xb2, 0x64, 0x64, - 0x2c, 0x8c, 0x57, 0xc4, 0xf9, 0x9a, 0xd8, 0x19, 0x3a, 0x73, 0x62, 0x5f, 0xc3, 0x59, 0x32, 0xf8, - 0x5d, 0x89, 0xbc, 0x87, 0xe6, 0xad, 0xef, 0xa6, 0x32, 0x99, 0x76, 0x37, 0x36, 0x62, 0x2b, 0xa4, - 0xc4, 0xd6, 0x80, 0xfd, 0xc5, 0x32, 0x78, 0x4d, 0x14, 0x57, 0x72, 0x61, 0x8f, 0xc1, 0xdc, 0xf4, - 0xb4, 0x23, 0xec, 0x10, 0x5b, 0xd4, 0xba, 0x6a, 0xb2, 0x4d, 0xd9, 0x4f, 0xe0, 0x64, 0x40, 0xf8, - 0x4f, 0xf2, 0xb6, 0xa9, 0x20, 0xec, 0x3e, 0xa0, 0xf5, 0xcd, 0x47, 0x7f, 0x6a, 0x2b, 0xee, 0x4f, - 0x4f, 0x6a, 0xad, 0x1f, 0xdd, 0xdd, 0xaf, 0x85, 0xed, 0x2b, 0x97, 0x71, 0x1a, 0xac, 0xb6, 0x11, - 0x54, 0x87, 0xe2, 0xdc, 0x79, 0xab, 0x3a, 0x5b, 0xf8, 0x69, 0x0f, 0x04, 0x82, 0xe8, 0xa8, 0x42, - 0xb0, 0x3e, 0x27, 0x8c, 0x5c, 0x73, 0xa2, 0xfb, 0x4f, 0x05, 0x8e, 0x75, 0x73, 0x97, 0xa3, 0x18, - 0xb9, 0x70, 0xb8, 0x3e, 0xc5, 0xd0, 0xa7, 0xd9, 0x93, 0x3a, 0xf1, 0x73, 0xc3, 0x7a, 0x96, 0x47, - 0x55, 0x82, 0xb5, 0xf7, 0xbe, 0x30, 0x10, 0x83, 0x7a, 0x72, 0xb8, 0xa0, 0xe7, 0xe9, 0x36, 0x32, - 0xa6, 0x99, 0xd5, 0xc9, 0xab, 0xae, 0xdd, 0xa2, 0x07, 0x41, 0x7b, 0x7c, 0x22, 0xa0, 0x77, 0x9a, - 0x89, 0x0f, 0x21, 0xeb, 0x22, 0xb7, 0x7e, 0xe4, 0xf7, 0x37, 0x38, 0x8a, 0xf5, 0x5e, 0x94, 0xc1, - 0x56, 0xda, 0x7c, 0xb1, 0x3e, 0xcb, 0xa5, 0x1b, 0xf9, 0x9a, 0xc3, 0x71, 0xbc, 0x98, 0x51, 0x86, - 0x81, 0xd4, 0x7e, 0x67, 0x7d, 0x9e, 0x4f, 0x39, 0x72, 0xc7, 0xa0, 0x9e, 0x2c, 0xc3, 0xac, 0x3c, - 0x66, 0x34, 0x86, 0xac, 0x3c, 0x66, 0x55, 0xb7, 0xbd, 0x87, 0x1c, 0x80, 0xc7, 0x2a, 0x44, 0x4f, - 0x33, 0x13, 0x12, 0x2f, 0x5e, 0xab, 0xfd, 0x6e, 0xc5, 0xc8, 0xc5, 0x02, 0xde, 0x4b, 0x4c, 0x17, - 0x94, 0x41, 0x4d, 0xfa, 0x28, 0xb4, 0x9e, 0xe7, 0xd4, 0x4e, 0x04, 0xa5, 0x0a, 0x7b, 0x4b, 0x50, - 0xf1, 0xae, 0xb1, 0x25, 0xa8, 0x44, 0x8f, 0xb0, 0xf7, 0x5e, 0xc0, 0x2f, 0x55, 0xad, 0x77, 0x57, - 0x16, 0x7f, 0x1f, 0xbe, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xd1, 0x0e, 0x5d, 0x0f, 0x0d, - 0x00, 0x00, + // 1027 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xae, 0xf3, 0x9f, 0xd3, 0x1f, 0xd2, 0xd9, 0xb4, 0x71, 0x2d, 0x40, 0x91, 0x11, 0x6c, 0x58, + 0xd8, 0x14, 0xc2, 0x15, 0x12, 0x42, 0xea, 0x66, 0xa3, 0xb4, 0x50, 0xb2, 0xd2, 0x84, 0x82, 0xc4, + 0x05, 0x91, 0x9b, 0x4c, 0xb6, 0x66, 0x1d, 0x4f, 0xf0, 0x4c, 0xaa, 0xcd, 0x23, 0xf0, 0x16, 0x88, + 0xb7, 0xe2, 0x2d, 0xb8, 0xe7, 0x06, 0x79, 0x7e, 0xdc, 0xd8, 0xb5, 0xb3, 0x26, 0x37, 0xb6, 0x67, + 0xce, 0x99, 0x73, 0xce, 0xf7, 0xcd, 0xf9, 0x49, 0xc0, 0xba, 0x73, 0x96, 0xee, 0x39, 0x23, 0xc1, + 0xbd, 0x3b, 0x25, 0xec, 0x9c, 0xbb, 0x9e, 0x47, 0x82, 0xee, 0x32, 0xa0, 0x9c, 0xa2, 0x66, 0x28, + 0xeb, 0x6a, 0x59, 0x57, 0xca, 0xac, 0x53, 0x71, 0x62, 0x7a, 0xe7, 0x04, 0x5c, 0x3e, 0xa5, 0xb6, + 0xd5, 0xda, 0xdc, 0xa7, 0xfe, 0xdc, 0x7d, 0xad, 0x04, 0xd2, 0x45, 0x40, 0x3c, 0xe2, 0x30, 0xa2, + 0xdf, 0xb1, 0x43, 0x5a, 0xe6, 0xfa, 0x73, 0xaa, 0x04, 0x67, 0x31, 0x01, 0xe3, 0x0e, 0x5f, 0xb1, + 0x98, 0xbd, 0x7b, 0x12, 0x30, 0x97, 0xfa, 0xfa, 0x2d, 0x65, 0xf6, 0x5f, 0x05, 0x78, 0x72, 0xed, + 0x32, 0x8e, 0xe5, 0x41, 0x86, 0xc9, 0xef, 0x2b, 0xc2, 0x38, 0x6a, 0x42, 0xd9, 0x73, 0x17, 0x2e, + 0x37, 0x8d, 0xb6, 0xd1, 0x29, 0x62, 0xb9, 0x40, 0xa7, 0x50, 0xa1, 0xf3, 0x39, 0x23, 0xdc, 0x2c, + 0xb4, 0x8d, 0x4e, 0x1d, 0xab, 0x15, 0xfa, 0x16, 0xaa, 0x8c, 0x06, 0x7c, 0x72, 0xbb, 0x36, 0x8b, + 0x6d, 0xa3, 0x73, 0xd4, 0xfb, 0xb8, 0x9b, 0x46, 0x45, 0x37, 0xf4, 0x34, 0xa6, 0x01, 0xef, 0x86, + 0x8f, 0x17, 0x6b, 0x5c, 0x61, 0xe2, 0x1d, 0xda, 0x9d, 0xbb, 0x1e, 0x27, 0x81, 0x59, 0x92, 0x76, + 0xe5, 0x0a, 0x0d, 0x01, 0x84, 0x5d, 0x1a, 0xcc, 0x48, 0x60, 0x96, 0x85, 0xe9, 0x4e, 0x0e, 0xd3, + 0xaf, 0x42, 0x7d, 0x5c, 0x67, 0xfa, 0x13, 0x7d, 0x03, 0x07, 0x92, 0x92, 0xc9, 0x94, 0xce, 0x08, + 0x33, 0x2b, 0xed, 0x62, 0xe7, 0xa8, 0x77, 0x26, 0x4d, 0x69, 0x86, 0xc7, 0x92, 0xb4, 0x3e, 0x9d, + 0x11, 0xbc, 0x2f, 0xd5, 0xc3, 0x6f, 0x66, 0xff, 0x0a, 0x35, 0x6d, 0xde, 0xee, 0x41, 0x45, 0x06, + 0x8f, 0xf6, 0xa1, 0x7a, 0x33, 0xfa, 0x7e, 0xf4, 0xea, 0xe7, 0x51, 0x63, 0x0f, 0xd5, 0xa0, 0x34, + 0xba, 0xf8, 0x61, 0xd0, 0x30, 0xd0, 0x31, 0x1c, 0x5e, 0x5f, 0x8c, 0x7f, 0x9c, 0xe0, 0xc1, 0xf5, + 0xe0, 0x62, 0x3c, 0x78, 0xd9, 0x28, 0xd8, 0x1f, 0x42, 0x3d, 0x8a, 0x0a, 0x55, 0xa1, 0x78, 0x31, + 0xee, 0xcb, 0x23, 0x2f, 0x07, 0xe3, 0x7e, 0xc3, 0xb0, 0xff, 0x30, 0xa0, 0x19, 0xbf, 0x04, 0xb6, + 0xa4, 0x3e, 0x23, 0xe1, 0x2d, 0x4c, 0xe9, 0xca, 0x8f, 0x6e, 0x41, 0x2c, 0x10, 0x82, 0x92, 0x4f, + 0xde, 0xea, 0x3b, 0x10, 0xdf, 0xa1, 0x26, 0xa7, 0xdc, 0xf1, 0x04, 0xff, 0x45, 0x2c, 0x17, 0xe8, + 0x4b, 0xa8, 0x29, 0x70, 0xcc, 0x2c, 0xb5, 0x8b, 0x9d, 0xfd, 0xde, 0x49, 0x1c, 0xb2, 0xf2, 0x88, + 0x23, 0x35, 0x7b, 0x08, 0xad, 0x21, 0xd1, 0x91, 0x48, 0x46, 0x74, 0x4e, 0x84, 0x7e, 0x9d, 0x05, + 0x11, 0xc1, 0x84, 0x7e, 0x9d, 0x05, 0x41, 0x26, 0x54, 0x55, 0x42, 0x89, 0x70, 0xca, 0x58, 0x2f, + 0x6d, 0x0e, 0xe6, 0x63, 0x43, 0x0a, 0x57, 0x9a, 0xa5, 0x4f, 0xa0, 0x14, 0xa6, 0xb3, 0x30, 0xb3, + 0xdf, 0x43, 0xf1, 0x38, 0xaf, 0xfc, 0x39, 0xc5, 0x42, 0x8e, 0xde, 0x87, 0x7a, 0xa8, 0xcf, 0x96, + 0xce, 0x94, 0x08, 0xb4, 0x75, 0xfc, 0xb0, 0x61, 0x5f, 0x6e, 0x7a, 0xed, 0x53, 0x9f, 0x13, 0x9f, + 0xef, 0x16, 0xff, 0x35, 0x9c, 0xa5, 0x58, 0x52, 0x00, 0xce, 0xa1, 0xaa, 0x42, 0x13, 0xd6, 0x32, + 0x79, 0xd5, 0x5a, 0xf6, 0xdf, 0x06, 0x34, 0x6f, 0x96, 0x33, 0x87, 0x13, 0x2d, 0xda, 0x12, 0xd4, + 0x53, 0x28, 0x8b, 0xb6, 0xa0, 0xb8, 0x38, 0x96, 0xb6, 0x65, 0xef, 0xe8, 0x87, 0x4f, 0x2c, 0xe5, + 0xe8, 0x19, 0x54, 0xee, 0x1d, 0x6f, 0x45, 0x98, 0x20, 0x22, 0x62, 0x4d, 0x69, 0x8a, 0x9e, 0x82, + 0x95, 0x06, 0x6a, 0x41, 0x75, 0x16, 0xac, 0x27, 0xc1, 0xca, 0x17, 0x45, 0x56, 0xc3, 0x95, 0x59, + 0xb0, 0xc6, 0x2b, 0x1f, 0x7d, 0x04, 0x87, 0x33, 0x97, 0x39, 0xb7, 0x1e, 0x99, 0xdc, 0x51, 0xfa, + 0x86, 0x89, 0x3a, 0xab, 0xe1, 0x03, 0xb5, 0x79, 0x19, 0xee, 0x21, 0x2b, 0xcc, 0xa4, 0x69, 0x40, + 0x1c, 0x4e, 0xcc, 0x8a, 0x90, 0x47, 0x6b, 0xfb, 0x12, 0x4e, 0x12, 0xd0, 0x76, 0x65, 0xe9, 0x4f, + 0x03, 0x4e, 0x31, 0xf5, 0xbc, 0x5b, 0x67, 0xfa, 0x26, 0x07, 0x4f, 0x1b, 0x90, 0x0a, 0xdb, 0x21, + 0x15, 0x53, 0x20, 0x6d, 0x5c, 0x7d, 0x29, 0x76, 0xf5, 0x31, 0xb0, 0xe5, 0x04, 0xd8, 0xef, 0xa0, + 0xf5, 0x28, 0xc2, 0x5d, 0xe1, 0xfe, 0x6b, 0xc0, 0xc9, 0x95, 0xcf, 0xb8, 0xe3, 0x79, 0x09, 0xb4, + 0x51, 0x06, 0x18, 0xb9, 0x33, 0xa0, 0xf0, 0x7f, 0x32, 0xa0, 0x18, 0xa3, 0x4b, 0x73, 0x5b, 0xda, + 0xe0, 0x36, 0x57, 0x56, 0xc4, 0x6a, 0xb1, 0x92, 0xa8, 0x45, 0xf4, 0x01, 0x40, 0x40, 0x56, 0x8c, + 0x4c, 0x84, 0xf1, 0xaa, 0x38, 0x5f, 0x17, 0x3b, 0x23, 0x67, 0x41, 0xec, 0x2b, 0x38, 0x4d, 0x82, + 0xdf, 0x95, 0xc8, 0x3b, 0x68, 0xdd, 0xf8, 0x6e, 0x2a, 0x93, 0x69, 0x79, 0xf3, 0x08, 0x5b, 0x21, + 0x05, 0x5b, 0x13, 0xca, 0xcb, 0x55, 0xf0, 0x9a, 0x28, 0xae, 0xe4, 0xc2, 0x9e, 0x80, 0xf9, 0xd8, + 0xd3, 0x8e, 0x61, 0x87, 0xb1, 0x45, 0x2d, 0xaf, 0x2e, 0xdb, 0x9b, 0xfd, 0x04, 0x8e, 0x87, 0x84, + 0xff, 0x24, 0x33, 0x51, 0x81, 0xb0, 0x07, 0x80, 0x36, 0x37, 0x1f, 0xfc, 0xa9, 0xad, 0xb8, 0x3f, + 0x3d, 0xe1, 0xb5, 0xbe, 0xd6, 0xb2, 0xbf, 0x16, 0xb6, 0x2f, 0x5d, 0xc6, 0x69, 0xb0, 0xde, 0x46, + 0x50, 0x03, 0x8a, 0x0b, 0xe7, 0xad, 0xea, 0x88, 0xe1, 0xa7, 0x3d, 0x14, 0x11, 0x44, 0x47, 0x55, + 0x04, 0x9b, 0xf3, 0xc5, 0xc8, 0x35, 0x5f, 0x7a, 0xff, 0x54, 0xe1, 0x48, 0x0f, 0x05, 0x39, 0xc2, + 0x91, 0x0b, 0x07, 0x9b, 0xd3, 0x0f, 0x7d, 0x9a, 0x3d, 0xe1, 0x13, 0x3f, 0x53, 0xac, 0x67, 0x79, + 0x54, 0x65, 0xb0, 0xf6, 0xde, 0x17, 0x06, 0x62, 0xd0, 0x48, 0x0e, 0x25, 0xf4, 0x3c, 0xdd, 0x46, + 0xc6, 0x14, 0xb4, 0xba, 0x79, 0xd5, 0xb5, 0x5b, 0x74, 0x2f, 0x68, 0x8f, 0x4f, 0x12, 0xf4, 0x4e, + 0x33, 0xf1, 0xe1, 0x65, 0x9d, 0xe7, 0xd6, 0x8f, 0xfc, 0xfe, 0x06, 0x87, 0xb1, 0xbe, 0x8c, 0x32, + 0xd8, 0x4a, 0x9b, 0x4b, 0xd6, 0x67, 0xb9, 0x74, 0x23, 0x5f, 0x0b, 0x38, 0x8a, 0x17, 0x33, 0xca, + 0x30, 0x90, 0xda, 0xef, 0xac, 0xcf, 0xf3, 0x29, 0x47, 0xee, 0x18, 0x34, 0x92, 0x65, 0x98, 0x75, + 0x8f, 0x19, 0x8d, 0x21, 0xeb, 0x1e, 0xb3, 0xaa, 0xdb, 0xde, 0x43, 0x0e, 0xc0, 0x43, 0x15, 0xa2, + 0xa7, 0x99, 0x17, 0x12, 0x2f, 0x5e, 0xab, 0xf3, 0x6e, 0xc5, 0xc8, 0xc5, 0x12, 0xde, 0x4b, 0x4c, + 0x17, 0x94, 0x41, 0x4d, 0xfa, 0x98, 0xb4, 0x9e, 0xe7, 0xd4, 0x4e, 0x80, 0x52, 0x85, 0xbd, 0x05, + 0x54, 0xbc, 0x6b, 0x6c, 0x01, 0x95, 0xe8, 0x11, 0xf6, 0xde, 0x0b, 0xf8, 0xa5, 0xa6, 0xf5, 0x6e, + 0x2b, 0xe2, 0x6f, 0xc7, 0x57, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x95, 0x81, 0x46, 0x8e, 0x47, + 0x0d, 0x00, 0x00, } diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index 2db19b136..f7dfd8e42 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -340,7 +340,7 @@ func (s *ReleaseServer) performUpdate(originalRelease, updatedRelease *release.R } } - if err := s.performKubeUpdate(originalRelease, updatedRelease, req.Restart); err != nil { + if err := s.performKubeUpdate(originalRelease, updatedRelease, req.Recreate); err != nil { log.Printf("warning: Release Upgrade %q failed: %s", updatedRelease.Name, err) originalRelease.Info.Status.Code = release.Status_SUPERSEDED updatedRelease.Info.Status.Code = release.Status_FAILED @@ -478,7 +478,7 @@ func (s *ReleaseServer) performRollback(currentRelease, targetRelease *release.R } } - if err := s.performKubeUpdate(currentRelease, targetRelease, req.Restart); err != nil { + if err := s.performKubeUpdate(currentRelease, targetRelease, req.Recreate); err != nil { log.Printf("warning: Release Rollback %q failed: %s", targetRelease.Name, err) currentRelease.Info.Status.Code = release.Status_SUPERSEDED targetRelease.Info.Status.Code = release.Status_FAILED