Merge pull request #36 from kubenav/fix-aws-integration

Fix adding EKS and GKE clusters
kubenav · Feb 29, 2020 · e0444d5 · e0444d5
2 parents 649dead + 5aab556
commit e0444d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/pages/ClustersAWS.tsx b/src/pages/ClustersAWS.tsx
@@ -63,9 +63,11 @@ const ClustersAWS: React.FunctionComponent<IClustersAWSProps> = ({ match, histor
             match.params.region
           );
 
+          const tmpClusters: ICluster[] = [];
+
           // eslint-disable-next-line
           awsClusters.map((cluster) => {
-            setClusters([...clusters, {
+            tmpClusters.push({
               id: `aws_${match.params.region}_${cluster.Name}`,
               name: `aws_${match.params.region}_${cluster.Name}`,
               url: `${cluster.Endpoint}`,
@@ -77,8 +79,10 @@ const ClustersAWS: React.FunctionComponent<IClustersAWSProps> = ({ match, histor
               password: '',
               authProvider: 'aws',
               namespace: 'default',
-            }]);
+            });
           });
+
+          setClusters(tmpClusters);
         }
       } catch (err) {
         setError(err.message);

diff --git a/src/pages/ClustersGoogle.tsx b/src/pages/ClustersGoogle.tsx
@@ -60,10 +60,12 @@ const ClustersGoogle: React.FunctionComponent<IClustersGoogleProps> = ({ locatio
           for (let project of projects) {
             const projectClusters = await getGoogleClusters(tokens.access_token, project.projectId);
 
+            const tmpClusters: ICluster[] = [];
+
             if (projectClusters) {
               // eslint-disable-next-line
               projectClusters.map((cluster) => {
-                setClusters([...clusters, {
+                tmpClusters.push({
                   id: `gke_${project.projectId}_${cluster.location}_${cluster.name}`,
                   name: `gke_${project.projectId}_${cluster.location}_${cluster.name}`,
                   url: `https://${cluster.endpoint}`,
@@ -75,8 +77,10 @@ const ClustersGoogle: React.FunctionComponent<IClustersGoogleProps> = ({ locatio
                   password: cluster.masterAuth.password ? cluster.masterAuth.password : '',
                   authProvider: 'google',
                   namespace: 'default',
-                }]);
+                });
               });
+
+              setClusters(tmpClusters);
             }
           }
         }