Switch kmeta/labels to use metav1.ObjectMetaAccessor (knative#68)

amxmadx · Sep 13, 2018 · d14ed38 · d14ed38
1 parent 5f353e5
commit d14ed38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/kmeta/labels.go b/kmeta/labels.go
@@ -42,27 +42,27 @@ import (
 // MakeVersionLabels constructs a set of labels to apply to subresources
 // instantiated at this version of the parent resource, so that we can
 // efficiently select them.
-func MakeVersionLabels(om metav1.ObjectMeta) labels.Set {
+func MakeVersionLabels(om metav1.ObjectMetaAccessor) labels.Set {
 	return map[string]string{
-		"controller": string(om.UID),
-		"version":    om.ResourceVersion,
+		"controller": string(om.GetObjectMeta().GetUID()),
+		"version":    om.GetObjectMeta().GetResourceVersion(),
 	}
 }
 
 // MakeVersionLabelSelector constructs a selector for subresources
 // instantiated at this version of the parent resource.  This keys
 // off of the labels populated by MakeVersionLabels.
-func MakeVersionLabelSelector(om metav1.ObjectMeta) labels.Selector {
+func MakeVersionLabelSelector(om metav1.ObjectMetaAccessor) labels.Selector {
 	return labels.SelectorFromSet(MakeVersionLabels(om))
 }
 
 // MakeOldVersionLabelSelector constructs a selector for subresources
 // instantiated at an older version of the parent resource.  This keys
 // off of the labels populated by MakeVersionLabels.
-func MakeOldVersionLabelSelector(om metav1.ObjectMeta) labels.Selector {
+func MakeOldVersionLabelSelector(om metav1.ObjectMetaAccessor) labels.Selector {
 	return labels.NewSelector().Add(
-		mustNewRequirement("controller", selection.Equals, []string{string(om.UID)}),
-		mustNewRequirement("version", selection.NotEquals, []string{om.ResourceVersion}),
+		mustNewRequirement("controller", selection.Equals, []string{string(om.GetObjectMeta().GetUID())}),
+		mustNewRequirement("version", selection.NotEquals, []string{om.GetObjectMeta().GetResourceVersion()}),
 	)
 }
 

diff --git a/kmeta/labels_test.go b/kmeta/labels_test.go
@@ -45,7 +45,7 @@ func TestMakeVersionLabels(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			ls := MakeVersionLabels(test.om)
+			ls := MakeVersionLabels(&test.om)
 			if want, got := test.s, ls.String(); got != want {
 				t.Errorf("MakeVersionLabels() = %v, wanted %v", got, want)
 			}
@@ -76,7 +76,7 @@ func TestMakeVersionLabelSelector(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			ls := MakeVersionLabelSelector(test.om)
+			ls := MakeVersionLabelSelector(&test.om)
 			if want, got := test.s, ls.String(); got != want {
 				t.Errorf("MakeVersionLabelSelector() = %v, wanted %v", got, want)
 			}
@@ -107,7 +107,7 @@ func TestMakeOldVersionLabelSelector(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			ls := MakeOldVersionLabelSelector(test.om)
+			ls := MakeOldVersionLabelSelector(&test.om)
 			if want, got := test.s, ls.String(); got != want {
 				t.Errorf("MakeOldVersionLabelSelector() = %v, wanted %v", got, want)
 			}