From d2d9b1e49eb40d1112817a01163a764eaa645eff Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Thu, 11 Mar 2021 16:13:29 -0600 Subject: [PATCH] Stop outputting "--concierge-mode" from "pinniped get kubeconfig". Signed-off-by: Matt Moyer --- cmd/pinniped/cmd/kubeconfig.go | 1 - cmd/pinniped/cmd/kubeconfig_test.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/cmd/pinniped/cmd/kubeconfig.go b/cmd/pinniped/cmd/kubeconfig.go index cde12fffa..0528bffac 100644 --- a/cmd/pinniped/cmd/kubeconfig.go +++ b/cmd/pinniped/cmd/kubeconfig.go @@ -230,7 +230,6 @@ func runGetKubeconfig(ctx context.Context, out io.Writer, deps kubeconfigDeps, f "--concierge-authenticator-type="+flags.concierge.authenticatorType, "--concierge-endpoint="+flags.concierge.endpoint, "--concierge-ca-bundle-data="+base64.StdEncoding.EncodeToString(flags.concierge.caBundle), - "--concierge-mode="+flags.concierge.mode.String(), ) // Point kubectl at the concierge endpoint. diff --git a/cmd/pinniped/cmd/kubeconfig_test.go b/cmd/pinniped/cmd/kubeconfig_test.go index 7a200c6fe..f3b27d5d9 100644 --- a/cmd/pinniped/cmd/kubeconfig_test.go +++ b/cmd/pinniped/cmd/kubeconfig_test.go @@ -608,7 +608,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=webhook - --concierge-endpoint=https://fake-server-url-value - --concierge-ca-bundle-data=ZmFrZS1jZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YS12YWx1ZQ== - - --concierge-mode=TokenCredentialRequestAPI - --token=test-token command: '.../path/to/pinniped' env: [] @@ -678,7 +677,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=webhook - --concierge-endpoint=https://fake-server-url-value - --concierge-ca-bundle-data=ZmFrZS1jZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YS12YWx1ZQ== - - --concierge-mode=TokenCredentialRequestAPI - --token-env=TEST_TOKEN command: '.../path/to/pinniped' env: [] @@ -759,7 +757,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=jwt - --concierge-endpoint=https://fake-server-url-value - --concierge-ca-bundle-data=ZmFrZS1jZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YS12YWx1ZQ== - - --concierge-mode=TokenCredentialRequestAPI - --issuer=https://example.com/issuer - --client-id=pinniped-cli - --scopes=offline_access,openid,pinniped:request-audience @@ -842,7 +839,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=webhook - --concierge-endpoint=https://explicit-concierge-endpoint.example.com - --concierge-ca-bundle-data=%s - - --concierge-mode=TokenCredentialRequestAPI - --issuer=https://example.com/issuer - --client-id=pinniped-cli - --scopes=offline_access,openid,pinniped:request-audience @@ -957,7 +953,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=jwt - --concierge-endpoint=https://impersonation-proxy-endpoint.test - --concierge-ca-bundle-data=%s - - --concierge-mode=ImpersonationProxy - --issuer=https://example.com/issuer - --client-id=pinniped-cli - --scopes=offline_access,openid,pinniped:request-audience @@ -1064,7 +1059,6 @@ func TestGetKubeconfig(t *testing.T) { - --concierge-authenticator-type=jwt - --concierge-endpoint=https://impersonation-proxy-endpoint.test - --concierge-ca-bundle-data=dGVzdC1jb25jaWVyZ2UtY2E= - - --concierge-mode=ImpersonationProxy - --issuer=https://example.com/issuer - --client-id=pinniped-cli - --scopes=offline_access,openid,pinniped:request-audience