Add the ability to specify a owner email for a release.

_proto/hapi/release/info.proto

@@ -37,4 +37,7 @@ message Info {
 
 	// Username is the authenticated user who performed this release.
 	string Username = 6;
+
+	// Email is the email of the authenticated user.
+	string Email = 7;
 }

pkg/proto/hapi/release/info.pb.go

@@ -24,6 +24,8 @@ type Info struct {
 	Description string `protobuf:"bytes,5,opt,name=Description" json:"Description,omitempty"`
 	// Username is the authenticated user who performed this release.
 	Username string `protobuf:"bytes,6,opt,name=Username" json:"Username,omitempty"`
+	// Email is the email of the authenticated user.
+	Email string `protobuf:"bytes,7,opt,name=Email" json:"Email,omitempty"`
 }
 
 func (m *Info) Reset()                    { *m = Info{} }
@@ -73,6 +75,13 @@ func (m *Info) GetUsername() string {
 	return ""
 }
 
+func (m *Info) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*Info)(nil), "hapi.release.Info")
 }
@@ -80,21 +89,22 @@ func init() {
 func init() { proto.RegisterFile("hapi/release/info.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 249 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4f, 0xc3, 0x30,
-	0x10, 0x85, 0x95, 0x52, 0x52, 0xea, 0xb6, 0x0c, 0x16, 0x12, 0x26, 0x0b, 0x11, 0x53, 0x07, 0xe4,
-	0x48, 0xc0, 0x8e, 0x40, 0x5d, 0x58, 0x03, 0x2c, 0x2c, 0xc8, 0x25, 0x97, 0x62, 0xc9, 0xc9, 0x59,
-	0xf6, 0x75, 0xe0, 0x3f, 0xf1, 0x23, 0x51, 0x1d, 0xa7, 0x0a, 0x53, 0xc6, 0xe4, 0x7b, 0xdf, 0xbb,
-	0x27, 0xb3, 0xcb, 0x6f, 0x65, 0x75, 0xe1, 0xc0, 0x80, 0xf2, 0x50, 0xe8, 0xb6, 0x46, 0x69, 0x1d,
-	0x12, 0xf2, 0xe5, 0x01, 0xc8, 0x08, 0xb2, 0xeb, 0x1d, 0xe2, 0xce, 0x40, 0x11, 0xd8, 0x76, 0x5f,
-	0x17, 0xa4, 0x1b, 0xf0, 0xa4, 0x1a, 0xdb, 0xc5, 0xb3, 0xab, 0x7f, 0x3d, 0x9e, 0x14, 0xed, 0x7d,
-	0x87, 0x6e, 0x7e, 0x27, 0x6c, 0xfa, 0xd2, 0xd6, 0xc8, 0x6f, 0x59, 0xda, 0x01, 0x91, 0xe4, 0xc9,
-	0x7a, 0x71, 0x77, 0x21, 0x87, 0x37, 0xe4, 0x6b, 0x60, 0x65, 0xcc, 0xf0, 0x27, 0x76, 0x5e, 0x6b,
-	0xe7, 0xe9, 0xb3, 0x02, 0x6b, 0xf0, 0x07, 0x2a, 0x31, 0x09, 0x56, 0x26, 0xbb, 0x2d, 0xb2, 0xdf,
-	0x22, 0xdf, 0xfa, 0x2d, 0xe5, 0x2a, 0x18, 0x9b, 0x28, 0xf0, 0x47, 0xb6, 0x32, 0x6a, 0xd8, 0x70,
-	0x32, 0xda, 0xb0, 0x3c, 0x08, 0xc7, 0x82, 0x07, 0x36, 0xab, 0xc0, 0x00, 0x41, 0x25, 0xa6, 0xa3,
-	0x6a, 0x1f, 0xe5, 0x39, 0x5b, 0x6c, 0xc0, 0x7f, 0x39, 0x6d, 0x49, 0x63, 0x2b, 0x4e, 0xf3, 0x64,
-	0x3d, 0x2f, 0x87, 0xbf, 0x78, 0xc6, 0xce, 0xde, 0x3d, 0xb8, 0x56, 0x35, 0x20, 0xd2, 0x80, 0x8f,
-	0xdf, 0xcf, 0xf3, 0x8f, 0x59, 0x7c, 0x91, 0x6d, 0x1a, 0xae, 0xdc, 0xff, 0x05, 0x00, 0x00, 0xff,
-	0xff, 0xf4, 0x9e, 0xd9, 0x9e, 0xa5, 0x01, 0x00, 0x00,
+	// 260 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x86, 0x95, 0xd2, 0x26, 0xf4, 0xda, 0x32, 0x58, 0x95, 0x30, 0x59, 0x88, 0x98, 0x3a, 0x20,
+	0x47, 0x02, 0x76, 0x04, 0x2a, 0x03, 0x6b, 0x80, 0x85, 0x05, 0xb9, 0xe4, 0x52, 0x2c, 0x39, 0xb1,
+	0x65, 0xbb, 0x03, 0xaf, 0xc7, 0x93, 0xa1, 0xda, 0x4e, 0x95, 0x4e, 0x1d, 0xcf, 0xdf, 0x7d, 0xff,
+	0xfd, 0x32, 0x5c, 0xfe, 0x70, 0x2d, 0x4a, 0x83, 0x12, 0xb9, 0xc5, 0x52, 0x74, 0x8d, 0x62, 0xda,
+	0x28, 0xa7, 0xc8, 0x7c, 0x0f, 0x58, 0x04, 0xf9, 0xf5, 0x56, 0xa9, 0xad, 0xc4, 0xd2, 0xb3, 0xcd,
+	0xae, 0x29, 0x9d, 0x68, 0xd1, 0x3a, 0xde, 0xea, 0xb0, 0x9e, 0x5f, 0x1d, 0xe5, 0x58, 0xc7, 0xdd,
+	0xce, 0x06, 0x74, 0xf3, 0x37, 0x82, 0xf1, 0x6b, 0xd7, 0x28, 0x72, 0x0b, 0x69, 0x00, 0x34, 0x29,
+	0x92, 0xd5, 0xec, 0x6e, 0xc9, 0x86, 0x37, 0xd8, 0x9b, 0x67, 0x55, 0xdc, 0x21, 0x4f, 0x70, 0xd1,
+	0x08, 0x63, 0xdd, 0x57, 0x8d, 0x5a, 0xaa, 0x5f, 0xac, 0xe9, 0xc8, 0x5b, 0x39, 0x0b, 0x5d, 0x58,
+	0xdf, 0x85, 0xbd, 0xf7, 0x5d, 0xaa, 0x85, 0x37, 0xd6, 0x51, 0x20, 0x8f, 0xb0, 0x90, 0x7c, 0x98,
+	0x70, 0x76, 0x32, 0x61, 0xbe, 0x17, 0x0e, 0x01, 0x0f, 0x90, 0xd5, 0x28, 0xd1, 0x61, 0x4d, 0xc7,
+	0x27, 0xd5, 0x7e, 0x95, 0x14, 0x30, 0x5b, 0xa3, 0xfd, 0x36, 0x42, 0x3b, 0xa1, 0x3a, 0x3a, 0x29,
+	0x92, 0xd5, 0xb4, 0x1a, 0x3e, 0x91, 0x1c, 0xce, 0x3f, 0x2c, 0x9a, 0x8e, 0xb7, 0x48, 0x53, 0x8f,
+	0x0f, 0x33, 0x59, 0xc2, 0xe4, 0xa5, 0xe5, 0x42, 0xd2, 0xcc, 0x83, 0x30, 0x3c, 0x4f, 0x3f, 0xb3,
+	0xf8, 0x4f, 0x9b, 0xd4, 0xdf, 0xbe, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xa2, 0x5e, 0xc9,
+	0xbb, 0x01, 0x00, 0x00,
 }

pkg/storage/driver/cfgmaps.go

@@ -257,8 +257,9 @@ func newConfigMapsObject(key string, rls *rspb.Release, lbs labels) (*core.Confi
 	// create and return configmap object
 	return &core.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:   key,
-			Labels: lbs.toMap(),
+			Annotations: map[string]string{"helm/owner_email": rls.Info.GetEmail()},
+			Name:        key,
+			Labels:      lbs.toMap(),
 		},
 		Data: map[string]string{"release": s},
 	}, nil

pkg/tiller/release_install.go

@@ -48,6 +48,7 @@ func (s *ReleaseServer) InstallRelease(c ctx.Context, req *services.InstallRelea
 		return res, err
 	}
 	rel.Info.Username = getUserName(c)
+	rel.Info.Email = getEmail(c)
 
 	usrCli, err := getUserClient(c)
 	if err != nil {

pkg/tiller/release_update.go

@@ -52,6 +52,7 @@ func (s *ReleaseServer) UpdateRelease(c ctx.Context, req *services.UpdateRelease
 		return nil, err
 	}
 	updatedRelease.Info.Username = getUserName(c)
+	updatedRelease.Info.Email = getEmail(c)
 
 	if !req.DryRun {
 		s.Log("creating updated release for %s", req.Name)

pkg/tiller/server.go

@@ -79,6 +79,11 @@ func authenticate(c context.Context, sysCli *kube.Client) (context.Context, erro
 			return nil, errors.New("Unknown authorization scheme.")
 		}
 	}
+
+	email, ok := md["email"]
+	if ok {
+		c = context.WithValue(c, "email", email[0])
+	}
 	return c, err
 }
 
@@ -327,3 +332,12 @@ func getUserName(c context.Context) string {
 	}
 	return userInfo.Username
 }
+
+func getEmail(c context.Context) string {
+	email, ok := c.Value("email").(string)
+	if !ok {
+		return ""
+	}
+
+	return email
+}