From a43e7dc9fdf727231f5645de5916d65a2fca126d Mon Sep 17 00:00:00 2001
From: shravan <shravan.ss@zopsmart.com>
Date: Wed, 5 Feb 2020 16:33:55 +0530
Subject: [PATCH] 658 removing deprecated functions

---
 pkg/namespace/generation.go    |   2 +-
 pkg/policystore/policystore.go | 112 ++++++++++++++++-----------------
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/pkg/namespace/generation.go b/pkg/namespace/generation.go
index f5a96fa245..7ce302a046 100644
--- a/pkg/namespace/generation.go
+++ b/pkg/namespace/generation.go
@@ -165,7 +165,7 @@ func (nsc *NamespaceController) processPolicy(policy *kyverno.ClusterPolicy) {
 func listpolicies(ns unstructured.Unstructured, pMetaStore policystore.LookupInterface) []kyverno.ClusterPolicy {
 	var filteredpolicies []kyverno.ClusterPolicy
 	glog.V(4).Infof("listing policies for namespace %s", ns.GetName())
-	policies, err := pMetaStore.LookUp(ns.GetKind(), ns.GetNamespace())
+	policies, err := pMetaStore.ListAll()
 	if err != nil {
 		glog.Errorf("failed to get list policies: %v", err)
 		return nil
diff --git a/pkg/policystore/policystore.go b/pkg/policystore/policystore.go
index 86e04cbab4..1e344d78f9 100644
--- a/pkg/policystore/policystore.go
+++ b/pkg/policystore/policystore.go
@@ -36,8 +36,6 @@ type UpdateInterface interface {
 
 //LookupInterface provides api to lookup policies
 type LookupInterface interface {
-	// Lookup based on kind and namespaces
-	LookUp(kind, namespace string) ([]kyverno.ClusterPolicy, error)
 	ListAll() ([]kyverno.ClusterPolicy, error)
 }
 
@@ -84,20 +82,20 @@ func (ps *PolicyStore) Register(policy kyverno.ClusterPolicy) {
 	}
 }
 
-//LookUp look up the resources
-func (ps *PolicyStore) LookUp(kind, namespace string) ([]kyverno.ClusterPolicy, error) {
-	ret := []kyverno.ClusterPolicy{}
-	// lookup meta-store
-	policyNames := ps.lookUp(kind, namespace)
-	for _, policyName := range policyNames {
-		policy, err := ps.pLister.Get(policyName)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, *policy)
-	}
-	return ret, nil
-}
+////LookUp look up the resources
+//func (ps *PolicyStore) LookUp(kind, namespace string) ([]kyverno.ClusterPolicy, error) {
+//	ret := []kyverno.ClusterPolicy{}
+//	// lookup meta-store
+//	policyNames := ps.lookUp(kind, namespace)
+//	for _, policyName := range policyNames {
+//		policy, err := ps.pLister.Get(policyName)
+//		if err != nil {
+//			return nil, err
+//		}
+//		ret = append(ret, *policy)
+//	}
+//	return ret, nil
+//}
 
 func (ps *PolicyStore) ListAll() ([]kyverno.ClusterPolicy, error) {
 	policyPointers, err := ps.pLister.List(labels.NewSelector())
@@ -142,47 +140,47 @@ func (ps *PolicyStore) UnRegister(policy kyverno.ClusterPolicy) error {
 	return nil
 }
 
-//LookUp lookups up the policies for kind and namespace
-// returns a list of <policy, rule> that statisfy the filters
-func (ps *PolicyStore) lookUp(kind, namespace string) []string {
-	ps.mu.RLock()
-	defer ps.mu.RUnlock()
-	var policyMap policyMap
-	var ret []string
-	// kind
-	kindMap := ps.getKind(kind)
-	if kindMap == nil {
-		return []string{}
-	}
-	// get namespace specific policies
-	policyMap = kindMap[namespace]
-	ret = append(ret, transform(policyMap)...)
-	// get policies on all namespaces
-	policyMap = kindMap["*"]
-	ret = append(ret, transform(policyMap)...)
-	return unique(ret)
-}
-
-func unique(intSlice []string) []string {
-	keys := make(map[string]bool)
-	list := []string{}
-	for _, entry := range intSlice {
-		if _, value := keys[entry]; !value {
-			keys[entry] = true
-			list = append(list, entry)
-		}
-	}
-	return list
-}
-
-// generates a copy
-func transform(pmap policyMap) []string {
-	ret := []string{}
-	for k := range pmap {
-		ret = append(ret, k)
-	}
-	return ret
-}
+////LookUp lookups up the policies for kind and namespace
+//// returns a list of <policy, rule> that statisfy the filters
+//func (ps *PolicyStore) lookUp(kind, namespace string) []string {
+//	ps.mu.RLock()
+//	defer ps.mu.RUnlock()
+//	var policyMap policyMap
+//	var ret []string
+//	// kind
+//	kindMap := ps.getKind(kind)
+//	if kindMap == nil {
+//		return []string{}
+//	}
+//	// get namespace specific policies
+//	policyMap = kindMap[namespace]
+//	ret = append(ret, transform(policyMap)...)
+//	// get policies on all namespaces
+//	policyMap = kindMap["*"]
+//	ret = append(ret, transform(policyMap)...)
+//	return unique(ret)
+//}
+//
+//func unique(intSlice []string) []string {
+//	keys := make(map[string]bool)
+//	list := []string{}
+//	for _, entry := range intSlice {
+//		if _, value := keys[entry]; !value {
+//			keys[entry] = true
+//			list = append(list, entry)
+//		}
+//	}
+//	return list
+//}
+//
+//// generates a copy
+//func transform(pmap policyMap) []string {
+//	ret := []string{}
+//	for k := range pmap {
+//		ret = append(ret, k)
+//	}
+//	return ret
+//}
 
 func (ps *PolicyStore) addKind(kind string) namespaceMap {
 	val, ok := ps.data[kind]