From 2560fa16d6f735585162f0c6deff3f607c375ee7 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Mon, 25 Nov 2019 20:35:19 +0100 Subject: [PATCH] Bug 1776100: don't install quota CRDs --- cmd/oc/oc.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cmd/oc/oc.go b/cmd/oc/oc.go index e5f7701582..1da7bd0d9e 100644 --- a/cmd/oc/oc.go +++ b/cmd/oc/oc.go @@ -27,7 +27,7 @@ import ( "github.com/openshift/api/network" "github.com/openshift/api/oauth" "github.com/openshift/api/project" - "github.com/openshift/api/quota" + quotav1 "github.com/openshift/api/quota/v1" "github.com/openshift/api/route" securityv1 "github.com/openshift/api/security/v1" "github.com/openshift/api/template" @@ -79,7 +79,7 @@ func main() { utilruntime.Must(network.Install(scheme.Scheme)) utilruntime.Must(oauth.Install(scheme.Scheme)) utilruntime.Must(project.Install(scheme.Scheme)) - utilruntime.Must(quota.Install(scheme.Scheme)) + utilruntime.Must(installNonCRDQuota(scheme.Scheme)) utilruntime.Must(route.Install(scheme.Scheme)) utilruntime.Must(installNonCRDSecurity(scheme.Scheme)) utilruntime.Must(template.Install(scheme.Scheme)) @@ -95,7 +95,7 @@ func main() { utilruntime.Must(network.Install(legacyscheme.Scheme)) utilruntime.Must(oauth.Install(legacyscheme.Scheme)) utilruntime.Must(project.Install(legacyscheme.Scheme)) - utilruntime.Must(quota.Install(legacyscheme.Scheme)) + utilruntime.Must(installNonCRDQuota(legacyscheme.Scheme)) utilruntime.Must(route.Install(legacyscheme.Scheme)) utilruntime.Must(installNonCRDSecurity(legacyscheme.Scheme)) utilruntime.Must(template.Install(legacyscheme.Scheme)) @@ -123,3 +123,15 @@ func installNonCRDSecurity(scheme *apimachineryruntime.Scheme) error { metav1.AddToGroupVersion(scheme, securityv1.GroupVersion) return nil } + +func installNonCRDQuota(scheme *apimachineryruntime.Scheme) error { + scheme.AddKnownTypes(securityv1.GroupVersion, + "av1.AppliedClusterResourceQuota{}, + "av1.AppliedClusterResourceQuotaList{}, + ) + if err := corev1.AddToScheme(scheme); err != nil { + return err + } + metav1.AddToGroupVersion(scheme, quotav1.GroupVersion) + return nil +}