Add resource v1beta2 API

Author: mortent

api/api-rules/violation_exceptions.list

@@ -63,6 +63,11 @@ API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,IntV
 API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,StringValue
 API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,VersionValue
 API rule violation: names_match,k8s.io/api/resource/v1beta1,NetworkDeviceData,IPs
+API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,BoolValue
+API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,IntValue
+API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,StringValue
+API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,VersionValue
+API rule violation: names_match,k8s.io/api/resource/v1beta2,NetworkDeviceData,IPs
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource

cmd/kube-apiserver/app/aggregator.go

@@ -51,6 +51,7 @@ var apiVersionPriorities = merge(controlplaneapiserver.DefaultGenericAPIServiceP
 	{Group: "node.k8s.io", Version: "v1"}:             {Group: 16300, Version: 15},
 	{Group: "node.k8s.io", Version: "v1alpha1"}:       {Group: 16300, Version: 1},
 	{Group: "node.k8s.io", Version: "v1beta1"}:        {Group: 16300, Version: 9},
+	{Group: "resource.k8s.io", Version: "v1beta2"}:    {Group: 16200, Version: 15},
 	{Group: "resource.k8s.io", Version: "v1beta1"}:    {Group: 16200, Version: 9},
 	{Group: "resource.k8s.io", Version: "v1alpha3"}:   {Group: 16200, Version: 1},
 	// Append a new group to the end of the list if unsure.

hack/lib/init.sh

@@ -94,6 +94,7 @@ coordination.k8s.io/v1beta1 \
 coordination.k8s.io/v1 \
 discovery.k8s.io/v1 \
 discovery.k8s.io/v1beta1 \
+resource.k8s.io/v1beta2 \
 resource.k8s.io/v1beta1 \
 resource.k8s.io/v1alpha3 \
 extensions/v1beta1 \

pkg/api/testing/defaulting_test.go

@@ -149,6 +149,12 @@ func TestDefaulting(t *testing.T) {
 		{Group: "resource.k8s.io", Version: "v1beta1", Kind: "ResourceClaimTemplateList"}:                          {},
 		{Group: "resource.k8s.io", Version: "v1beta1", Kind: "ResourceSlice"}:                                      {},
 		{Group: "resource.k8s.io", Version: "v1beta1", Kind: "ResourceSliceList"}:                                  {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceClaim"}:                                      {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceClaimList"}:                                  {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceClaimTemplate"}:                              {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceClaimTemplateList"}:                          {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceSlice"}:                                      {},
+		{Group: "resource.k8s.io", Version: "v1beta2", Kind: "ResourceSliceList"}:                                  {},
 		{Group: "admissionregistration.k8s.io", Version: "v1alpha1", Kind: "ValidatingAdmissionPolicy"}:            {},
 		{Group: "admissionregistration.k8s.io", Version: "v1alpha1", Kind: "ValidatingAdmissionPolicyList"}:        {},
 		{Group: "admissionregistration.k8s.io", Version: "v1alpha1", Kind: "ValidatingAdmissionPolicyBinding"}:     {},

pkg/apis/resource/fuzzer/fuzzer.go

@@ -32,7 +32,7 @@ import (
 // leads to errors during roundtrip tests.
 var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
-		func(r *resource.DeviceRequest, c randfill.Continue) {
+		func(r *resource.ExactDeviceRequest, c randfill.Continue) {
 			c.FillNoCustom(r) // fuzz self without calling this function again
 
 			if r.AllocationMode == "" {
@@ -44,6 +44,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 		},
 		func(r *resource.DeviceSubRequest, c randfill.Continue) {
 			c.FillNoCustom(r) // fuzz self without calling this function again
+
 			if r.AllocationMode == "" {
 				r.AllocationMode = []resource.DeviceAllocationMode{
 					resource.DeviceAllocationModeAll,
@@ -94,5 +95,16 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 			// might be valid JSON which changes during re-encoding.
 			r.Data = &runtime.RawExtension{Raw: []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`)}
 		},
+		func(r *resource.ResourceSliceSpec, c randfill.Continue) {
+			c.FillNoCustom(r)
+			// Setting AllNodes to false is not allowed. It must be
+			// either true or nil.
+			if r.AllNodes != nil && !*r.AllNodes {
+				r.AllNodes = nil
+			}
+			if r.NodeName != nil && *r.NodeName == "" {
+				r.NodeName = nil
+			}
+		},
 	}
 }

pkg/apis/resource/install/install.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/kubernetes/pkg/apis/resource"
 	"k8s.io/kubernetes/pkg/apis/resource/v1alpha3"
 	"k8s.io/kubernetes/pkg/apis/resource/v1beta1"
+	"k8s.io/kubernetes/pkg/apis/resource/v1beta2"
 )
 
 func init() {
@@ -36,5 +37,8 @@ func Install(scheme *runtime.Scheme) {
 	utilruntime.Must(resource.AddToScheme(scheme))
 	utilruntime.Must(v1alpha3.AddToScheme(scheme))
 	utilruntime.Must(v1beta1.AddToScheme(scheme))
-	utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion, v1alpha3.SchemeGroupVersion))
+	utilruntime.Must(v1beta2.AddToScheme(scheme))
+	// TODO(https://github.com/kubernetes/kubernetes/issues/129889) We should
+	// change the serialization version to v1beta2 for 1.34.
+	utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion, v1beta2.SchemeGroupVersion, v1alpha3.SchemeGroupVersion))
 }