replace ioutil with os, update doc
This commit is contained in:
parent
ad18954259
commit
ccf7ddacfc
@ -17,8 +17,8 @@ limitations under the License.
|
|||||||
package admission
|
package admission
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
@ -55,7 +55,7 @@ func (c *Config) New(proxyTransport *http.Transport, egressSelector *egressselec
|
|||||||
var cloudConfig []byte
|
var cloudConfig []byte
|
||||||
if c.CloudConfigFile != "" {
|
if c.CloudConfigFile != "" {
|
||||||
var err error
|
var err error
|
||||||
cloudConfig, err = ioutil.ReadFile(c.CloudConfigFile)
|
cloudConfig, err = os.ReadFile(c.CloudConfigFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
klog.Fatalf("Error reading from cloud configuration file %s: %#v", c.CloudConfigFile, err)
|
klog.Fatalf("Error reading from cloud configuration file %s: %#v", c.CloudConfigFile, err)
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ func WriteTmpFile(fs utilfs.Filesystem, path string, data []byte) (tmpPath strin
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// Name() will be an absolute path when using utilfs.DefaultFS, because ioutil.TempFile passes
|
// Name() will be an absolute path when using utilfs.DefaultFS, because os.CreateTemp passes
|
||||||
// an absolute path to os.Open, and we ensure similar behavior in utilfs.FakeFS for testing.
|
// an absolute path to os.Open, and we ensure similar behavior in utilfs.FakeFS for testing.
|
||||||
tmpPath = tmpFile.Name()
|
tmpPath = tmpFile.Name()
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@ -407,7 +406,7 @@ func TestReadLogsLimitsWithTimestamps(t *testing.T) {
|
|||||||
logLineFmt := "2022-10-29T16:10:22.592603036-05:00 stdout P %v\n"
|
logLineFmt := "2022-10-29T16:10:22.592603036-05:00 stdout P %v\n"
|
||||||
logLineNewLine := "2022-10-29T16:10:22.592603036-05:00 stdout F \n"
|
logLineNewLine := "2022-10-29T16:10:22.592603036-05:00 stdout F \n"
|
||||||
|
|
||||||
tmpfile, err := ioutil.TempFile("", "log.*.txt")
|
tmpfile, err := os.CreateTemp("", "log.*.txt")
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
count := 10000
|
count := 10000
|
||||||
|
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
package prober
|
package prober
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ func newTestManager() *manager {
|
|||||||
// Add test pod to pod manager, so that status manager can get the pod from pod manager if needed.
|
// Add test pod to pod manager, so that status manager can get the pod from pod manager if needed.
|
||||||
podManager.AddPod(getTestPod())
|
podManager.AddPod(getTestPod())
|
||||||
testRootDir := ""
|
testRootDir := ""
|
||||||
if tempDir, err := ioutil.TempDir("", "kubelet_test."); err != nil {
|
if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil {
|
||||||
return nil
|
return nil
|
||||||
} else {
|
} else {
|
||||||
testRootDir = tempDir
|
testRootDir = tempDir
|
||||||
|
@ -19,9 +19,9 @@ package prober
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"testing"
|
"testing"
|
||||||
@ -82,7 +82,7 @@ func TestTCPPortExhaustion(t *testing.T) {
|
|||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(fmt.Sprintf(tt.name), func(t *testing.T) {
|
t.Run(fmt.Sprintf(tt.name), func(t *testing.T) {
|
||||||
testRootDir := ""
|
testRootDir := ""
|
||||||
if tempDir, err := ioutil.TempDir("", "kubelet_test."); err != nil {
|
if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil {
|
||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
} else {
|
} else {
|
||||||
testRootDir = tempDir
|
testRootDir = tempDir
|
||||||
|
@ -19,7 +19,7 @@ package prober
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ func TestDoProbe(t *testing.T) {
|
|||||||
|
|
||||||
// Clean up.
|
// Clean up.
|
||||||
testRootDir := ""
|
testRootDir := ""
|
||||||
if tempDir, err := ioutil.TempDir("", "kubelet_test."); err != nil {
|
if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil {
|
||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
} else {
|
} else {
|
||||||
testRootDir = tempDir
|
testRootDir = tempDir
|
||||||
|
@ -18,8 +18,8 @@ package status
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"math/rand"
|
"math/rand"
|
||||||
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@ -90,7 +90,7 @@ func newTestManager(kubeClient clientset.Interface) *manager {
|
|||||||
podManager.AddPod(getTestPod())
|
podManager.AddPod(getTestPod())
|
||||||
podStartupLatencyTracker := util.NewPodStartupLatencyTracker()
|
podStartupLatencyTracker := util.NewPodStartupLatencyTracker()
|
||||||
testRootDir := ""
|
testRootDir := ""
|
||||||
if tempDir, err := ioutil.TempDir("", "kubelet_test."); err != nil {
|
if tempDir, err := os.MkdirTemp("", "kubelet_test."); err != nil {
|
||||||
return nil
|
return nil
|
||||||
} else {
|
} else {
|
||||||
testRootDir = tempDir
|
testRootDir = tempDir
|
||||||
|
@ -85,7 +85,7 @@ func (fs *DefaultFs) RemoveAll(path string) error {
|
|||||||
return os.RemoveAll(fs.prefix(path))
|
return os.RemoveAll(fs.prefix(path))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove via os.RemoveAll
|
// Remove via os.Remove
|
||||||
func (fs *DefaultFs) Remove(name string) error {
|
func (fs *DefaultFs) Remove(name string) error {
|
||||||
return os.Remove(fs.prefix(name))
|
return os.Remove(fs.prefix(name))
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ type Filesystem interface {
|
|||||||
RemoveAll(path string) error
|
RemoveAll(path string) error
|
||||||
Remove(name string) error
|
Remove(name string) error
|
||||||
|
|
||||||
// from "io/ioutil"
|
// from "os"
|
||||||
ReadFile(filename string) ([]byte, error)
|
ReadFile(filename string) ([]byte, error)
|
||||||
TempDir(dir, prefix string) (string, error)
|
TempDir(dir, prefix string) (string, error)
|
||||||
TempFile(dir, prefix string) (File, error)
|
TempFile(dir, prefix string) (File, error)
|
||||||
|
Loading…
Reference in New Issue
Block a user