UPSTREAM: <carry>: kube-apiserver: priorize some CRD groups over others

Origin-commit: 10c14ca7ae63428823e58790c16078d8094e4b95
openshift · Sep 7, 2021 · 048526e · 048526e
1 parent 3a08073
commit 048526e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pkg/controlplane/controller/crdregistration/crdregistration_controller.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go
@@ -221,8 +221,8 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou
 				Spec: v1.APIServiceSpec{
 					Group:                groupVersion.Group,
 					Version:              groupVersion.Version,
-					GroupPriorityMinimum: 1000, // CRDs should have relatively low priority
-					VersionPriority:      100,  // CRDs will be sorted by kube-like versions like any other APIService with the same VersionPriority
+					GroupPriorityMinimum: getGroupPriorityMin(groupVersion.Group), // CRDs should have relatively low priority
+					VersionPriority:      100,                                     // CRDs will be sorted by kube-like versions like any other APIService with the same VersionPriority
 				},
 			})
 			return nil

diff --git a/pkg/controlplane/controller/crdregistration/patch.go b/pkg/controlplane/controller/crdregistration/patch.go
@@ -0,0 +1,12 @@
+package crdregistration
+
+func getGroupPriorityMin(group string) int32 {
+	switch group {
+	case "config.openshift.io":
+		return 1100
+	case "operator.openshift.io":
+		return 1080
+	default:
+		return 1000
+	}
+}