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

Merge pull request #12717 from tamnd/fixdockercfg

Browse Source 
Fix new docker config format for private registries
This commit is contained in:
Tim Hockin
2015-09-18 14:43:38 -07:00
parent 9537c43a62 906b279080
commit 9698e957a6
5 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/types.go
View File

@@ -1870,6 +1870,15 @@ const (
// DockerConfigKey is the key of the required data for SecretTypeDockercfg secrets
DockerConfigKey = ".dockercfg"
// SecretTypeDockerConfigJson contains a dockercfg file that follows the same format rules as ~/.docker/config.json
//
// Required fields:
// - Secret.Data[".dockerconfigjson"] - a serialized ~/.docker/config.json file
SecretTypeDockerConfigJson SecretType = "kubernetes.io/dockerconfigjson"
// DockerConfigJsonKey is the key of the required data for SecretTypeDockerConfigJson secrets
DockerConfigJsonKey = ".dockerconfigjson"
)
type SecretList struct {