Merge pull request #21530 from k8s-infra-cherrypick-robot/cherry-pick-21528-to-release-3.6

[release-3.6] Fix etcdctl endpoint command with option --cluster when auth is enabled

Author: ahrtr

etcdctl/ctlv3/command/ep_command.go

@@ -251,6 +251,7 @@ func endpointsFromCluster(cmd *cobra.Command) []string {
 	}
 
 	sec := secureCfgFromCmd(cmd)
+	au := authCfgFromCmd(cmd)
 	dt := dialTimeoutFromCmd(cmd)
 	ka := keepAliveTimeFromCmd(cmd)
 	kat := keepAliveTimeoutFromCmd(cmd)
@@ -267,6 +268,7 @@ func endpointsFromCluster(cmd *cobra.Command) []string {
 		KeepAliveTime:    ka,
 		KeepAliveTimeout: kat,
 		Secure:           sec,
+		Auth:             au,
 	}, lg)
 	if err != nil {
 		cobrautl.ExitWithError(cobrautl.ExitError, err)

tests/e2e/ctl_v3_auth_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -315,6 +316,16 @@ func authTestEndpointHealth(cx ctlCtx) {
 			require.NoErrorf(cx.t, lerr, "endpoint health should fail with permission denied error")
 		}
 	}(cx)
+
+	cmdArgs := append(cx.PrefixArgs(), "endpoint", "health", "--user=root:root", "--cluster")
+	proc, err := e2e.SpawnCmd(cmdArgs, cx.envMap)
+	require.NoError(cx.t, err)
+	defer func() {
+		require.NoError(cx.t, proc.Close())
+	}()
+	proc.Wait()
+	response := strings.Join(proc.Lines(), "\n")
+	require.Contains(cx.t, response, "is healthy: successfully")
 }
 
 func certCNAndUsername(cx ctlCtx, noPassword bool) {