github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106019 from ahrtr/replace_ioutil_with_io_os_cluster_images_etcd

Browse Source 
Replace ioutil with io and os for cluster/images/etcd
This commit is contained in:
Kubernetes Prow Robot 2022-01-06 12:50:27 -08:00 committed by GitHub
commit f97d3f9b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/images/etcd/migrate/data_dir.go
View File

@ -19,7 +19,6 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -132,7 +131,7 @@ func (v *VersionFile) Exists() (bool, error) {
// Read parses the version.txt file and returns it's contents. // Read parses the version.txt file and returns it's contents.
func (v *VersionFile) Read() (*EtcdVersionPair, error) { func (v *VersionFile) Read() (*EtcdVersionPair, error) {
data, err := ioutil.ReadFile(v.path) data, err := os.ReadFile(v.path)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read version file %s: %v", v.path, err) 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 // We do write + rename instead of just write to protect from version.txt
// corruption under full disk condition. // corruption under full disk condition.
// See https://github.com/kubernetes/kubernetes/issues/98989. // 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 { if err != nil {
return fmt.Errorf("failed to write new version file %s: %v", v.nextPath(), err) return fmt.Errorf("failed to write new version file %s: %v", v.nextPath(), err)
} }

3
cluster/images/etcd/migrate/data_dir_test.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package main package main
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -156,7 +155,7 @@ func TestBackup(t *testing.T) {
} }
func newTestPath(t *testing.T) string { func newTestPath(t *testing.T) string {
path, err := ioutil.TempDir("", "etcd-migrate-test-") path, err := os.MkdirTemp("", "etcd-migrate-test-")
if err != nil { if err != nil {
t.Fatalf("Failed to create tmp dir for test: %v", err) t.Fatalf("Failed to create tmp dir for test: %v", err)
} }

5
cluster/images/etcd/migrate/integration_test.go
View File

@ -28,7 +28,6 @@ import (
"encoding/pem" "encoding/pem"
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
"math/big" "math/big"
"net" "net"
"os" "os"
@ -292,13 +291,13 @@ func getOrCreateTestCertFiles(certFileName, keyFileName string, spec TestCertSpe
} }
os.MkdirAll(filepath.Dir(certFileName), os.FileMode(0777)) 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 { if err != nil {
return err return err
} }
os.MkdirAll(filepath.Dir(keyFileName), os.FileMode(0777)) 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 { if err != nil {
return err return err
} }