Changing Class and Plans labels to sha224 (#2741)

* Changing Class and Plans labels to sha224

* Fix after CR#1

charts/catalog/templates/crds/serviceplan.yaml

@@ -25,7 +25,7 @@ spec:
       JSONPath: .spec.serviceBrokerName
     - name: Class
       type: string
-      JSONPath: .spec.serviceClassRef.Name
+      JSONPath: .spec.serviceClassRef.name
     - name: Age
       type: date
       JSONPath: .metadata.creationTimestamp

cmd/svcat/svcat_test.go

@@ -40,6 +40,7 @@ import (
 	svcatfake "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset/fake"
 	"github.com/kubernetes-sigs/service-catalog/pkg/svcat"
 	"github.com/kubernetes-sigs/service-catalog/pkg/svcat/service-catalog"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -91,7 +92,7 @@ func TestGetSvcatWithNamespacedBrokerFeatureDisabled(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "my-cluster-class",
 						Labels: map[string]string{
-							v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: "my-cluster-class",
+							v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: util.GenerateSHA("my-cluster-class"),
 						},
 					},
 					Spec: v1beta1.ClusterServiceClassSpec{
@@ -104,7 +105,7 @@ func TestGetSvcatWithNamespacedBrokerFeatureDisabled(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "my-cluster-plan",
 						Labels: map[string]string{
-							v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: "my-cluster-plan",
+							v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: util.GenerateSHA("my-cluster-plan"),
 						},
 					},
 					Spec: v1beta1.ClusterServicePlanSpec{

pkg/controller/controller_clusterservicebroker.go

@@ -34,6 +34,7 @@ import (
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	"github.com/kubernetes-sigs/service-catalog/pkg/metrics"
 	"github.com/kubernetes-sigs/service-catalog/pkg/pretty"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 )
 
 // the Message strings have a terminating period and space so they can
@@ -722,7 +723,7 @@ func (c *controller) getCurrentServiceClassesAndPlansForBroker(broker *v1beta1.C
 	pcb := pretty.NewClusterServiceBrokerContextBuilder(broker)
 
 	labelSelector := labels.SelectorFromSet(labels.Set{
-		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: broker.Name,
+		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA(broker.Name),
 	}).String()
 
 	listOpts := metav1.ListOptions{
@@ -744,7 +745,7 @@ func (c *controller) getCurrentServiceClassesAndPlansForBroker(broker *v1beta1.C
 
 		return nil, nil, err
 	}
-	klog.Info(pcb.Messagef("Found %d ServiceClasses", len(existingServiceClasses.Items)))
+	klog.Info(pcb.Messagef("Found %d ClusterServiceClasses", len(existingServiceClasses.Items)))
 
 	existingServicePlans, err := c.serviceCatalogClient.ClusterServicePlans().List(listOpts)
 	if err != nil {
@@ -761,7 +762,7 @@ func (c *controller) getCurrentServiceClassesAndPlansForBroker(broker *v1beta1.C
 
 		return nil, nil, err
 	}
-	klog.Info(pcb.Messagef("Found %d ServicePlans", len(existingServicePlans.Items)))
+	klog.Info(pcb.Messagef("Found %d ClusterServicePlans", len(existingServicePlans.Items)))
 
 	return existingServiceClasses.Items, existingServicePlans.Items, nil
 }

pkg/controller/controller_clusterservicebroker_test.go

@@ -26,6 +26,7 @@ import (
 	fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 	"github.com/kubernetes-sigs/service-catalog/test/fake"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -281,7 +282,7 @@ func TestReconcileClusterServiceBrokerExistingServiceClassAndServicePlan(t *test
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -341,7 +342,7 @@ func TestReconcileClusterServiceBrokerRemovedClusterServiceClass(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -411,7 +412,7 @@ func TestReconcileClusterServiceBrokerRemovedAndRestoredClusterServiceClass(t *t
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -470,7 +471,7 @@ func TestReconcileClusterServiceBrokerRemovedClusterServicePlan(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -516,7 +517,7 @@ func TestReconcileClusterServiceBrokerExistingClusterServiceClassDifferentBroker
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -570,7 +571,7 @@ func TestReconcileClusterServiceBrokerExistingClusterServicePlanDifferentClass(t
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -699,7 +700,7 @@ func TestReconcileClusterServiceBrokerDelete(t *testing.T) {
 
 			listRestrictions := clientgotesting.ListRestrictions{
 				Labels: labels.SelectorFromSet(labels.Set{
-					v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+					v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 				}),
 				Fields: fields.Everything(),
 			}
@@ -813,7 +814,7 @@ func TestReconcileClusterServiceBrokerZeroServices(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -973,7 +974,7 @@ func TestReconcileClusterServiceBrokerWithReconcileError(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -1039,7 +1040,7 @@ func TestReconcileClusterServiceBrokerSuccessOnFinalRetry(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}
@@ -1139,7 +1140,7 @@ func TestReconcileClusterServiceBrokerWithStatusUpdateError(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: "test-clusterservicebroker",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName: util.GenerateSHA("test-clusterservicebroker"),
 		}),
 		Fields: fields.Everything(),
 	}

pkg/controller/controller_clusterserviceclass.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/klog"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 )
 
 // Service class handlers and control-loop
@@ -93,7 +94,7 @@ func (c *controller) reconcileClusterServiceClass(serviceClass *v1beta1.ClusterS
 
 func (c *controller) findServiceInstancesOnClusterServiceClass(serviceClass *v1beta1.ClusterServiceClass) (*v1beta1.ServiceInstanceList, error) {
 	labelSelector := labels.SelectorFromSet(labels.Set{
-		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: serviceClass.Name,
+		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: util.GenerateSHA(serviceClass.Name),
 	}).String()
 
 	listOpts := metav1.ListOptions{

pkg/controller/controller_clusterserviceclass_test.go

@@ -27,6 +27,7 @@ import (
 	clientgotesting "k8s.io/client-go/testing"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 	"github.com/kubernetes-sigs/service-catalog/test/fake"
 )
 
@@ -59,7 +60,7 @@ func TestReconcileClusterServiceClassRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: "cscguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: util.GenerateSHA("cscguid"),
 					}),
 					Fields: fields.Everything(),
 				}
@@ -76,7 +77,7 @@ func TestReconcileClusterServiceClassRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: "cscguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: util.GenerateSHA("cscguid"),
 					}),
 					Fields: fields.Everything(),
 				}
@@ -100,7 +101,7 @@ func TestReconcileClusterServiceClassRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: "cscguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: util.GenerateSHA("cscguid"),
 					}),
 					Fields: fields.Everything(),
 				}

pkg/controller/controller_clusterserviceplan.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/klog"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 )
 
 // Cluster service plan handlers and control-loop
@@ -94,7 +95,7 @@ func (c *controller) reconcileClusterServicePlan(clusterServicePlan *v1beta1.Clu
 
 func (c *controller) findServiceInstancesOnClusterServicePlan(clusterServicePlan *v1beta1.ClusterServicePlan) (*v1beta1.ServiceInstanceList, error) {
 	labelSelector := labels.SelectorFromSet(labels.Set{
-		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: clusterServicePlan.Name,
+		v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: util.GenerateSHA(clusterServicePlan.Name),
 	}).String()
 
 	listOpts := metav1.ListOptions{

pkg/controller/controller_clusterserviceplan_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 	"github.com/kubernetes-sigs/service-catalog/test/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -60,7 +61,7 @@ func TestReconcileClusterServicePlanRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: "cspguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: util.GenerateSHA("cspguid"),
 					}),
 					Fields: fields.Everything(),
 				}
@@ -77,7 +78,7 @@ func TestReconcileClusterServicePlanRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: "cspguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: util.GenerateSHA("cspguid"),
 					}),
 					Fields: fields.Everything(),
 				}
@@ -101,7 +102,7 @@ func TestReconcileClusterServicePlanRemovedFromCatalog(t *testing.T) {
 			catalogActionsCheckFunc: func(t *testing.T, actions []clientgotesting.Action) {
 				listRestrictions := clientgotesting.ListRestrictions{
 					Labels: labels.SelectorFromSet(labels.Set{
-						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: "cspguid",
+						v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServicePlanRefName: util.GenerateSHA("cspguid"),
 					}),
 					Fields: fields.Everything(),
 				}

pkg/controller/controller_instance.go

@@ -28,6 +28,7 @@ import (
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	"github.com/kubernetes-sigs/service-catalog/pkg/pretty"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -1388,7 +1389,7 @@ func (c *controller) resolveClusterServiceClassRef(instance *v1beta1.ServiceInst
 		filterValue := instance.Spec.GetSpecifiedClusterServiceClass()
 		klog.V(4).Info(pcb.Messagef("looking up a ClusterServiceClass from %s: %q", filterLabel, filterValue))
 		labelSelector := labels.SelectorFromSet(labels.Set{
-			filterLabel: filterValue,
+			filterLabel: util.GenerateSHA(filterValue),
 		}).String()
 
 		listOpts := metav1.ListOptions{
@@ -1462,7 +1463,7 @@ func (c *controller) resolveServiceClassRef(instance *v1beta1.ServiceInstance) (
 		klog.V(4).Info(pcb.Messagef("looking up a ServiceClass from %s: %q", filterLabel, filterValue))
 
 		labelSelector := labels.SelectorFromSet(labels.Set{
-			filterLabel: filterValue,
+			filterLabel: util.GenerateSHA(filterValue),
 		}).String()
 
 		listOpts := metav1.ListOptions{
@@ -1522,9 +1523,9 @@ func (c *controller) resolveClusterServicePlanRef(instance *v1beta1.ServiceInsta
 		}
 	} else {
 		labelSelector := labels.SelectorFromSet(labels.Set{
-			instance.Spec.GetClusterServicePlanFilterLabelName():                   instance.Spec.GetSpecifiedClusterServicePlan(),
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: instance.Spec.ClusterServiceClassRef.Name,
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName:   brokerName,
+			instance.Spec.GetClusterServicePlanFilterLabelName():                   util.GenerateSHA(instance.Spec.GetSpecifiedClusterServicePlan()),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceClassRefName: util.GenerateSHA(instance.Spec.ClusterServiceClassRef.Name),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecClusterServiceBrokerName:   util.GenerateSHA(brokerName),
 		}).String()
 
 		listOpts := metav1.ListOptions{
@@ -1582,9 +1583,9 @@ func (c *controller) resolveServicePlanRef(instance *v1beta1.ServiceInstance, br
 		}
 	} else {
 		labelSelector := labels.SelectorFromSet(labels.Set{
-			instance.Spec.GetServicePlanFilterLabelName():                   instance.Spec.GetSpecifiedServicePlan(),
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceClassRefName: instance.Spec.ServiceClassRef.Name,
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceBrokerName:   brokerName,
+			instance.Spec.GetServicePlanFilterLabelName():                   util.GenerateSHA(instance.Spec.GetSpecifiedServicePlan()),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceClassRefName: util.GenerateSHA(instance.Spec.ServiceClassRef.Name),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceBrokerName:   util.GenerateSHA(brokerName),
 		}).String()
 
 		listOpts := metav1.ListOptions{

pkg/controller/controller_instance_ns_test.go

@@ -24,6 +24,7 @@ import (
 	fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
 
 	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	"github.com/kubernetes-sigs/service-catalog/pkg/util"
 
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
@@ -833,17 +834,17 @@ func TestResolveNamespacedReferencesWorks(t *testing.T) {
 
 	listRestrictions := clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: instance.Spec.ServiceClassExternalName,
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName: util.GenerateSHA(instance.Spec.ServiceClassExternalName),
 		}),
 		Fields: fields.Everything(),
 	}
 	assertList(t, actions[0], &v1beta1.ServiceClass{}, listRestrictions)
 
 	listRestrictions = clientgotesting.ListRestrictions{
 		Labels: labels.SelectorFromSet(labels.Set{
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName:        "test-serviceplan",
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceBrokerName:   "test-servicebroker",
-			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceClassRefName: "scguid",
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecExternalName:        util.GenerateSHA("test-serviceplan"),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceBrokerName:   util.GenerateSHA("test-servicebroker"),
+			v1beta1.GroupName + "/" + v1beta1.FilterSpecServiceClassRefName: util.GenerateSHA("scguid"),
 		}),
 		Fields: fields.Everything(),
 	}