Merge pull request #35651 from caesarxuchao/remove-label-selectors

Automatic merge from submit-queue

Sending #35255 again: Remove versioned LabelSelectors

ref #35255: "Remove versioned LabelSelectors"

FYI @smarterclayton

test/e2e/federation-replicaset.go

@@ -23,6 +23,7 @@ import (
 
 	"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5"
 	fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/util/wait"
@@ -194,7 +195,7 @@ func newReplicaSet(namespace string, name string, replicas int32) *v1beta1.Repli
 		},
 		Spec: v1beta1.ReplicaSetSpec{
 			Replicas: &replicas,
-			Selector: &v1beta1.LabelSelector{
+			Selector: &unversioned.LabelSelector{
 				MatchLabels: map[string]string{"name": "myrs"},
 			},
 			Template: v1.PodTemplateSpec{

test/e2e/generated/BUILD

@@ -12,29 +12,6 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "main.go",
-        ":bindata",
-    ],
-)
-
-genrule(
-    name = "bindata",
-    srcs = [
-        "//examples:sources",
-        "//test/images:sources",
-        "//test/fixtures:sources",
-        "//test/e2e/testing-manifests:sources",
-    ],
-    outs = ["bindata.go"],
-    cmd = """
-$(location //vendor:github.com/jteeuwen/go-bindata/go-bindata) \
-  -nometadata -o "$(OUTS)" -pkg generated \
-  -prefix $$(pwd) \
-  -ignore .jpg -ignore .png -ignore .md \
-  $(SRCS)
-""",
-    tools = [
-        "//vendor:github.com/jteeuwen/go-bindata/go-bindata",
-    ],
+    srcs = ["main.go"],
+    tags = ["automanaged"],
 )

test/integration/replicaset/replicaset_test.go

@@ -55,7 +55,7 @@ func newRS(name, namespace string, replicas int) *v1beta1.ReplicaSet {
 			Name:      name,
 		},
 		Spec: v1beta1.ReplicaSetSpec{
-			Selector: &v1beta1.LabelSelector{
+			Selector: &unversioned.LabelSelector{
 				MatchLabels: testLabels(),
 			},
 			Replicas: &replicasCopy,