From f77435e686e8ea0b7257d882120cf5ffe0133e4a Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Thu, 15 Sep 2016 15:45:37 -0600
Subject: [PATCH] fix(helm-list): only list configmaps owned by TILLER

---
 pkg/storage/driver/cfgmaps.go | 5 ++++-
 pkg/storage/driver/records.go | 1 +
 pkg/storage/storage.go        | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go
index 30b716b6c..f33142729 100644
--- a/pkg/storage/driver/cfgmaps.go
+++ b/pkg/storage/driver/cfgmaps.go
@@ -84,7 +84,10 @@ func (cfgmaps *ConfigMaps) Get(key string) (*rspb.Release, error) {
 // that filter(release) == true. An error is returned if the
 // configmap fails to retrieve the releases.
 func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) {
-	list, err := cfgmaps.impl.List(api.ListOptions{})
+	lsel := kblabels.Set{"OWNER": "TILLER"}.AsSelector()
+	opts := api.ListOptions{LabelSelector: lsel}
+
+	list, err := cfgmaps.impl.List(opts)
 	if err != nil {
 		logerrf(err, "list: failed to list")
 		return nil, err
diff --git a/pkg/storage/driver/records.go b/pkg/storage/driver/records.go
index c8766d87f..e625bb5e1 100644
--- a/pkg/storage/driver/records.go
+++ b/pkg/storage/driver/records.go
@@ -125,6 +125,7 @@ func newRecord(key string, rls *rspb.Release) *record {
 
 	lbs.init()
 	lbs.set("NAME", rls.Name)
+	lbs.set("OWNER", "TILLER")
 	lbs.set("STATUS", rspb.Status_Code_name[int32(rls.Info.Status.Code)])
 	lbs.set("VERSION", strconv.Itoa(int(rls.Version)))
 
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index 1301cc9f3..ba55062a9 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -113,6 +113,7 @@ func (s *Storage) Deployed(name string) (*rspb.Release, error) {
 
 	ls, err := s.Driver.Query(map[string]string{
 		"NAME":   name,
+		"OWNER":  "TILLER",
 		"STATUS": "DEPLOYED",
 	})
 	switch {