Skip to content

Commit 8f5b7ae

Browse files
Merge pull request #16868 from juanvallejo/jvallejo/update-dockercfg-data-to-dockerconfig-fmt
Automatic merge from submit-queue. UPSTREAM: 53916: update .dockercfg content to config.json Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1476330 update the data format of .dockercfg to match the new docker config.json format, which encapsulates all registry auth objects in an overall "auths" object when an option `--config-format` is specified with the value `--config-format=config.json`: ```json { "auths": { "reg.url": { "auth": "...==" } } } ``` cc @openshift/cli-review @bparees @mfojtik
2 parents 400b303 + 5304de7 commit 8f5b7ae

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

pkg/oc/cli/secrets/dockercfg.go

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

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

130132
dockercfgContent, err := json.Marshal(dockerCfg)
131133
if err != nil {

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

+3-1
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)