Move remaining cert helper functions to client-go/util/cert

- Move public key functions to client-go/util/cert
- Move pki file helper functions to client-go/util/cert
- Standardize on certutil package alias
- Update dependencies to client-go/util/cert
This commit is contained in:
Christoph Blecker
2017-07-18 20:06:32 -07:00
parent 66bfab8915
commit aac4d5382d
9 changed files with 361 additions and 164 deletions

View File

@@ -212,7 +212,7 @@ func (config AuthenticatorConfig) New() (authenticator.Request, *spec.SecurityDe
// IsValidServiceAccountKeyFile returns true if a valid public RSA key can be read from the given file
func IsValidServiceAccountKeyFile(file string) bool {
_, err := serviceaccount.ReadPublicKeys(file)
_, err := certutil.PublicKeysFromFile(file)
return err == nil
}
@@ -256,7 +256,7 @@ func newAuthenticatorFromOIDCIssuerURL(issuerURL, clientID, caFile, usernameClai
func newServiceAccountAuthenticator(keyfiles []string, lookup bool, serviceAccountGetter serviceaccount.ServiceAccountTokenGetter) (authenticator.Token, error) {
allPublicKeys := []interface{}{}
for _, keyfile := range keyfiles {
publicKeys, err := serviceaccount.ReadPublicKeys(keyfile)
publicKeys, err := certutil.PublicKeysFromFile(keyfile)
if err != nil {
return nil, err
}