djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some lint errors that resulted from merging main

Browse Source 
Signed-off-by: Ryan Richard <richardry@vmware.com>
This commit is contained in:
Margo Crawford 2021-02-25 15:06:24 -08:00 committed by Ryan Richard
parent f8111db5ff
commit ccb17843c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/pinniped/cmd/flag_types.go
View File

@ -25,7 +25,7 @@ func (c *conciergeMode) String() string {
switch *c { switch *c {
case modeImpersonationProxy: case modeImpersonationProxy:
return "ImpersonationProxy" return "ImpersonationProxy"
case modeTokenCredentialRequestAPI: case modeTokenCredentialRequestAPI, modeUnknown:
return "TokenCredentialRequestAPI" return "TokenCredentialRequestAPI"
default: default:
return "TokenCredentialRequestAPI" return "TokenCredentialRequestAPI"

8
cmd/pinniped/cmd/kubeconfig.go
View File

@ -251,14 +251,14 @@ func configureConcierge(credentialIssuer *configv1alpha1.CredentialIssuer, authe
// Autodiscover the --concierge-mode. // Autodiscover the --concierge-mode.
if flags.concierge.mode == modeUnknown { if flags.concierge.mode == modeUnknown {
switch {
if credentialIssuer.Status.KubeConfigInfo != nil { case credentialIssuer.Status.KubeConfigInfo != nil:
// Prefer the TokenCredentialRequest API if available. // Prefer the TokenCredentialRequest API if available.
flags.concierge.mode = modeTokenCredentialRequestAPI flags.concierge.mode = modeTokenCredentialRequestAPI
} else if credentialIssuer.Status.ImpersonationProxyInfo != nil { case credentialIssuer.Status.ImpersonationProxyInfo != nil:
// Otherwise prefer the impersonation proxy if it seems configured. // Otherwise prefer the impersonation proxy if it seems configured.
flags.concierge.mode = modeImpersonationProxy flags.concierge.mode = modeImpersonationProxy
} else { default:
return fmt.Errorf("could not autodiscover --concierge-mode and none was provided") return fmt.Errorf("could not autodiscover --concierge-mode and none was provided")
} }
} }