[camel-k] branch master updated: Skip CRD installation if output flag enabled

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e3fa94  Skip CRD installation if output flag enabled
0e3fa94 is described below

commit 0e3fa94f122b37e2830b939781619aa996e30b44
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Jan 5 11:11:02 2021 +0100

    Skip CRD installation if output flag enabled
    
    Closes #886
---
 pkg/install/cluster.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index afe7bf7..14b53a4 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -80,9 +80,12 @@ func SetupClusterWideResourcesOrCollect(ctx context.Context, clientProvider clie
 		return err
 	}
 
-	// Wait for all CRDs to be installed before proceeding
-	if err := WaitForAllCRDInstallation(ctx, clientProvider, 25*time.Second); err != nil {
-		return err
+	// Don't wait if we're just collecting resources
+	if collection == nil {
+		// Wait for all CRDs to be installed before proceeding
+		if err := WaitForAllCRDInstallation(ctx, clientProvider, 25*time.Second); err != nil {
+			return err
+		}
 	}
 
 	// Installing ClusterRole