Merge pull request #121997 from dongjiang1989/admission-ioutil

chores: Replace deprecation ioutil fucntions
This commit is contained in:
Kubernetes Prow Robot 2024-08-13 14:44:42 -07:00 committed by GitHub
commit 5fdab96c6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 7 deletions

View File

@ -19,7 +19,6 @@ package eventratelimit
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
@ -50,7 +49,7 @@ func LoadConfiguration(config io.Reader) (*eventratelimitapi.Configuration, erro
return internalConfig, nil return internalConfig, nil
} }
// we have a config so parse it. // we have a config so parse it.
data, err := ioutil.ReadAll(config) data, err := io.ReadAll(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -19,7 +19,6 @@ package podtolerationrestriction
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
@ -51,7 +50,7 @@ func loadConfiguration(config io.Reader) (*internalapi.Configuration, error) {
return internalConfig, nil return internalConfig, nil
} }
// we have a config so parse it. // we have a config so parse it.
data, err := ioutil.ReadAll(config) data, err := io.ReadAll(config)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -19,7 +19,7 @@ package podsecurity
import ( import (
"context" "context"
"fmt" "fmt"
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
@ -116,7 +116,7 @@ func BenchmarkVerifyPod(b *testing.B) {
corePod := &core.Pod{} corePod := &core.Pod{}
v1Pod := &corev1.Pod{} v1Pod := &corev1.Pod{}
data, err := ioutil.ReadFile("testdata/pod_restricted.yaml") data, err := os.ReadFile("testdata/pod_restricted.yaml")
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }
@ -205,7 +205,7 @@ func BenchmarkVerifyNamespace(b *testing.B) {
} }
v1Pod := &corev1.Pod{} v1Pod := &corev1.Pod{}
data, err := ioutil.ReadFile("testdata/pod_baseline.yaml") data, err := os.ReadFile("testdata/pod_baseline.yaml")
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }