Merge pull request #1777 from bertinatto/dra-for-4.19

CNTRLPLANE-1: Add resource.k8s.io/v1beta1 API for Kubernetes 1.32

Author: openshift-merge-bot[bot]

pkg/operator/configobservation/apienablement/observe_runtime_config.go

@@ -3,7 +3,6 @@ package apienablement
 import (
 	"fmt"
 	"sort"
-	"strings"
 
 	"github.com/blang/semver/v4"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -14,14 +13,14 @@ import (
 	"github.com/openshift/library-go/pkg/operator/configobserver"
 	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/events"
-	"github.com/openshift/library-go/pkg/operator/v1helpers"
 )
 
 var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
 	"ValidatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}}},
 	"DynamicResourceAllocation": {
 		{KubeVersionRange: semver.MustParseRange("< 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha2"}},
 		{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha3"}},
+		{KubeVersionRange: semver.MustParseRange(">= 1.32.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1beta1"}},
 	},
 	"VolumeAttributesClass": {{GroupVersion: schema.GroupVersion{Group: "storage.k8s.io", Version: "v1beta1"}}},
 }
@@ -42,15 +41,6 @@ func getGroupVersionByFeatureGate(groupVersionsByFeatureGate map[configv1.Featur
 			}
 		}
 	}
-	var errs []error
-	for group, versions := range groupByVersions {
-		if len(versions) > 1 {
-			errs = append(errs, fmt.Errorf("found a duplicate group %v for FeatureGates, versions found: %v", group, strings.Join(versions, ",")))
-		}
-	}
-	if len(errs) > 0 {
-		return nil, v1helpers.NewMultiLineAggregate(errs)
-	}
 	return result, nil
 }
 

pkg/operator/configobservation/apienablement/observe_runtime_config_test.go

@@ -231,32 +231,6 @@ func TestGroupVersionsByFeatureGate(t *testing.T) {
 			},
 			expectedGroupVersions: map[configv1.FeatureGateName][]schema.GroupVersion{},
 		},
-		{
-			name:        "intersection of group versions should result in an error",
-			kubeVersion: semver.MustParse("1.31.0"),
-			groupVersionsByFeatureGate: map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
-				"DynamicResourceAllocation": {
-					{KubeVersionRange: semver.MustParseRange("< 1.32.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha2"}},
-					{KubeVersionRange: semver.MustParseRange(">= 1.30.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha3"}},
-					{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha2"}},
-				},
-			},
-			expectErrors: true,
-		},
-		{
-			name:        "intersection of group versions across feature gates should result in an error",
-			kubeVersion: semver.MustParse("1.31.0"),
-			groupVersionsByFeatureGate: map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
-				"DynamicResourceAllocation": {
-					{KubeVersionRange: semver.MustParseRange("< 1.32.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha2"}},
-					{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha2"}},
-				},
-				"DRA": {
-					{GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha1"}},
-				},
-			},
-			expectErrors: true,
-		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			actual, err := getGroupVersionByFeatureGate(tc.groupVersionsByFeatureGate, tc.kubeVersion)