From 2ac85d762f0e8452fd89330bebe336b5aeb3de49 Mon Sep 17 00:00:00 2001 From: Alexander Kanevskiy Date: Tue, 20 Dec 2016 18:21:51 +0200 Subject: [PATCH] Fix cloud-config name in reset tests Default name is /etc/kubernetes/cloud-config, thus tests should cover "cloud-config" and not "cloud-config.json" --- cmd/kubeadm/app/cmd/reset_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/cmd/reset_test.go b/cmd/kubeadm/app/cmd/reset_test.go index 8c6abfa2200..529195e64e6 100644 --- a/cmd/kubeadm/app/cmd/reset_test.go +++ b/cmd/kubeadm/app/cmd/reset_test.go @@ -86,7 +86,7 @@ func TestConfigDirCleaner(t *testing.T) { "manifests", }, }, - "preserve cloud-config.json": { + "preserve cloud-config": { setupDirs: []string{ "manifests", "pki", @@ -97,12 +97,12 @@ func TestConfigDirCleaner(t *testing.T) { "pki/ca.pem", "admin.conf", "kubelet.conf", - "cloud-config.json", + "cloud-config", }, verifyExists: []string{ "manifests", "pki", - "cloud-config.json", + "cloud-config", }, }, "preserve hidden files and directories": { @@ -117,13 +117,13 @@ func TestConfigDirCleaner(t *testing.T) { "pki/ca.pem", "admin.conf", "kubelet.conf", - ".cloud-config.json", + ".cloud-config", ".mydir/.myfile", }, verifyExists: []string{ "manifests", "pki", - ".cloud-config.json", + ".cloud-config", ".mydir", ".mydir/.myfile", },