From d2daa4e2aca57a5c3ff15a6384c9d647b934b738 Mon Sep 17 00:00:00 2001 From: "Song.Jin" Date: Fri, 2 Nov 2018 20:24:40 +1100 Subject: [PATCH] allow it to disable CRD creation --- storage/kubernetes/storage.go | 56 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go index fa72e717..4c9399a0 100644 --- a/storage/kubernetes/storage.go +++ b/storage/kubernetes/storage.go @@ -40,6 +40,7 @@ type Config struct { InCluster bool `json:"inCluster"` KubeConfigFile string `json:"kubeConfigFile"` UseTPR bool `json:"useTPR"` // Flag option to use TPRs instead of CRDs + NoCrdCreation bool `json:"noCrdCreation"` // Flag to disable creation of CRDs at cluster level } // Open returns a storage using Kubernetes third party resource. @@ -85,37 +86,38 @@ func (c *Config) open(logger logrus.FieldLogger, waitForResources bool) (*client } ctx, cancel := context.WithCancel(context.Background()) + if !c.NoCrdCreation { + logger.Info("creating custom Kubernetes resources") + if !cli.registerCustomResources(c.UseTPR) { + if waitForResources { + cancel() + return nil, fmt.Errorf("failed creating custom resources") + } - logger.Info("creating custom Kubernetes resources") - if !cli.registerCustomResources(c.UseTPR) { - if waitForResources { - cancel() - return nil, fmt.Errorf("failed creating custom resources") + // Try to synchronously create the custom resources once. This doesn't mean + // they'll immediately be available, but ensures that the client will actually try + // once. + logger.Errorf("failed creating custom resources: %v", err) + go func() { + for { + if cli.registerCustomResources(c.UseTPR) { + return + } + + select { + case <-ctx.Done(): + return + case <-time.After(30 * time.Second): + } + } + }() } - // Try to synchronously create the custom resources once. This doesn't mean - // they'll immediately be available, but ensures that the client will actually try - // once. - logger.Errorf("failed creating custom resources: %v", err) - go func() { - for { - if cli.registerCustomResources(c.UseTPR) { - return - } - - select { - case <-ctx.Done(): - return - case <-time.After(30 * time.Second): - } + if waitForResources { + if err := cli.waitForCRDs(ctx); err != nil { + cancel() + return nil, err } - }() - } - - if waitForResources { - if err := cli.waitForCRDs(ctx); err != nil { - cancel() - return nil, err } }