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

pkg/oc/cli/secrets/dockercfg.go

@@ -125,7 +125,9 @@ func (o CreateDockerConfigOptions) NewDockerSecret() (*api.Secret, error) {
 		Email:    o.EmailAddress,
 	}
 
-	dockerCfg := map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth}
+	dockerCfg := credentialprovider.DockerConfigJson{
+		Auths: map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth},
+	}
 
 	dockercfgContent, err := json.Marshal(dockerCfg)
 	if err != nil {