From 836369773b13156a4ce53974c4749936d961fcfe Mon Sep 17 00:00:00 2001
From: juanvallejo <jvallejo@redhat.com>
Date: Fri, 20 Oct 2017 14:05:18 -0400
Subject: [PATCH] UPSTREAM: 53916: update .dockercfg data to config.json format

---
 .../pkg/kubectl/secret_for_docker_registry.go |  4 +++-
 .../secret_for_docker_registry_test.go        | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

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 72e91fb82eda..35d635bdf1e7 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,7 +122,9 @@ func handleDockercfgContent(username, password, email, server string) ([]byte, e
 		Email:    email,
 	}
 
-	dockerCfg := map[string]credentialprovider.DockerConfigEntry{server: dockercfgAuth}
+	dockerCfg := credentialprovider.DockerConfigJson{
+		Auths: 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 d9b52fe5b84b..b6ae75146a1c 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,6 +59,26 @@ 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",