diff --git a/pkg/oc/cli/secrets/dockercfg.go b/pkg/oc/cli/secrets/dockercfg.go index 7a40a295b1a7..7b086a4ac257 100644 --- a/pkg/oc/cli/secrets/dockercfg.go +++ b/pkg/oc/cli/secrets/dockercfg.go @@ -125,9 +125,7 @@ func (o CreateDockerConfigOptions) NewDockerSecret() (*api.Secret, error) { Email: o.EmailAddress, } - dockerCfg := credentialprovider.DockerConfigJson{ - Auths: map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth}, - } + dockerCfg := map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth} dockercfgContent, err := json.Marshal(dockerCfg) if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry.go b/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry.go index 35d635bdf1e7..72e91fb82eda 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry.go @@ -122,9 +122,7 @@ func handleDockercfgContent(username, password, email, server string) ([]byte, e Email: email, } - dockerCfg := credentialprovider.DockerConfigJson{ - Auths: map[string]credentialprovider.DockerConfigEntry{server: dockercfgAuth}, - } + dockerCfg := map[string]credentialprovider.DockerConfigEntry{server: dockercfgAuth} return json.Marshal(dockerCfg) } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry_test.go index b6ae75146a1c..d9b52fe5b84b 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/secret_for_docker_registry_test.go @@ -59,26 +59,6 @@ func TestSecretForDockerRegistryGenerate(t *testing.T) { }, expectErr: false, }, - "test-valid-use-append-hash": { - params: map[string]interface{}{ - "name": "foo-94759gc65b", - "docker-server": server, - "docker-username": username, - "docker-password": password, - "docker-email": email, - "append-hash": "true", - }, - expected: &api.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: "foo-94759gc65b", - }, - Data: map[string][]byte{ - api.DockerConfigKey: secretData, - }, - Type: api.SecretTypeDockercfg, - }, - expectErr: false, - }, "test-valid-use-no-email": { params: map[string]interface{}{ "name": "foo",