Merge pull request #10264 from mikedanese/ca-token

add ca cert to token controller and all service accounts
This commit is contained in:
Maxwell Forbes
2015-06-25 09:56:35 -07:00
11 changed files with 69 additions and 23 deletions

View File

@@ -1862,6 +1862,8 @@ const (
ServiceAccountTokenKey = "token"
// ServiceAccountKubeconfigKey is the key of the optional kubeconfig data for SecretTypeServiceAccountToken secrets
ServiceAccountKubeconfigKey = "kubernetes.kubeconfig"
// ServiceAccountRootCAKey is the key of the optional root certificate authority for SecretTypeServiceAccountToken secrets
ServiceAccountRootCAKey = "ca.crt"
// SecretTypeDockercfg contains a dockercfg file that follows the same format rules as ~/.dockercfg
//