fix panic when encoutering malformed cluster config

zqzten · zqzten · commit c05ce64e8871 · 2021-11-18T15:30:37.000+08:00
diff --git a/pkg/controller/kubefedcluster/clusterclient.go b/pkg/controller/kubefedcluster/clusterclient.go
@@ -75,8 +75,8 @@ func NewClusterClientSet(c *fedv1b1.KubeFedCluster, client generic.Client, fedNa
 		return &clusterClientSet, err
 	}
 	clusterConfig.Timeout = timeout
-	clusterClientSet.kubeClient = kubeclientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
-	return &clusterClientSet, nil
+	clusterClientSet.kubeClient, err = kubeclientset.NewForConfig(restclient.AddUserAgent(clusterConfig, UserAgentName))
+	return &clusterClientSet, err
 }
 
 // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz"

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ func NewClusterClientSet(c *fedv1b1.KubeFedCluster, client generic.Client, fedNa`
`75`	`75`	`return &clusterClientSet, err`
`76`	`76`	`}`
`77`	`77`	`clusterConfig.Timeout = timeout`
`78`		`- clusterClientSet.kubeClient = kubeclientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))`
`79`		`- return &clusterClientSet, nil`
	`78`	`+ clusterClientSet.kubeClient, err = kubeclientset.NewForConfig(restclient.AddUserAgent(clusterConfig, UserAgentName))`
	`79`	`+ return &clusterClientSet, err`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz"`