Merge pull request kubernetes#131489 from sivchari/use-testing-tmpdir

kubeadm: use testing.TempDir and delete helper function

Author: k8s-ci-robot

cmd/kubeadm/app/cmd/certs_test.go

@@ -104,8 +104,7 @@ func TestCommandsGenerated(t *testing.T) {
 }
 
 func TestRunRenewCommands(t *testing.T) {
-	tmpDir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	cfg := testutil.GetDefaultInternalConfig(t)
 	cfg.CertificatesDir = tmpDir
@@ -312,8 +311,7 @@ func TestRunRenewCommands(t *testing.T) {
 }
 
 func TestRunGenCSR(t *testing.T) {
-	tmpDir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	kubeConfigDir := filepath.Join(tmpDir, "kubernetes")
 	certDir := kubeConfigDir + "/pki"
@@ -404,8 +402,7 @@ kubernetesVersion: %s`,
 		kubeadmapiv1.SchemeGroupVersion.String(),
 		kubeadmconstants.MinimumControlPlaneVersion.String())
 
-	tmpDir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	customConfigPath := tmpDir + "/kubeadm.conf"
 
@@ -489,11 +486,8 @@ kubernetesVersion: %s`,
 }
 
 func TestRunCmdCertsExpiration(t *testing.T) {
-	kdir := testutil.SetupTempDir(t)
+	kdir := t.TempDir()
 	defer func() {
-		if err := os.RemoveAll(kdir); err != nil {
-			t.Fatalf("Failed to teardown: %s", err)
-		}
 		clientSetFromFile = kubeconfigutil.ClientSetFromFile
 	}()
 

cmd/kubeadm/app/cmd/kubeconfig_test.go

@@ -78,8 +78,7 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er
 func TestKubeConfigSubCommandsThatWritesToOut(t *testing.T) {
 
 	// Temporary folders for the test case
-	tmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	// Adds a pki folder with a ca cert to the temp folder
 	pkidir := testutil.SetupPkiDirWithCertificateAuthority(t, tmpdir)

cmd/kubeadm/app/cmd/phases/init/certs_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package phases
 
 import (
-	"os"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -44,8 +43,7 @@ func TestCreateSparseCerts(t *testing.T) {
 		t.Run(test.Name, func(t *testing.T) {
 			pkiutiltesting.Reset()
 
-			tmpdir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(tmpdir)
+			tmpdir := t.TempDir()
 
 			certstestutil.WritePKIFiles(t, tmpdir, test.Files)
 

cmd/kubeadm/app/cmd/phases/reset/removeetcdmember_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/lithammer/dedent"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
-	testutil "k8s.io/kubernetes/cmd/kubeadm/test"
 )
 
 const (
@@ -99,8 +98,7 @@ func TestGetEtcdDataDir(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			tmpdir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(tmpdir)
+			tmpdir := t.TempDir()
 
 			manifestPath := filepath.Join(tmpdir, "etcd.yaml")
 			if test.writeManifest {

cmd/kubeadm/app/cmd/upgrade/common_test.go

@@ -30,7 +30,6 @@ import (
 	kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta4"
 	"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/output"
-	testutil "k8s.io/kubernetes/cmd/kubeadm/test"
 )
 
 const testConfigToken = `apiVersion: v1
@@ -55,8 +54,7 @@ users:
 `
 
 func TestEnforceRequirements(t *testing.T) {
-	tmpDir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 	fullPath := filepath.Join(tmpDir, "test-config-file")
 	f, err := os.Create(fullPath)
 	if err != nil {

cmd/kubeadm/app/phases/certs/certs_test.go

@@ -74,8 +74,7 @@ func TestWriteCertificateAuthorityFilesIfNotExist(t *testing.T) {
 
 	for _, test := range tests {
 		// Create temp folder for the test case
-		tmpdir := testutil.SetupTempDir(t)
-		defer os.RemoveAll(tmpdir)
+		tmpdir := t.TempDir()
 
 		// executes setup func (if necessary)
 		if test.setupFunc != nil {
@@ -179,8 +178,7 @@ func TestWriteCertificateFilesIfNotExist(t *testing.T) {
 
 	for _, test := range tests {
 		// Create temp folder for the test case
-		tmpdir := testutil.SetupTempDir(t)
-		defer os.RemoveAll(tmpdir)
+		tmpdir := t.TempDir()
 
 		// executes setup func (if necessary)
 		if test.setupFunc != nil {
@@ -252,8 +250,7 @@ func TestCreateServiceAccountKeyAndPublicKeyFiles(t *testing.T) {
 	}
 	for _, tt := range tcases {
 		t.Run(tt.name, func(t *testing.T) {
-			dir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			if tt.setupFunc != nil {
 				if err := tt.setupFunc(dir); err != nil {
@@ -383,9 +380,8 @@ func TestSharedCertificateExists(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run("", func(t *testing.T) {
-			tmpdir := testutil.SetupTempDir(t)
+			tmpdir := t.TempDir()
 			os.MkdirAll(tmpdir+"/etcd", os.ModePerm)
-			defer os.RemoveAll(tmpdir)
 
 			cfg := &kubeadmapi.ClusterConfiguration{
 				CertificatesDir: tmpdir,
@@ -415,8 +411,7 @@ func TestCreatePKIAssetsWithSparseCerts(t *testing.T) {
 		t.Run(test.Name, func(t *testing.T) {
 			pkiutiltesting.Reset()
 
-			tmpdir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(tmpdir)
+			tmpdir := t.TempDir()
 
 			cfg := testutil.GetDefaultInternalConfig(t)
 			cfg.ClusterConfiguration.CertificatesDir = tmpdir
@@ -518,8 +513,7 @@ func TestUsingExternalCA(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			pkiutiltesting.Reset()
 
-			dir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			cfg := &kubeadmapi.InitConfiguration{
 				LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4"},
@@ -622,8 +616,7 @@ func TestValidateMethods(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		dir := testutil.SetupTempDir(t)
-		defer os.RemoveAll(dir)
+		dir := t.TempDir()
 		test.loc.pkiDir = dir
 
 		certstestutil.WritePKIFiles(t, dir, test.files)
@@ -678,8 +671,7 @@ func TestCreateCertificateFilesMethods(t *testing.T) {
 		pkiutiltesting.Reset()
 
 		// Create temp folder for the test case
-		tmpdir := testutil.SetupTempDir(t)
-		defer os.RemoveAll(tmpdir)
+		tmpdir := t.TempDir()
 
 		cfg := &kubeadmapi.InitConfiguration{
 			LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4"},

cmd/kubeadm/app/phases/certs/renewal/manager_test.go

@@ -37,7 +37,6 @@ import (
 	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	certtestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil"
-	testutil "k8s.io/kubernetes/cmd/kubeadm/test"
 )
 
 var (
@@ -106,8 +105,7 @@ func TestNewManager(t *testing.T) {
 }
 
 func TestRenewUsingLocalCA(t *testing.T) {
-	dir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	if err := pkiutil.WriteCertAndKey(dir, "ca", testCACert, testCAKey); err != nil {
 		t.Fatalf("couldn't write out CA certificate to %s", dir)
@@ -200,8 +198,7 @@ func TestRenewUsingLocalCA(t *testing.T) {
 }
 
 func TestCreateRenewCSR(t *testing.T) {
-	dir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	outdir := filepath.Join(dir, "out")
 

cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go

@@ -33,13 +33,11 @@ import (
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil"
-	testutil "k8s.io/kubernetes/cmd/kubeadm/test"
 )
 
 func TestPKICertificateReadWriter(t *testing.T) {
 	// creates a tmp folder
-	dir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	// creates a certificate
 	cert := writeTestCertificate(t, dir, "test", testCACert, testCAKey, testCertOrganization, time.Time{}, time.Time{})
@@ -84,10 +82,8 @@ func TestPKICertificateReadWriter(t *testing.T) {
 
 func TestKubeconfigReadWriter(t *testing.T) {
 	// creates tmp folders
-	dirKubernetes := testutil.SetupTempDir(t)
-	defer os.RemoveAll(dirKubernetes)
-	dirPKI := testutil.SetupTempDir(t)
-	defer os.RemoveAll(dirPKI)
+	dirKubernetes := t.TempDir()
+	dirPKI := t.TempDir()
 
 	// write the CA cert and key to the temporary PKI dir
 	caName := kubeadmconstants.CACertAndKeyBaseName

cmd/kubeadm/app/phases/controlplane/manifests_test.go

@@ -169,8 +169,7 @@ func TestCreateStaticPodFilesAndWrappers(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			// Create temp folder for the test case
-			tmpdir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(tmpdir)
+			tmpdir := t.TempDir()
 
 			// Creates a Cluster Configuration
 			cfg := &kubeadmapi.ClusterConfiguration{
@@ -197,8 +196,7 @@ func TestCreateStaticPodFilesAndWrappers(t *testing.T) {
 
 func TestCreateStaticPodFilesWithPatches(t *testing.T) {
 	// Create temp folder for the test case
-	tmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	// Creates a Cluster Configuration
 	cfg := &kubeadmapi.ClusterConfiguration{
@@ -1044,8 +1042,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
 			pkiutiltesting.Reset()
 
 			// Create temp folder for the test case
-			tmpdir := testutil.SetupTempDir(t)
-			defer os.RemoveAll(tmpdir)
+			tmpdir := t.TempDir()
 			test.cfg.CertificatesDir = tmpdir
 
 			if err := certs.CreatePKIAssets(test.cfg); err != nil {

cmd/kubeadm/app/phases/copycerts/copycerts_test.go

@@ -41,8 +41,7 @@ import (
 
 func TestGetDataFromInitConfig(t *testing.T) {
 	certData := []byte("cert-data")
-	tmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 	cfg := &kubeadmapi.InitConfiguration{}
 	cfg.CertificatesDir = tmpdir
 
@@ -159,8 +158,7 @@ func TestCertOrKeyNameToSecretName(t *testing.T) {
 }
 
 func TestUploadCerts(t *testing.T) {
-	tmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	secretKey, err := CreateCertificateKey()
 	if err != nil {
@@ -210,14 +208,12 @@ func TestDownloadCerts(t *testing.T) {
 	}
 
 	// Temporary directory where certificates will be generated
-	tmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 	initConfiguration := testutil.GetDefaultInternalConfig(t)
 	initConfiguration.ClusterConfiguration.CertificatesDir = tmpdir
 
 	// Temporary directory where certificates will be downloaded to
-	targetTmpdir := testutil.SetupTempDir(t)
-	defer os.RemoveAll(targetTmpdir)
+	targetTmpdir := t.TempDir()
 	initForDownloadConfiguration := testutil.GetDefaultInternalConfig(t)
 	initForDownloadConfiguration.ClusterConfiguration.CertificatesDir = targetTmpdir