UPSTREAM: <carry>: skip openshift-apiserver served CRDs from crd-discovery-available posthook
@@ -70,6 +70,14 @@ var (
&metav1.APIGroup{},
&metav1.APIResourceList{},
}
+
+ // a list of CRDs served by Openshift API Server, which we can't wait for
+ // otherwise bootstrap fails, so we'll always ignore them.
+ skipOpenshiftAPIServerCRDs = sets.NewString(
+ "clusterresourcequotas.quota.openshift.io",
+ "rolebindingrestrictions.authorization.openshift.io",
+ "securitycontextconstraints.security.openshift.io",
+ )
)
func init() {
@@ -273,6 +281,9 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
if !apiextensions.IsCRDConditionTrue(crd, apiextensions.Established) {
continue
}
+ if skipOpenshiftAPIServerCRDs.Has(fmt.Sprintf("%s.%s", crd.Spec.Names.Plural, crd.Spec.Group)) {
+ continue
+ }
for _, version := range crd.Spec.Versions {
// Skip versions that are not served
if !version.Served {
