From 38caa77b3e0c618861a8399219c5476f06f469a7 Mon Sep 17 00:00:00 2001 From: Ozben Evren Date: Thu, 28 Feb 2019 12:19:50 -0800 Subject: [PATCH] Wire-up excluded resource types list to the CRD check and update logging (#12143) * - Wire-up excluded resource types list to the CRD check. - Update logging. * Revert copyright. * Revert copyright. --- galley/pkg/server/server.go | 4 ++-- galley/pkg/source/kube/schema/check/check.go | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/galley/pkg/server/server.go b/galley/pkg/server/server.go index 6e9236c73359..8f34a5d46a3c 100644 --- a/galley/pkg/server/server.go +++ b/galley/pkg/server/server.go @@ -127,11 +127,11 @@ func newServer(a *Args, p patchTable) (*Server, error) { return nil, err } if !a.DisableResourceReadyCheck { - if err := p.verifyResourceTypesPresence(k, kubeMeta.Types.All()); err != nil { + if err := p.verifyResourceTypesPresence(k, sourceSchema.All()); err != nil { return nil, err } } else { - found, err := p.findSupportedResources(k, kubeMeta.Types.All()) + found, err := p.findSupportedResources(k, sourceSchema.All()) if err != nil { return nil, err } diff --git a/galley/pkg/source/kube/schema/check/check.go b/galley/pkg/source/kube/schema/check/check.go index 224d1e89eb8a..22923537532b 100644 --- a/galley/pkg/source/kube/schema/check/check.go +++ b/galley/pkg/source/kube/schema/check/check.go @@ -128,9 +128,12 @@ func resourceTypesPresence(cs clientset.Interface, specs []sourceSchema.Resource if err != nil { var notFound []string - for plural := range search { - notFound = append(notFound, plural) + for _, spec := range search { + notFound = append(notFound, spec.Kind) } + log.Scope.Errorf("Expected resources (CRDs) not found: %v", notFound) + log.Scope.Error("To stop Galley from waiting for these resources (CRDs), consider using the --excludedResourceKinds flag") + return fmt.Errorf("%v: the following resource type(s) were not found: %v", err, notFound) }