diff --git a/cluster/images/etcd/migrate/data_dir.go b/cluster/images/etcd/migrate/data_dir.go index 294e5877414..f13c555ec61 100644 --- a/cluster/images/etcd/migrate/data_dir.go +++ b/cluster/images/etcd/migrate/data_dir.go @@ -19,7 +19,6 @@ package main import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -132,7 +131,7 @@ func (v *VersionFile) Exists() (bool, error) { // Read parses the version.txt file and returns it's contents. func (v *VersionFile) Read() (*EtcdVersionPair, error) { - data, err := ioutil.ReadFile(v.path) + data, err := os.ReadFile(v.path) if err != nil { return nil, fmt.Errorf("failed to read version file %s: %v", v.path, err) } @@ -173,7 +172,7 @@ func (v *VersionFile) Write(vp *EtcdVersionPair) error { // We do write + rename instead of just write to protect from version.txt // corruption under full disk condition. // See https://github.com/kubernetes/kubernetes/issues/98989. - err = ioutil.WriteFile(v.nextPath(), []byte(vp.String()), 0666) + err = os.WriteFile(v.nextPath(), []byte(vp.String()), 0666) if err != nil { return fmt.Errorf("failed to write new version file %s: %v", v.nextPath(), err) } diff --git a/cluster/images/etcd/migrate/data_dir_test.go b/cluster/images/etcd/migrate/data_dir_test.go index 5653e005470..9c33500d8c4 100644 --- a/cluster/images/etcd/migrate/data_dir_test.go +++ b/cluster/images/etcd/migrate/data_dir_test.go @@ -17,7 +17,6 @@ limitations under the License. package main import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -156,7 +155,7 @@ func TestBackup(t *testing.T) { } func newTestPath(t *testing.T) string { - path, err := ioutil.TempDir("", "etcd-migrate-test-") + path, err := os.MkdirTemp("", "etcd-migrate-test-") if err != nil { t.Fatalf("Failed to create tmp dir for test: %v", err) } diff --git a/cluster/images/etcd/migrate/integration_test.go b/cluster/images/etcd/migrate/integration_test.go index a5afd6104c5..32a91e3acb7 100644 --- a/cluster/images/etcd/migrate/integration_test.go +++ b/cluster/images/etcd/migrate/integration_test.go @@ -28,7 +28,6 @@ import ( "encoding/pem" "flag" "fmt" - "io/ioutil" "math/big" "net" "os" @@ -292,13 +291,13 @@ func getOrCreateTestCertFiles(certFileName, keyFileName string, spec TestCertSpe } os.MkdirAll(filepath.Dir(certFileName), os.FileMode(0777)) - err = ioutil.WriteFile(certFileName, certPem, os.FileMode(0777)) + err = os.WriteFile(certFileName, certPem, os.FileMode(0777)) if err != nil { return err } os.MkdirAll(filepath.Dir(keyFileName), os.FileMode(0777)) - err = ioutil.WriteFile(keyFileName, keyPem, os.FileMode(0777)) + err = os.WriteFile(keyFileName, keyPem, os.FileMode(0777)) if err != nil { return err }