Merge pull request #668 from rawmind0/timeout

Added timeout to CatalogV2Client function when getting new catalog v2 client

Author: rawmind0

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.15.1 (May 21, 2021)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+
+
+BUG FIXES:
+
+* Added timeout to `CatalogV2Client` function when getting new catalog v2 client
+
 ## 1.15.0 (May 20, 2021)
 
 FEATURES:
@@ -12,7 +26,7 @@ FEATURES:
 
 ENHANCEMENTS:
 
-
+* Added timeout to `CatalogV2Client` function when getting new catalog v2 client
 
 BUG FIXES:
 

rancher2/config.go

@@ -294,15 +294,26 @@ func (c *Config) CatalogV2Client(id string) (*clientbase.APIBaseClient, error) {
 		return nil, err
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
+	defer cancel()
 	// Setup the cluster client
 	options := c.CreateClientOpts()
 	options.URL = options.URL + "/k8s/clusters/" + id + rancher2CatalogAPIVersion
-	cli, err := clientbase.NewAPIClient(options)
-	if err != nil {
-		return nil, err
+	for {
+		cli, err := clientbase.NewAPIClient(options)
+		if err == nil {
+			c.Client.CatalogV2[id] = &cli
+			return c.Client.CatalogV2[id], err
+		}
+		if !IsServerError(err) && !IsUnknownSchemaType(err) {
+			return nil, err
+		}
+		select {
+		case <-time.After(rancher2RetriesWait * time.Second):
+		case <-ctx.Done():
+			return nil, err
+		}
 	}
-	c.Client.CatalogV2[id] = &cli
-	return c.Client.CatalogV2[id], err
 }
 
 // ClusterClient creates a Rancher client scoped to a Cluster API
@@ -730,13 +741,13 @@ func (c *Config) getObjectV2ByID(clusterID, id, APIType string, resp interface{}
 		return fmt.Errorf("Object API V2 type is nil")
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
-	defer cancel()
-
 	client, err := c.CatalogV2Client(clusterID)
 	if err != nil {
 		return err
 	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
+	defer cancel()
 	for {
 		err = client.ByID(APIType, id, resp)
 		if err == nil {