Merge pull request #55103 from ConnorDoyle/remove-oir

pkg/apis/core/helper/helpers.go

@@ -147,10 +147,9 @@ func IsStandardContainerResourceName(str string) bool {
 }
 
 // IsExtendedResourceName returns true if the resource name is not in the
-// default namespace, or it has the opaque integer resource prefix.
+// default namespace.
 func IsExtendedResourceName(name core.ResourceName) bool {
-	// TODO: Remove OIR part following deprecation.
-	return !IsDefaultNamespaceResource(name) || IsOpaqueIntResourceName(name)
+	return !IsDefaultNamespaceResource(name)
 }
 
 // IsDefaultNamespaceResource returns true if the resource name is in the
@@ -161,22 +160,6 @@ func IsDefaultNamespaceResource(name core.ResourceName) bool {
 		strings.Contains(string(name), core.ResourceDefaultNamespacePrefix)
 }
 
-// IsOpaqueIntResourceName returns true if the resource name has the opaque
-// integer resource prefix.
-func IsOpaqueIntResourceName(name core.ResourceName) bool {
-	return strings.HasPrefix(string(name), core.ResourceOpaqueIntPrefix)
-}
-
-// OpaqueIntResourceName returns a ResourceName with the canonical opaque
-// integer prefix prepended. If the argument already has the prefix, it is
-// returned unmodified.
-func OpaqueIntResourceName(name string) core.ResourceName {
-	if IsOpaqueIntResourceName(core.ResourceName(name)) {
-		return core.ResourceName(name)
-	}
-	return core.ResourceName(fmt.Sprintf("%s%s", core.ResourceOpaqueIntPrefix, name))
-}
-
 var overcommitBlacklist = sets.NewString(string(core.ResourceNvidiaGPU))
 
 // IsOvercommitAllowed returns true if the resource is in the default

pkg/apis/core/types.go

@@ -3553,8 +3553,6 @@ const (
 )
 
 const (
-	// Namespace prefix for opaque counted resources (alpha).
-	ResourceOpaqueIntPrefix = "pod.alpha.kubernetes.io/opaque-int-resource-"
 	// Default namespace prefix.
 	ResourceDefaultNamespacePrefix = "kubernetes.io/"
 	// Name prefix for huge page resources (alpha).

pkg/apis/core/v1/helper/helpers.go

@@ -30,10 +30,9 @@ import (
 )
 
 // IsExtendedResourceName returns true if the resource name is not in the
-// default namespace, or it has the opaque integer resource prefix.
+// default namespace.
 func IsExtendedResourceName(name v1.ResourceName) bool {
-	// TODO: Remove OIR part following deprecation.
-	return !IsDefaultNamespaceResource(name) || IsOpaqueIntResourceName(name)
+	return !IsDefaultNamespaceResource(name)
 }
 
 // IsDefaultNamespaceResource returns true if the resource name is in the
@@ -69,22 +68,6 @@ func HugePageSizeFromResourceName(name v1.ResourceName) (resource.Quantity, erro
 	return resource.ParseQuantity(pageSize)
 }
 
-// IsOpaqueIntResourceName returns true if the resource name has the opaque
-// integer resource prefix.
-func IsOpaqueIntResourceName(name v1.ResourceName) bool {
-	return strings.HasPrefix(string(name), v1.ResourceOpaqueIntPrefix)
-}
-
-// OpaqueIntResourceName returns a ResourceName with the canonical opaque
-// integer prefix prepended. If the argument already has the prefix, it is
-// returned unmodified.
-func OpaqueIntResourceName(name string) v1.ResourceName {
-	if IsOpaqueIntResourceName(v1.ResourceName(name)) {
-		return v1.ResourceName(name)
-	}
-	return v1.ResourceName(fmt.Sprintf("%s%s", v1.ResourceOpaqueIntPrefix, name))
-}
-
 var overcommitBlacklist = sets.NewString(string(v1.ResourceNvidiaGPU))
 
 // IsOvercommitAllowed returns true if the resource is in the default

pkg/apis/core/v1/helper/helpers_test.go

@@ -152,63 +152,6 @@ func TestIsOvercommitAllowed(t *testing.T) {
 		})
 	}
 }
-func TestIsOpaqueIntResourceName(t *testing.T) { // resourceName input with the correct OpaqueIntResourceName prefix ("pod.alpha.kubernetes.io/opaque-int-resource-") should pass
-	testCases := []struct {
-		resourceName v1.ResourceName
-		expectVal    bool
-	}{
-		{
-			resourceName: "pod.alpha.kubernetes.io/opaque-int-resource-foo",
-			expectVal:    true, // resourceName should pass because the resourceName has the correct prefix.
-		},
-		{
-			resourceName: "foo",
-			expectVal:    false, // resourceName should fail because the resourceName has the wrong prefix.
-		},
-		{
-			resourceName: "",
-			expectVal:    false, // resourceName should fail, empty resourceName.
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(fmt.Sprintf("resourceName input=%s, expected value=%v", tc.resourceName, tc.expectVal), func(t *testing.T) {
-			t.Parallel()
-			v := IsOpaqueIntResourceName(tc.resourceName)
-			if v != tc.expectVal {
-				t.Errorf("Got %v but expected %v", v, tc.expectVal)
-			}
-		})
-	}
-}
-
-func TestOpaqueIntResourceName(t *testing.T) { // each output should have the correct appended prefix ("pod.alpha.kubernetes.io/opaque-int-resource-") for opaque counted resources.
-	testCases := []struct {
-		name      string
-		expectVal v1.ResourceName
-	}{
-		{
-			name:      "foo",
-			expectVal: "pod.alpha.kubernetes.io/opaque-int-resource-foo", // append prefix to input string foo
-		},
-		{
-			name:      "",
-			expectVal: "pod.alpha.kubernetes.io/opaque-int-resource-", // append prefix to input empty string
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(fmt.Sprintf("name input=%s, expected value=%s", tc.name, tc.expectVal), func(t *testing.T) {
-			t.Parallel()
-			v := OpaqueIntResourceName(tc.name)
-			if v != tc.expectVal {
-				t.Errorf("Got %v but expected %v", v, tc.expectVal)
-			}
-		})
-	}
-}
 
 func TestAddToNodeAddresses(t *testing.T) {
 	testCases := []struct {

pkg/apis/core/v1/validation/BUILD

-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
     srcs = ["validation.go"],
     importpath = "k8s.io/kubernetes/pkg/apis/core/v1/validation",
+    visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/core/helper:go_default_library",
         "//pkg/apis/core/v1/helper:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
@@ -22,6 +16,18 @@ go_library(
     ],
 )
 
+go_test(
+    name = "go_default_test",
+    srcs = ["validation_test.go"],
+    importpath = "k8s.io/kubernetes/pkg/apis/core/v1/validation",
+    library = ":go_default_library",
+    deps = [
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
+    ],
+)
+
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),
@@ -33,16 +39,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["validation_test.go"],
-    importpath = "k8s.io/kubernetes/pkg/apis/core/v1/validation",
-    library = ":go_default_library",
-    deps = [
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
-    ],
+    visibility = ["//visibility:public"],
 )

pkg/apis/core/v1/validation/validation.go

@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/golang/glog"
-
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -105,12 +103,6 @@ func ValidateNonnegativeQuantity(value resource.Quantity, fldPath *field.Path) f
 // Validate compute resource typename.
 // Refer to docs/design/resources.md for more details.
 func validateResourceName(value string, fldPath *field.Path) field.ErrorList {
-	// Opaque integer resources (OIR) deprecation began in v1.8
-	// TODO: Remove warning after OIR deprecation cycle.
-	if v1helper.IsOpaqueIntResourceName(v1.ResourceName(value)) {
-		glog.Errorf("DEPRECATION WARNING! Opaque integer resources are deprecated starting with v1.8: %s", value)
-	}
-
 	allErrs := field.ErrorList{}
 	for _, msg := range validation.IsQualifiedName(value) {
 		allErrs = append(allErrs, field.Invalid(fldPath, value, msg))

pkg/apis/core/validation/validation.go

@@ -3944,12 +3944,6 @@ func ValidateNodeUpdate(node, oldNode *core.Node) field.ErrorList {
 // Validate compute resource typename.
 // Refer to docs/design/resources.md for more details.
 func validateResourceName(value string, fldPath *field.Path) field.ErrorList {
-	// Opaque integer resources (OIR) deprecation began in v1.8
-	// TODO: Remove warning after OIR deprecation cycle.
-	if helper.IsOpaqueIntResourceName(core.ResourceName(value)) {
-		glog.Errorf("DEPRECATION WARNING! Opaque integer resources are deprecated starting with v1.8: %s", value)
-	}
-
 	allErrs := field.ErrorList{}
 	for _, msg := range validation.IsQualifiedName(value) {
 		allErrs = append(allErrs, field.Invalid(fldPath, value, msg))

pkg/apis/core/validation/validation_test.go

@@ -6088,20 +6088,20 @@ func TestValidatePod(t *testing.T) {
 			},
 			Spec: validPodSpec(nil),
 		},
-		{ // valid opaque integer resources for init container
-			ObjectMeta: metav1.ObjectMeta{Name: "valid-opaque-int", Namespace: "ns"},
+		{ // valid extended resources for init container
+			ObjectMeta: metav1.ObjectMeta{Name: "valid-extended", Namespace: "ns"},
 			Spec: core.PodSpec{
 				InitContainers: []core.Container{
 					{
-						Name:            "valid-opaque-int",
+						Name:            "valid-extended",
 						Image:           "image",
 						ImagePullPolicy: "IfNotPresent",
 						Resources: core.ResourceRequirements{
 							Requests: core.ResourceList{
-								helper.OpaqueIntResourceName("A"): resource.MustParse("10"),
+								core.ResourceName("example.com/a"): resource.MustParse("10"),
 							},
 							Limits: core.ResourceList{
-								helper.OpaqueIntResourceName("A"): resource.MustParse("20"),
+								core.ResourceName("example.com/a"): resource.MustParse("10"),
 							},
 						},
 						TerminationMessagePolicy: "File",
@@ -6112,21 +6112,21 @@ func TestValidatePod(t *testing.T) {
 				DNSPolicy:     core.DNSClusterFirst,
 			},
 		},
-		{ // valid opaque integer resources for regular container
-			ObjectMeta: metav1.ObjectMeta{Name: "valid-opaque-int", Namespace: "ns"},
+		{ // valid extended resources for regular container
+			ObjectMeta: metav1.ObjectMeta{Name: "valid-extended", Namespace: "ns"},
 			Spec: core.PodSpec{
 				InitContainers: []core.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File"}},
 				Containers: []core.Container{
 					{
-						Name:            "valid-opaque-int",
+						Name:            "valid-extended",
 						Image:           "image",
 						ImagePullPolicy: "IfNotPresent",
 						Resources: core.ResourceRequirements{
 							Requests: core.ResourceList{
-								helper.OpaqueIntResourceName("A"): resource.MustParse("10"),
+								core.ResourceName("example.com/a"): resource.MustParse("10"),
 							},
 							Limits: core.ResourceList{
-								helper.OpaqueIntResourceName("A"): resource.MustParse("20"),
+								core.ResourceName("example.com/a"): resource.MustParse("10"),
 							},
 						},
 						TerminationMessagePolicy: "File",
@@ -6738,8 +6738,8 @@ func TestValidatePod(t *testing.T) {
 				Spec: validPodSpec(nil),
 			},
 		},
-		"invalid opaque integer resource requirement: request must be <= limit": {
-			expectedError: "must be less than or equal to pod.alpha.kubernetes.io/opaque-int-resource-A",
+		"invalid extended resource requirement: request must be == limit": {
+			expectedError: "must be equal to example.com/a",
 			spec: core.Pod{
 				ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
 				Spec: core.PodSpec{
@@ -6750,10 +6750,10 @@ func TestValidatePod(t *testing.T) {
 							ImagePullPolicy: "IfNotPresent",
 							Resources: core.ResourceRequirements{
 								Requests: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("2"),
+									core.ResourceName("example.com/a"): resource.MustParse("2"),
 								},
 								Limits: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("1"),
+									core.ResourceName("example.com/a"): resource.MustParse("1"),
 								},
 							},
 						},
@@ -6763,7 +6763,7 @@ func TestValidatePod(t *testing.T) {
 				},
 			},
 		},
-		"invalid fractional opaque integer resource in container request": {
+		"invalid fractional extended resource in container request": {
 			expectedError: "must be an integer",
 			spec: core.Pod{
 				ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6775,7 +6775,7 @@ func TestValidatePod(t *testing.T) {
 							ImagePullPolicy: "IfNotPresent",
 							Resources: core.ResourceRequirements{
 								Requests: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("500m"),
+									core.ResourceName("example.com/a"): resource.MustParse("500m"),
 								},
 							},
 						},
@@ -6785,7 +6785,7 @@ func TestValidatePod(t *testing.T) {
 				},
 			},
 		},
-		"invalid fractional opaque integer resource in init container request": {
+		"invalid fractional extended resource in init container request": {
 			expectedError: "must be an integer",
 			spec: core.Pod{
 				ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6797,7 +6797,7 @@ func TestValidatePod(t *testing.T) {
 							ImagePullPolicy: "IfNotPresent",
 							Resources: core.ResourceRequirements{
 								Requests: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("500m"),
+									core.ResourceName("example.com/a"): resource.MustParse("500m"),
 								},
 							},
 						},
@@ -6808,7 +6808,7 @@ func TestValidatePod(t *testing.T) {
 				},
 			},
 		},
-		"invalid fractional opaque integer resource in container limit": {
+		"invalid fractional extended resource in container limit": {
 			expectedError: "must be an integer",
 			spec: core.Pod{
 				ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6820,10 +6820,10 @@ func TestValidatePod(t *testing.T) {
 							ImagePullPolicy: "IfNotPresent",
 							Resources: core.ResourceRequirements{
 								Requests: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
+									core.ResourceName("example.com/a"): resource.MustParse("5"),
 								},
 								Limits: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("2.5"),
+									core.ResourceName("example.com/a"): resource.MustParse("2.5"),
 								},
 							},
 						},
@@ -6833,7 +6833,7 @@ func TestValidatePod(t *testing.T) {
 				},
 			},
 		},
-		"invalid fractional opaque integer resource in init container limit": {
+		"invalid fractional extended resource in init container limit": {
 			expectedError: "must be an integer",
 			spec: core.Pod{
 				ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6845,10 +6845,10 @@ func TestValidatePod(t *testing.T) {
 							ImagePullPolicy: "IfNotPresent",
 							Resources: core.ResourceRequirements{
 								Requests: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
+									core.ResourceName("example.com/a"): resource.MustParse("2.5"),
 								},
 								Limits: core.ResourceList{
-									helper.OpaqueIntResourceName("A"): resource.MustParse("2.5"),
+									core.ResourceName("example.com/a"): resource.MustParse("2.5"),
 								},
 							},
 						},
@@ -9611,55 +9611,55 @@ func TestValidateNodeUpdate(t *testing.T) {
 		}, false},
 		{core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid-opaque-int-resources",
+				Name: "valid-extended-resources",
 			},
 		}, core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid-opaque-int-resources",
+				Name: "valid-extended-resources",
 			},
 			Status: core.NodeStatus{
 				Capacity: core.ResourceList{
 					core.ResourceName(core.ResourceCPU):    resource.MustParse("10"),
 					core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
-					helper.OpaqueIntResourceName("A"):      resource.MustParse("5"),
-					helper.OpaqueIntResourceName("B"):      resource.MustParse("10"),
+					core.ResourceName("example.com/a"):     resource.MustParse("5"),
+					core.ResourceName("example.com/b"):     resource.MustParse("10"),
 				},
 			},
 		}, true},
 		{core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "invalid-fractional-opaque-int-capacity",
+				Name: "invalid-fractional-extended-capacity",
 			},
 		}, core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "invalid-fractional-opaque-int-capacity",
+				Name: "invalid-fractional-extended-capacity",
 			},
 			Status: core.NodeStatus{
 				Capacity: core.ResourceList{
 					core.ResourceName(core.ResourceCPU):    resource.MustParse("10"),
 					core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
-					helper.OpaqueIntResourceName("A"):      resource.MustParse("500m"),
+					core.ResourceName("example.com/a"):     resource.MustParse("500m"),
 				},
 			},
 		}, false},
 		{core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "invalid-fractional-opaque-int-allocatable",
+				Name: "invalid-fractional-extended-allocatable",
 			},
 		}, core.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "invalid-fractional-opaque-int-allocatable",
+				Name: "invalid-fractional-extended-allocatable",
 			},
 			Status: core.NodeStatus{
 				Capacity: core.ResourceList{
 					core.ResourceName(core.ResourceCPU):    resource.MustParse("10"),
 					core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
-					helper.OpaqueIntResourceName("A"):      resource.MustParse("5"),
+					core.ResourceName("example.com/a"):     resource.MustParse("5"),
 				},
 				Allocatable: core.ResourceList{
 					core.ResourceName(core.ResourceCPU):    resource.MustParse("10"),
 					core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
-					helper.OpaqueIntResourceName("A"):      resource.MustParse("4.5"),
+					core.ResourceName("example.com/a"):     resource.MustParse("4.5"),
 				},
 			},
 		}, false},

plugin/pkg/scheduler/schedulercache/BUILD

-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -15,6 +9,7 @@ go_library(
         "util.go",
     ],
     importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache",
+    visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
         "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
@@ -35,7 +30,6 @@ go_test(
     importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache",
     library = ":go_default_library",
     deps = [
-        "//pkg/apis/core/v1/helper:go_default_library",
         "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//plugin/pkg/scheduler/util:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
@@ -58,4 +52,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

plugin/pkg/scheduler/schedulercache/cache_test.go

@@ -29,7 +29,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
 	schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util"
 )
@@ -53,9 +52,9 @@ func TestAssumePodScheduled(t *testing.T) {
 		makeBasePod(t, nodeName, "test-1", "100m", "500", "", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 80, Protocol: "TCP"}}),
 		makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 8080, Protocol: "TCP"}}),
 		makeBasePod(t, nodeName, "test-nonzero", "", "", "", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 80, Protocol: "TCP"}}),
-		makeBasePod(t, nodeName, "test", "100m", "500", "oir-foo:3", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 80, Protocol: "TCP"}}),
-		makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "oir-foo:5", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 8080, Protocol: "TCP"}}),
-		makeBasePod(t, nodeName, "test", "100m", "500", "random-invalid-oir-key:100", []v1.ContainerPort{{}}),
+		makeBasePod(t, nodeName, "test", "100m", "500", "example.com/foo:3", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 80, Protocol: "TCP"}}),
+		makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "example.com/foo:5", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 8080, Protocol: "TCP"}}),
+		makeBasePod(t, nodeName, "test", "100m", "500", "random-invalid-extended-key:100", []v1.ContainerPort{{}}),
 	}
 
 	tests := []struct {
@@ -113,7 +112,7 @@ func TestAssumePodScheduled(t *testing.T) {
 			requestedResource: &Resource{
 				MilliCPU:        100,
 				Memory:          500,
-				ScalarResources: map[v1.ResourceName]int64{"pod.alpha.kubernetes.io/opaque-int-resource-oir-foo": 3},
+				ScalarResources: map[v1.ResourceName]int64{"example.com/foo": 3},
 			},
 			nonzeroRequest: &Resource{
 				MilliCPU: 100,
@@ -129,7 +128,7 @@ func TestAssumePodScheduled(t *testing.T) {
 			requestedResource: &Resource{
 				MilliCPU:        300,
 				Memory:          1524,
-				ScalarResources: map[v1.ResourceName]int64{"pod.alpha.kubernetes.io/opaque-int-resource-oir-foo": 8},
+				ScalarResources: map[v1.ResourceName]int64{"example.com/foo": 8},
 			},
 			nonzeroRequest: &Resource{
 				MilliCPU: 300,
@@ -689,7 +688,7 @@ func TestNodeOperators(t *testing.T) {
 	mem_100m := resource.MustParse("100m")
 	cpu_half := resource.MustParse("500m")
 	mem_50m := resource.MustParse("50m")
-	resourceFooName := "pod.alpha.kubernetes.io/opaque-int-resource-foo"
+	resourceFooName := "example.com/foo"
 	resourceFoo := resource.MustParse("1")
 
 	tests := []struct {
@@ -896,25 +895,19 @@ type testingMode interface {
 	Fatalf(format string, args ...interface{})
 }
 
-func makeBasePod(t testingMode, nodeName, objName, cpu, mem, oir string, ports []v1.ContainerPort) *v1.Pod {
+func makeBasePod(t testingMode, nodeName, objName, cpu, mem, extended string, ports []v1.ContainerPort) *v1.Pod {
 	req := v1.ResourceList{}
 	if cpu != "" {
 		req = v1.ResourceList{
 			v1.ResourceCPU:    resource.MustParse(cpu),
 			v1.ResourceMemory: resource.MustParse(mem),
 		}
-		if oir != "" {
-			if len(strings.Split(oir, ":")) != 2 {
-				t.Fatalf("Invalid OIR string")
+		if extended != "" {
+			parts := strings.Split(extended, ":")
+			if len(parts) != 2 {
+				t.Fatalf("Invalid extended resource string: \"%s\"", extended)
 			}
-			var name v1.ResourceName
-			if strings.Split(oir, ":")[0] != "random-invalid-oir-key" {
-				name = v1helper.OpaqueIntResourceName(strings.Split(oir, ":")[0])
-			} else {
-				name = v1.ResourceName(strings.Split(oir, ":")[0])
-			}
-			quantity := resource.MustParse(strings.Split(oir, ":")[1])
-			req[name] = quantity
+			req[v1.ResourceName(parts[0])] = resource.MustParse(parts[1])
 		}
 	}
 	return &v1.Pod{

staging/src/k8s.io/api/core/v1/types.go

@@ -3981,8 +3981,6 @@ const (
 )
 
 const (
-	// Namespace prefix for opaque counted resources (alpha).
-	ResourceOpaqueIntPrefix = "pod.alpha.kubernetes.io/opaque-int-resource-"
 	// Default namespace prefix.
 	ResourceDefaultNamespacePrefix = "kubernetes.io/"
 	// Name prefix for huge page resources (alpha).

test/e2e/scheduling/BUILD

-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -14,7 +8,6 @@ go_library(
         "framework.go",
         "limit_range.go",
         "nvidia-gpus.go",
-        "opaque_resource.go",
         "predicates.go",
         "preemption.go",
         "priorities.go",
@@ -22,13 +15,12 @@ go_library(
         "resource_quota.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/scheduling",
+    visibility = ["//visibility:public"],
     deps = [
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/apis/core:go_default_library",
-        "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/quota/evaluator/core:go_default_library",
-        "//pkg/util/system:go_default_library",
         "//pkg/util/version:go_default_library",
         "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//test/e2e/common:go_default_library",
@@ -45,7 +37,6 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
@@ -54,25 +45,11 @@ go_library(
     ],
 )
 
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
-
 go_test(
     name = "go_default_test",
     srcs = ["taints_test.go"],
     importpath = "k8s.io/kubernetes/test/e2e/scheduling",
     library = ":go_default_library",
-    tags = ["e2e"],
     deps = [
         "//test/e2e/framework:go_default_library",
         "//test/utils:go_default_library",
@@ -87,3 +64,17 @@ go_test(
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
     ],
 )
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)