Skip to content

K
k3s
Commit 65cea86e authored by Solly Ross's avatar Solly Ross
Browse files
Options

Populate ClientCA in delegating auth setup

kubernetes/kubernetes#67768 accidentally removed population of the the ClientCA in the delegating auth setup code. This restores it.
parent ae2efc75
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
staging/src/k8s.io/apiserver/pkg/server/options/authentication.go
View file @ 65cea86e
...@@ -192,9 +192,11 @@ func (s *DelegatingAuthenticationOptions) ApplyTo(c *server.AuthenticationInfo, ...@@ -192,9 +192,11 @@ func (s *DelegatingAuthenticationOptions) ApplyTo(c *server.AuthenticationInfo,
} }
// configure AuthenticationInfo config // configure AuthenticationInfo config
cfg.ClientCAFile = s.ClientCert.ClientCA
if err = c.ApplyClientCert(s.ClientCert.ClientCA, servingInfo); err != nil { if err = c.ApplyClientCert(s.ClientCert.ClientCA, servingInfo); err != nil {
return fmt.Errorf("unable to load client CA file: %v", err) return fmt.Errorf("unable to load client CA file: %v", err)
} }
cfg.RequestHeaderConfig = s.RequestHeader.ToAuthenticationRequestHeaderConfig() cfg.RequestHeaderConfig = s.RequestHeader.ToAuthenticationRequestHeaderConfig()
if err = c.ApplyClientCert(s.RequestHeader.ClientCAFile, servingInfo); err != nil { if err = c.ApplyClientCert(s.RequestHeader.ClientCAFile, servingInfo); err != nil {
return fmt.Errorf("unable to load client CA file: %v", err) return fmt.Errorf("unable to load client CA file: %v", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment