Merge pull request #11510 from k8s-infra-cherrypick-robot/cherry-pick-11502-to-release-1.9

[release-1.9] 🌱 KCP: make EtcdMemberHealthy less verbose on client creation failures

Author: k8s-ci-robot

controlplane/kubeadm/internal/etcd_client_generator.go

@@ -69,7 +69,7 @@ func NewEtcdClientGenerator(restConfig *rest.Config, tlsConfig *tls.Config, etcd
 func (c *EtcdClientGenerator) forFirstAvailableNode(ctx context.Context, nodeNames []string) (*etcd.Client, error) {
 	// This is an additional safeguard for avoiding this func to return nil, nil.
 	if len(nodeNames) == 0 {
-		return nil, errors.New("invalid argument: forLeader can't be called with an empty list of nodes")
+		return nil, errors.New("invalid argument: forFirstAvailableNode can't be called with an empty list of nodes")
 	}
 
 	// Loop through the existing control plane nodes.

controlplane/kubeadm/internal/etcd_client_generator_test.go

@@ -63,7 +63,7 @@ func TestFirstAvailableNode(t *testing.T) {
 			name:        "Fails when called with an empty node list",
 			nodes:       nil,
 			cc:          nil,
-			expectedErr: "invalid argument: forLeader can't be called with an empty list of nodes",
+			expectedErr: "invalid argument: forFirstAvailableNode can't be called with an empty list of nodes",
 		},
 		{
 			name:  "Returns error from client",
@@ -97,7 +97,7 @@ func TestFirstAvailableNode(t *testing.T) {
 
 			if tt.expectedErr != "" {
 				g.Expect(err).To(HaveOccurred())
-				g.Expect(err.Error()).Should(Equal(tt.expectedErr))
+				g.Expect(err.Error()).Should(BeComparableTo(tt.expectedErr))
 			} else {
 				g.Expect(*client).Should(BeComparableTo(tt.expectedClient))
 			}

controlplane/kubeadm/internal/workload_cluster_conditions.go

@@ -316,6 +316,17 @@ func (w *Workload) updateManagedEtcdConditions(ctx context.Context, controlPlane
 	return retryableError
 }
 
+func unwrapAll(err error) error {
+	for {
+		newErr := errors.Unwrap(err)
+		if newErr == nil {
+			break
+		}
+		err = newErr
+	}
+	return err
+}
+
 func (w *Workload) getCurrentEtcdMembers(ctx context.Context, machine *clusterv1.Machine, nodeName string) ([]*etcd.Member, error) {
 	// Create the etcd Client for the etcd Pod scheduled on the Node
 	etcdClient, err := w.etcdClientGenerator.forFirstAvailableNode(ctx, []string{nodeName})
@@ -326,7 +337,7 @@ func (w *Workload) getCurrentEtcdMembers(ctx context.Context, machine *clusterv1
 			Type:    controlplanev1.KubeadmControlPlaneMachineEtcdMemberHealthyV1Beta2Condition,
 			Status:  metav1.ConditionUnknown,
 			Reason:  controlplanev1.KubeadmControlPlaneMachineEtcdMemberInspectionFailedV1Beta2Reason,
-			Message: fmt.Sprintf("Failed to connect to the etcd Pod on the %s Node: %s", nodeName, err),
+			Message: fmt.Sprintf("Failed to connect to the etcd Pod on the %s Node: %s", nodeName, unwrapAll(err)),
 		})
 		return nil, errors.Wrapf(err, "failed to get current etcd members: failed to connect to the etcd Pod on the %s Node", nodeName)
 	}