github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10264 from mikedanese/ca-token

Browse Source 
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
parent fc349fdd47 5760fe1957
commit 655179dcfb
11 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@@ -1961,6 +1961,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
//

2
pkg/api/v1/types.go
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
//

2
pkg/api/v1beta3/types.go
View File

@@ -1868,6 +1868,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
//