Commit 67a3cd3a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #39029 from kad/issue75

Automatic merge from submit-queue Fix cloud-config name in test case **What this PR does / why we need it**: fixes default cloud-config name in test cases for reset. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: related to kubernetes/kubeadm#75 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 9d38145c 2ac85d76
...@@ -86,7 +86,7 @@ func TestConfigDirCleaner(t *testing.T) { ...@@ -86,7 +86,7 @@ func TestConfigDirCleaner(t *testing.T) {
"manifests", "manifests",
}, },
}, },
"preserve cloud-config.json": { "preserve cloud-config": {
setupDirs: []string{ setupDirs: []string{
"manifests", "manifests",
"pki", "pki",
...@@ -97,12 +97,12 @@ func TestConfigDirCleaner(t *testing.T) { ...@@ -97,12 +97,12 @@ func TestConfigDirCleaner(t *testing.T) {
"pki/ca.pem", "pki/ca.pem",
"admin.conf", "admin.conf",
"kubelet.conf", "kubelet.conf",
"cloud-config.json", "cloud-config",
}, },
verifyExists: []string{ verifyExists: []string{
"manifests", "manifests",
"pki", "pki",
"cloud-config.json", "cloud-config",
}, },
}, },
"preserve hidden files and directories": { "preserve hidden files and directories": {
...@@ -117,13 +117,13 @@ func TestConfigDirCleaner(t *testing.T) { ...@@ -117,13 +117,13 @@ func TestConfigDirCleaner(t *testing.T) {
"pki/ca.pem", "pki/ca.pem",
"admin.conf", "admin.conf",
"kubelet.conf", "kubelet.conf",
".cloud-config.json", ".cloud-config",
".mydir/.myfile", ".mydir/.myfile",
}, },
verifyExists: []string{ verifyExists: []string{
"manifests", "manifests",
"pki", "pki",
".cloud-config.json", ".cloud-config",
".mydir", ".mydir",
".mydir/.myfile", ".mydir/.myfile",
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment