From cd66c618030ab0e40bf03f2fd23eb7fafff2cde5 Mon Sep 17 00:00:00 2001 From: huangwei Date: Thu, 31 Aug 2023 01:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20KCP=20Controller=20reconci?= =?UTF-8?q?le=20always=20return=20error=20when=20workload=20cluster=20is?= =?UTF-8?q?=20unreachable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controlplane/kubeadm/internal/cluster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controlplane/kubeadm/internal/cluster.go b/controlplane/kubeadm/internal/cluster.go index 3f4b7721ccba..b732bf9777bf 100644 --- a/controlplane/kubeadm/internal/cluster.go +++ b/controlplane/kubeadm/internal/cluster.go @@ -107,7 +107,7 @@ func (m *Management) GetWorkloadCluster(ctx context.Context, clusterKey client.O // TODO(chuckha): memoize this function. The workload client only exists as long as a reconciliation loop. restConfig, err := m.Tracker.GetRESTConfig(ctx, clusterKey) if err != nil { - return nil, err + return nil, &RemoteClusterConnectionError{Name: clusterKey.String(), Err: err} } restConfig = rest.CopyConfig(restConfig) restConfig.Timeout = 30 * time.Second @@ -118,12 +118,12 @@ func (m *Management) GetWorkloadCluster(ctx context.Context, clusterKey client.O c, err := m.Tracker.GetClient(ctx, clusterKey) if err != nil { - return nil, err + return nil, &RemoteClusterConnectionError{Name: clusterKey.String(), Err: err} } clientConfig, err := m.Tracker.GetRESTConfig(ctx, clusterKey) if err != nil { - return nil, err + return nil, &RemoteClusterConnectionError{Name: clusterKey.String(), Err: err} } // Make sure we use the same CA and Host as the client.