Merge pull request kubernetes#76919 from mikedanese/webhook-exec

k8s-ci-robot · web-flow · commit 47c03403b85d · 2019-04-26T00:44:26.000-07:00
webhook: support exec auth plugin
diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/authentication.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/authentication.go
@@ -196,6 +196,9 @@ func restConfigFromKubeconfig(configAuthInfo *clientcmdapi.AuthInfo) (*rest.Conf
 		config.Username = configAuthInfo.Username
 		config.Password = configAuthInfo.Password
 	}
+	if configAuthInfo.Exec != nil {
+		config.ExecProvider = configAuthInfo.Exec.DeepCopy()
+	}
 	if configAuthInfo.AuthProvider != nil {
 		return nil, fmt.Errorf("auth provider not supported")
 	}

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,9 @@ func restConfigFromKubeconfig(configAuthInfo clientcmdapi.AuthInfo) (rest.Conf`
`196`	`196`	`config.Username = configAuthInfo.Username`
`197`	`197`	`config.Password = configAuthInfo.Password`
`198`	`198`	`}`
	`199`	`+ if configAuthInfo.Exec != nil {`
	`200`	`+ config.ExecProvider = configAuthInfo.Exec.DeepCopy()`
	`201`	`+ }`
`199`	`202`	`if configAuthInfo.AuthProvider != nil {`
`200`	`203`	`return nil, fmt.Errorf("auth provider not supported")`
`201`	`204`	`}`