UPSTREAM: <carry>: necessary fixes

openshift · Jul 1, 2024 · 7adf4cc · 7adf4cc
1 parent 28550a5
commit 7adf4cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/openshift-hack/e2e/include.go b/openshift-hack/e2e/include.go
@@ -19,5 +19,5 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/node"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"
 	_ "k8s.io/kubernetes/test/e2e/storage"
-	_ "k8s.io/kubernetes/test/e2e/storage/csi_mock"
+	_ "k8s.io/kubernetes/test/e2e/storage/csimock"
 )
diff --git a/openshift-kube-apiserver/admission/admissionenablement/admission.go b/openshift-kube-apiserver/admission/admissionenablement/admission.go
@@ -1,8 +1,6 @@
 package admissionenablement
 
 import (
-	"k8s.io/apimachinery/pkg/util/sets"
-
 	"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
 	"k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration"
 )
@@ -13,5 +11,5 @@ func InstallOpenShiftAdmissionPlugins(o *options.ServerRunOptions) {
 	RegisterOpenshiftKubeAdmissionPlugins(o.Admission.GenericAdmission.Plugins)
 	customresourcevalidationregistration.RegisterCustomResourceValidation(o.Admission.GenericAdmission.Plugins)
 	existingDefaultOff := o.Admission.GenericAdmission.DefaultOffPlugins
-	o.Admission.GenericAdmission.DefaultOffPlugins = sets.StringKeySet(NewDefaultOffPluginsFunc(existingDefaultOff)())
+	o.Admission.GenericAdmission.DefaultOffPlugins = NewDefaultOffPluginsFunc(existingDefaultOff)()
 }
diff --git a/openshift-kube-apiserver/admission/admissionenablement/register.go b/openshift-kube-apiserver/admission/admissionenablement/register.go
@@ -113,7 +113,7 @@ func NewOrderedKubeAdmissionPlugins(kubeAdmissionOrder []string) []string {
 	return ret
 }
 
-func NewDefaultOffPluginsFunc(kubeDefaultOffAdmission sets.String) func() sets.Set[string] {
+func NewDefaultOffPluginsFunc(kubeDefaultOffAdmission sets.Set[string]) func() sets.Set[string] {
 	return func() sets.Set[string] {
 		kubeOff := sets.New[string](kubeDefaultOffAdmission.UnsortedList()...)
 		kubeOff.Delete(additionalDefaultOnPlugins.List()...)