Skip to content

Commit f972e1b

Browse files
Merge pull request #18062 from soltysh/issue17197
Automatic merge from submit-queue. Revert "UPSTREAM: 53916: update .dockercfg data to config.json format Addresses problem described in https://bugzilla.redhat.com/show_bug.cgi?id=1531511 and https://bugzilla.redhat.com/show_bug.cgi?id=1476330 This reverts commit 8363697, to make it compatible with `kubectl create secret docker-registry` from k8s 1.7. @juanvallejo ptal
2 parents ab0f056 + 058d662 commit f972e1b

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

pkg/oc/cli/secrets/dockercfg.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ func (o CreateDockerConfigOptions) NewDockerSecret() (*api.Secret, error) {
125125
Email: o.EmailAddress,
126126
}
127127

128-
dockerCfg := credentialprovider.DockerConfigJson{
129-
Auths: map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth},
130-
}
128+
dockerCfg := map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth}
131129

132130
dockercfgContent, err := json.Marshal(dockerCfg)
133131
if err != nil {

vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry.go

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry_test.go

-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)