Merge pull request #56175 from ericchiang/oidc-fix-prefixing

Automatic merge from submit-queue (batch tested with PRs 51494, 56097, 56072, 56175). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. oidc auth: fix prefix flag plumbing Fixes https://github.com/kubernetes/kubernetes/issues/56169 Tested this with an full API server against Google. It works now. :( cc @kubernetes/sig-auth-bugs ```release-note kube-apiserver: fixed --oidc-username-prefix and --oidc-group-prefix flags which previously weren't correctly enabled ``` /assign @liggitt @deads2k Probably worth a cherry pick.

Merge pull request #56175 from ericchiang/oidc-fix-prefixing
1489d194 · Kubernetes Submit Queue · GitHub · 947295a7 · df764029 · 1489d194
Unverified Commit 1489d194 authored Nov 21, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

authentication.go pkg/kubeapiserver/options/authentication.go +2 -0

No files found.
--- a/pkg/kubeapiserver/options/authentication.go
+++ b/pkg/kubeapiserver/options/authentication.go
@@ -294,8 +294,10 @@ func (s *BuiltInAuthenticationOptions) ToAuthenticationConfig() authenticator.Au
 		ret.OIDCCAFile = s.OIDC.CAFile
 		ret.OIDCClientID = s.OIDC.ClientID
 		ret.OIDCGroupsClaim = s.OIDC.GroupsClaim
+		ret.OIDCGroupsPrefix = s.OIDC.GroupsPrefix
 		ret.OIDCIssuerURL = s.OIDC.IssuerURL
 		ret.OIDCUsernameClaim = s.OIDC.UsernameClaim
+		ret.OIDCUsernamePrefix = s.OIDC.UsernamePrefix
 	}
 	if s.PasswordFile != nil {