github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-15 16:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107410 from margocrawf/master

Browse Source 
Ensure static certs in kubeconfig override exec plugin

Kubernetes-commit: 19935de5a9a4196f23f9a90cd9b7acb79091e3c2
This commit is contained in:
Kubernetes Publisher 2022-03-08 11:34:21 -08:00
commit 2f52a105e6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/client/auth/exec/exec.go
View File

@ -290,8 +290,8 @@ func (a *Authenticator) UpdateTransportConfig(c *transport.Config) error {
// also configured to allow client certificates for authentication. For requests
// like "kubectl get --token (token) pods" we should assume the intention is to
// use the provided token for authentication. The same can be said for when the
// user specifies basic auth.
if c.HasTokenAuth() || c.HasBasicAuth() {
// user specifies basic auth or cert auth.
if c.HasTokenAuth() || c.HasBasicAuth() || c.HasCertAuth() {
return nil
}
@ -299,7 +299,7 @@ func (a *Authenticator) UpdateTransportConfig(c *transport.Config) error {
return &roundTripper{a, rt}
})
if c.TLS.GetCert != nil {
if c.HasCertCallback() {
return errors.New("can't add TLS certificate callback: transport.Config.TLS.GetCert already set")
}
c.TLS.GetCert = a.cert

7
plugin/pkg/client/auth/exec/exec_test.go
View File

@ -1206,6 +1206,13 @@ func TestAuthorizationHeaderPresentCancelsExecAction(t *testing.T) {
config.Password = "zelda"
},
},
{
name: "cert auth",
setTransportConfig: func(config *transport.Config) {
config.TLS.CertData = []byte("some-cert-data")
config.TLS.KeyData = []byte("some-key-data")
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {