Skip to content

Commit e8adb5c

Browse files
committed
Remove check for duplicate groups for FeatureGates
1 parent dea2e4f commit e8adb5c

File tree

2 files changed

+0
-37
lines changed

2 files changed

+0
-37
lines changed

pkg/operator/configobservation/apienablement/observe_runtime_config.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package apienablement
33
import (
44
"fmt"
55
"sort"
6-
"strings"
76

87
"github.com/blang/semver/v4"
98
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -14,7 +13,6 @@ import (
1413
"github.com/openshift/library-go/pkg/operator/configobserver"
1514
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
1615
"github.com/openshift/library-go/pkg/operator/events"
17-
"github.com/openshift/library-go/pkg/operator/v1helpers"
1816
)
1917

2018
var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
@@ -43,15 +41,6 @@ func getGroupVersionByFeatureGate(groupVersionsByFeatureGate map[configv1.Featur
4341
}
4442
}
4543
}
46-
var errs []error
47-
for group, versions := range groupByVersions {
48-
if len(versions) > 1 {
49-
errs = append(errs, fmt.Errorf("found a duplicate group %v for FeatureGates, versions found: %v", group, strings.Join(versions, ",")))
50-
}
51-
}
52-
if len(errs) > 0 {
53-
return nil, v1helpers.NewMultiLineAggregate(errs)
54-
}
5544
return result, nil
5645
}
5746

pkg/operator/configobservation/apienablement/observe_runtime_config_test.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -231,32 +231,6 @@ func TestGroupVersionsByFeatureGate(t *testing.T) {
231231
},
232232
expectedGroupVersions: map[configv1.FeatureGateName][]schema.GroupVersion{},
233233
},
234-
{
235-
name: "intersection of group versions should result in an error",
236-
kubeVersion: semver.MustParse("1.31.0"),
237-
groupVersionsByFeatureGate: map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
238-
"DynamicResourceAllocation": {
239-
{KubeVersionRange: semver.MustParseRange("< 1.32.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha2"}},
240-
{KubeVersionRange: semver.MustParseRange(">= 1.30.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha3"}},
241-
{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha2"}},
242-
},
243-
},
244-
expectErrors: true,
245-
},
246-
{
247-
name: "intersection of group versions across feature gates should result in an error",
248-
kubeVersion: semver.MustParse("1.31.0"),
249-
groupVersionsByFeatureGate: map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
250-
"DynamicResourceAllocation": {
251-
{KubeVersionRange: semver.MustParseRange("< 1.32.0"), GroupVersion: schema.GroupVersion{Group: "resource-a.k8s.io", Version: "v1alpha2"}},
252-
{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha2"}},
253-
},
254-
"DRA": {
255-
{GroupVersion: schema.GroupVersion{Group: "resource-b.k8s.io", Version: "v1alpha1"}},
256-
},
257-
},
258-
expectErrors: true,
259-
},
260234
} {
261235
t.Run(tc.name, func(t *testing.T) {
262236
actual, err := getGroupVersionByFeatureGate(tc.groupVersionsByFeatureGate, tc.kubeVersion)

0 commit comments

Comments
 (0)