msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #1652 from michelleN/feat/1326-helm-keep

Browse Source 
feat(tiller): add support for resource-policy keep
pull/1646/merge
Michelle Noorali 8 years ago committed by GitHub
parent 0b7debfd62 e3480c76e6
commit f5778539b0
6 changed files with 214 additions and 67 deletions
Show Stats Download Patch File Download Diff File

2
_proto/hapi/services/tiller.proto
Unescape View File

@ -256,6 +256,8 @@ message UninstallReleaseRequest {
message UninstallReleaseResponse {
// Release is the release that was marked deleted.
hapi.release.Release release = 1;
// Info is an uninstall message
string info = 2;
}
// GetVersionRequest requests for version information.

7
cmd/helm/delete.go
Unescape View File

@ -18,6 +18,7 @@ package main
import (
"errors"
"fmt"
"io"
"github.com/spf13/cobra"
@ -86,6 +87,10 @@ func (d *deleteCmd) run() error {
helm.DeleteDisableHooks(d.disableHooks),
helm.DeletePurge(d.purge),
}
_, err := d.client.DeleteRelease(d.name, opts...)
res, err := d.client.DeleteRelease(d.name, opts...)
if res != nil && res.Info != "" {
fmt.Fprintln(d.out, res.Info)
}
return prettyError(err)
}

133
pkg/proto/hapi/services/tiller.pb.go
Unescape View File

@ -394,6 +394,8 @@ func (*UninstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescri
type UninstallReleaseResponse struct {
// Release is the release that was marked deleted.
Release *hapi_release3.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
// Info is an uninstall message
Info string `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"`
}
func (m *UninstallReleaseResponse) Reset() { *m = UninstallReleaseResponse{} }
@ -418,7 +420,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,omitempty"`
Version *hapi_version.Version `protobuf:"bytes,1,opt,name=Version,json=version" json:"Version,omitempty"`
}
func (m *GetVersionResponse) Reset() { *m = GetVersionResponse{} }
@ -878,68 +880,69 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 1004 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0xdf, 0x6f, 0xe3, 0xc4,
0x13, 0xaf, 0x93, 0x34, 0x3f, 0xa6, 0x3f, 0xbe, 0xe9, 0x5e, 0xda, 0xb8, 0xd6, 0x17, 0x14, 0x19,
0xc1, 0x85, 0x83, 0x4b, 0x21, 0x3c, 0x21, 0x21, 0xa4, 0x5e, 0x2e, 0x4a, 0xcb, 0x95, 0x9c, 0xb4,
0xa1, 0x20, 0xf1, 0x40, 0xe4, 0x26, 0x9b, 0xab, 0x39, 0xc7, 0x1b, 0xbc, 0x9b, 0xea, 0xf2, 0xce,
0x0b, 0xff, 0x06, 0xff, 0x07, 0xff, 0x13, 0xef, 0xbc, 0x20, 0xef, 0x0f, 0x37, 0x76, 0xec, 0x9c,
0xc9, 0x8b, 0xed, 0xdd, 0x99, 0xfd, 0xcc, 0xcc, 0x67, 0x76, 0x66, 0x12, 0xb0, 0xee, 0x9d, 0x85,
0x7b, 0xc1, 0x48, 0xf0, 0xe0, 0x4e, 0x08, 0xbb, 0xe0, 0xae, 0xe7, 0x91, 0xa0, 0xb3, 0x08, 0x28,
0xa7, 0xa8, 0x11, 0xca, 0x3a, 0x5a, 0xd6, 0x91, 0x32, 0xeb, 0x4c, 0x9c, 0x98, 0xdc, 0x3b, 0x01,
0x97, 0x4f, 0xa9, 0x6d, 0x35, 0xd7, 0xf7, 0xa9, 0x3f, 0x73, 0xdf, 0x28, 0x81, 0x34, 0x11, 0x10,
0x8f, 0x38, 0x8c, 0xe8, 0x77, 0xec, 0x90, 0x96, 0xb9, 0xfe, 0x8c, 0x2a, 0xc1, 0x79, 0x4c, 0xc0,
0xb8, 0xc3, 0x97, 0x2c, 0x86, 0xf7, 0x40, 0x02, 0xe6, 0x52, 0x5f, 0xbf, 0xa5, 0xcc, 0xfe, 0xb3,
0x00, 0x4f, 0x6e, 0x5c, 0xc6, 0xb1, 0x3c, 0xc8, 0x30, 0xf9, 0x6d, 0x49, 0x18, 0x47, 0x0d, 0xd8,
0xf7, 0xdc, 0xb9, 0xcb, 0x4d, 0xa3, 0x65, 0xb4, 0x8b, 0x58, 0x2e, 0xd0, 0x19, 0x94, 0xe9, 0x6c,
0xc6, 0x08, 0x37, 0x0b, 0x2d, 0xa3, 0x5d, 0xc3, 0x6a, 0x85, 0xbe, 0x85, 0x0a, 0xa3, 0x01, 0x1f,
0xdf, 0xad, 0xcc, 0x62, 0xcb, 0x68, 0x1f, 0x77, 0x3f, 0xee, 0xa4, 0x51, 0xd1, 0x09, 0x2d, 0x8d,
0x68, 0xc0, 0x3b, 0xe1, 0xe3, 0xc5, 0x0a, 0x97, 0x99, 0x78, 0x87, 0xb8, 0x33, 0xd7, 0xe3, 0x24,
0x30, 0x4b, 0x12, 0x57, 0xae, 0xd0, 0x00, 0x40, 0xe0, 0xd2, 0x60, 0x4a, 0x02, 0x73, 0x5f, 0x40,
0xb7, 0x73, 0x40, 0xbf, 0x0e, 0xf5, 0x71, 0x8d, 0xe9, 0x4f, 0xf4, 0x0d, 0x1c, 0x4a, 0x4a, 0xc6,
0x13, 0x3a, 0x25, 0xcc, 0x2c, 0xb7, 0x8a, 0xed, 0xe3, 0xee, 0xb9, 0x84, 0xd2, 0x0c, 0x8f, 0x24,
0x69, 0x3d, 0x3a, 0x25, 0xf8, 0x40, 0xaa, 0x87, 0xdf, 0xcc, 0xfe, 0x05, 0xaa, 0x1a, 0xde, 0xee,
0x42, 0x59, 0x3a, 0x8f, 0x0e, 0xa0, 0x72, 0x3b, 0x7c, 0x35, 0x7c, 0xfd, 0xd3, 0xb0, 0xbe, 0x87,
0xaa, 0x50, 0x1a, 0x5e, 0x7e, 0xdf, 0xaf, 0x1b, 0xe8, 0x04, 0x8e, 0x6e, 0x2e, 0x47, 0x3f, 0x8c,
0x71, 0xff, 0xa6, 0x7f, 0x39, 0xea, 0xbf, 0xac, 0x17, 0xec, 0x0f, 0xa1, 0x16, 0x79, 0x85, 0x2a,
0x50, 0xbc, 0x1c, 0xf5, 0xe4, 0x91, 0x97, 0xfd, 0x51, 0xaf, 0x6e, 0xd8, 0x7f, 0x18, 0xd0, 0x88,
0x27, 0x81, 0x2d, 0xa8, 0xcf, 0x48, 0x98, 0x85, 0x09, 0x5d, 0xfa, 0x51, 0x16, 0xc4, 0x02, 0x21,
0x28, 0xf9, 0xe4, 0x9d, 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, 0x16, 0x71, 0xa4, 0x66, 0x0f, 0xa0, 0x39, 0x20, 0xda, 0x13, 0xc9, 0x88, 0xbe, 0x13, 0xa1,
0x5d, 0x67, 0x4e, 0x84, 0x33, 0xa1, 0x5d, 0x67, 0x4e, 0x90, 0x09, 0x15, 0x75, 0xa1, 0x84, 0x3b,
0xfb, 0x58, 0x2f, 0x6d, 0x0e, 0xe6, 0x26, 0x90, 0x8a, 0x2b, 0x0d, 0xe9, 0x13, 0x28, 0x85, 0xd7,
0x59, 0xc0, 0x1c, 0x74, 0x51, 0xdc, 0xcf, 0x6b, 0x7f, 0x46, 0xb1, 0x90, 0xa3, 0xff, 0x43, 0x2d,
0xd4, 0x67, 0x0b, 0x67, 0x42, 0x44, 0xb4, 0x35, 0xfc, 0xb8, 0x61, 0x5f, 0xad, 0x5b, 0xed, 0x51,
0x9f, 0x13, 0x9f, 0xef, 0xe6, 0xff, 0x0d, 0x9c, 0xa7, 0x20, 0xa9, 0x00, 0x2e, 0xa0, 0xa2, 0x5c,
0x13, 0x68, 0x99, 0xbc, 0x6a, 0x2d, 0xfb, 0x2f, 0x03, 0x1a, 0xb7, 0x8b, 0xa9, 0xc3, 0x89, 0x16,
0x6d, 0x71, 0xea, 0x29, 0xec, 0x8b, 0xb6, 0xa0, 0xb8, 0x38, 0x91, 0xd8, 0xb2, 0x77, 0xf4, 0xc2,
0x27, 0x96, 0x72, 0xf4, 0x0c, 0xca, 0x0f, 0x8e, 0xb7, 0x24, 0x4c, 0x10, 0x11, 0xb1, 0xa6, 0x34,
0x45, 0x4f, 0xc1, 0x4a, 0x03, 0x35, 0xa1, 0x32, 0x0d, 0x56, 0xe3, 0x60, 0xe9, 0x8b, 0x22, 0xab,
0xe2, 0xf2, 0x34, 0x58, 0xe1, 0xa5, 0x8f, 0x3e, 0x82, 0xa3, 0xa9, 0xcb, 0x9c, 0x3b, 0x8f, 0x8c,
0xef, 0x29, 0x7d, 0xcb, 0x44, 0x9d, 0x55, 0xf1, 0xa1, 0xda, 0xbc, 0x0a, 0xf7, 0xec, 0x2b, 0x38,
0x4d, 0xb8, 0xbf, 0x2b, 0x13, 0xbf, 0x1b, 0x70, 0x86, 0xa9, 0xe7, 0xdd, 0x39, 0x93, 0xb7, 0x39,
0xb8, 0x58, 0x73, 0xbb, 0xb0, 0xdd, 0xed, 0xe2, 0xa6, 0xdb, 0xeb, 0xe9, 0x2d, 0xc5, 0xd3, 0xfb,
0x1d, 0x34, 0x37, 0xbc, 0xd8, 0x35, 0xa4, 0x7f, 0x0c, 0x38, 0xbd, 0xf6, 0x19, 0x77, 0x3c, 0x2f,
0x11, 0x51, 0x94, 0x49, 0x23, 0x77, 0x26, 0x0b, 0xff, 0x25, 0x93, 0xc5, 0x18, 0x25, 0x9a, 0xbf,
0xd2, 0x1a, 0x7f, 0x79, 0xb2, 0x1b, 0xaf, 0xa9, 0x72, 0xa2, 0xa6, 0xd0, 0x07, 0x00, 0x01, 0x59,
0x32, 0x32, 0x16, 0xe0, 0x15, 0x71, 0xbe, 0x26, 0x76, 0x86, 0xce, 0x9c, 0xd8, 0xd7, 0x70, 0x96,
0x0c, 0x7e, 0x57, 0x22, 0xef, 0xa1, 0x79, 0xeb, 0xbb, 0xa9, 0x4c, 0xa6, 0xdd, 0x8d, 0x8d, 0xd8,
0x0a, 0x29, 0xb1, 0x35, 0x60, 0x7f, 0xb1, 0x0c, 0xde, 0x10, 0xc5, 0x95, 0x5c, 0xd8, 0xaf, 0xc0,
0xdc, 0xb4, 0xb4, 0xab, 0xdb, 0x4f, 0xe0, 0x64, 0x40, 0xf8, 0x8f, 0xf2, 0x66, 0x29, 0x87, 0xed,
0x3e, 0xa0, 0xf5, 0xcd, 0x47, 0x6c, 0xb5, 0x15, 0xc7, 0xd6, 0x53, 0x59, 0xeb, 0x6b, 0x2d, 0xfb,
0x6b, 0x81, 0x7d, 0xe5, 0x32, 0x4e, 0x83, 0xd5, 0x36, 0x32, 0xea, 0x50, 0x9c, 0x3b, 0xef, 0x54,
0x17, 0x0b, 0x3f, 0xed, 0x81, 0xf0, 0x20, 0x3a, 0xaa, 0x3c, 0x58, 0x9f, 0x09, 0x46, 0xae, 0x99,
0xd0, 0xfd, 0xbb, 0x02, 0xc7, 0xba, 0x91, 0xcb, 0xb1, 0x8b, 0x5c, 0x38, 0x5c, 0x9f, 0x58, 0xe8,
0xd3, 0xec, 0xa9, 0x9c, 0xf8, 0x69, 0x61, 0x3d, 0xcb, 0xa3, 0x2a, 0x9d, 0xb5, 0xf7, 0xbe, 0x30,
0x10, 0x83, 0x7a, 0x72, 0x90, 0xa0, 0xe7, 0xe9, 0x18, 0x19, 0x93, 0xcb, 0xea, 0xe4, 0x55, 0xd7,
0x66, 0xd1, 0x83, 0xa0, 0x3d, 0xde, 0xfd, 0xd1, 0x7b, 0x61, 0xe2, 0x03, 0xc7, 0xba, 0xc8, 0xad,
0x1f, 0xd9, 0xfd, 0x15, 0x8e, 0x62, 0x7d, 0x16, 0x65, 0xb0, 0x95, 0x36, 0x4b, 0xac, 0xcf, 0x72,
0xe9, 0x46, 0xb6, 0xe6, 0x70, 0x1c, 0x2f, 0x5c, 0x94, 0x01, 0x90, 0xda, 0xdb, 0xac, 0xcf, 0xf3,
0x29, 0x47, 0xe6, 0x18, 0xd4, 0x93, 0x25, 0x97, 0x95, 0xc7, 0x8c, 0x26, 0x90, 0x95, 0xc7, 0xac,
0x4a, 0xb6, 0xf7, 0x90, 0x03, 0xf0, 0x58, 0x85, 0xe8, 0x69, 0x66, 0x42, 0xe2, 0xc5, 0x6b, 0xb5,
0xdf, 0xaf, 0x18, 0x99, 0x58, 0xc0, 0xff, 0x12, 0x93, 0x04, 0x65, 0x50, 0x93, 0x3e, 0xf6, 0xac,
0xe7, 0x39, 0xb5, 0x13, 0x41, 0xa9, 0xc2, 0xde, 0x12, 0x54, 0xbc, 0x6b, 0x6c, 0x09, 0x2a, 0xd1,
0x23, 0xec, 0xbd, 0x17, 0xf0, 0x73, 0x55, 0xeb, 0xdd, 0x95, 0xc5, 0x5f, 0x85, 0xaf, 0xfe, 0x0d,
0x00, 0x00, 0xff, 0xff, 0x9a, 0xb0, 0xe9, 0x29, 0xfb, 0x0c, 0x00, 0x00,
// 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,
}

7
pkg/tiller/release_server.go
Unescape View File

@ -980,9 +980,14 @@ func (s *ReleaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR
return nil, fmt.Errorf("corrupted release record. You must manually delete the resources: %s", err)
}
filesToKeep, filesToDelete := filterManifestsToKeep(files)
if len(filesToKeep) > 0 {
res.Info = summarizeKeptManifests(filesToKeep)
}
// Collect the errors, and return them later.
es := []string{}
for _, file := range files {
for _, file := range filesToDelete {
b := bytes.NewBufferString(file.content)
if err := s.env.KubeClient.Delete(rel.Namespace, b); err != nil {
log.Printf("uninstall: Failed deletion of %q: %s", req.Name, err)

67
pkg/tiller/release_server_test.go
Unescape View File

@ -50,6 +50,16 @@ data:
name: value
`
var manifestWithKeep = `apiVersion: v1
kind: ConfigMap
metadata:
name: test-cm-keep
annotations:
"helm.sh/resource-policy": keep
data:
name: value
`
var manifestWithUpgradeHooks = `apiVersion: v1
kind: ConfigMap
metadata:
@ -1032,6 +1042,63 @@ func TestUninstallPurgeDeleteRelease(t *testing.T) {
}
}
func TestUninstallReleaseWithKeepPolicy(t *testing.T) {
c := helm.NewContext()
rs := rsFixture()
name := "angry-bunny"
rs.env.Releases.Create(releaseWithKeepStub(name))
req := &services.UninstallReleaseRequest{
Name: name,
}
res, err := rs.UninstallRelease(c, req)
if err != nil {
t.Fatalf("Failed uninstall: %s", err)
}
if res.Release.Name != name {
t.Errorf("Expected angry-bunny, got %q", res.Release.Name)
}
if res.Release.Info.Status.Code != release.Status_DELETED {
t.Errorf("Expected status code to be DELETED, got %d", res.Release.Info.Status.Code)
}
if res.Info == "" {
t.Errorf("Expected response info to not be empty")
} else {
if !strings.Contains(res.Info, "[ConfigMap] test-cm-keep") {
t.Errorf("unexpected output: %s", res.Info)
}
}
}
func releaseWithKeepStub(rlsName string) *release.Release {
ch := &chart.Chart{
Metadata: &chart.Metadata{
Name: "bunnychart",
},
Templates: []*chart.Template{
{Name: "templates/configmap", Data: []byte(manifestWithKeep)},
},
}
date := timestamp.Timestamp{Seconds: 242085845, Nanos: 0}
return &release.Release{
Name: rlsName,
Info: &release.Info{
FirstDeployed: &date,
LastDeployed: &date,
Status: &release.Status{Code: release.Status_DEPLOYED},
},
Chart: ch,
Config: &chart.Config{Raw: `name: value`},
Version: 1,
Manifest: manifestWithKeep,
}
}
func TestUninstallReleaseNoHooks(t *testing.T) {
c := helm.NewContext()
rs := rsFixture()

65
pkg/tiller/resource_policy.go
Unescape View File

@ -0,0 +1,65 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package tiller
import (
"strings"
)
// resourcePolicyAnno is the annotation name for a resource policy
const resourcePolicyAnno = "helm.sh/resource-policy"
// keepPolicy is the resource policy type for keep
//
// This resource policy type allows resources to skip being deleted
// during an uninstallRelease action.
const keepPolicy = "keep"
func filterManifestsToKeep(manifests []manifest) ([]manifest, []manifest) {
remaining := []manifest{}
keep := []manifest{}
for _, m := range manifests {
if m.head.Metadata == nil || m.head.Metadata.Annotations == nil || len(m.head.Metadata.Annotations) == 0 {
remaining = append(remaining, m)
continue
}
resourcePolicyType, ok := m.head.Metadata.Annotations[resourcePolicyAnno]
if !ok {
remaining = append(remaining, m)
continue
}
resourcePolicyType = strings.ToLower(strings.TrimSpace(resourcePolicyType))
if resourcePolicyType == keepPolicy {
keep = append(keep, m)
}
}
return keep, remaining
}
func summarizeKeptManifests(manifests []manifest) string {
message := "These resources were kept due to the resource policy:\n"
for _, m := range manifests {
details := "[" + m.head.Kind + "] " + m.head.Metadata.Name + "\n"
message = message + details
}
return message
}
Write Preview
Loading…
Cancel
Save