github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114414 from my-git9/ioutil/apiextensions-apiserver1

Browse Source 
fix: remove ioutil for new go version
This commit is contained in:
Kubernetes Prow Robot 2022-12-13 19:41:33 -08:00 committed by GitHub
commit 5943f50dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go
View File

@ -22,7 +22,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
@ -397,7 +396,7 @@ func TestRouting(t *testing.T) {
t.Errorf("expected delegated called %v, got %v", tc.ExpectDelegateCalled, delegateCalled) t.Errorf("expected delegated called %v, got %v", tc.ExpectDelegateCalled, delegateCalled)
} }
result := recorder.Result() result := recorder.Result()
content, _ := ioutil.ReadAll(result.Body) content, _ := io.ReadAll(result.Body)
if e, a := expectStatus, result.StatusCode; e != a { if e, a := expectStatus, result.StatusCode; e != a {
t.Log(string(content)) t.Log(string(content))
t.Errorf("expected %v, got %v", e, a) t.Errorf("expected %v, got %v", e, a)
@ -1042,7 +1041,7 @@ func getOpenAPISpecFromFile() (*spec.Swagger, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
byteSpec, err := ioutil.ReadFile(path) byteSpec, err := os.ReadFile(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go
View File

@ -19,7 +19,6 @@ package testing
import ( import (
"context" "context"
"fmt" "fmt"
"io/ioutil"
"net" "net"
"os" "os"
"path/filepath" "path/filepath"
@ -101,7 +100,7 @@ func StartTestServer(t Logger, _ *TestServerInstanceOptions, customFlags []strin
} }
}() }()
result.TmpDir, err = ioutil.TempDir("", "apiextensions-apiserver") result.TmpDir, err = os.MkdirTemp("", "apiextensions-apiserver")
if err != nil { if err != nil {
return result, fmt.Errorf("failed to create temp dir: %v", err) return result, fmt.Errorf("failed to create temp dir: %v", err)
} }

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go
View File

@ -21,7 +21,7 @@ import (
"crypto/x509" "crypto/x509"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strings" "strings"
@ -84,7 +84,7 @@ type V1ReviewConverterFunc func(review *apiextensionsv1.ConversionReview) (*apie
func NewReviewWebhookHandler(t *testing.T, v1beta1ConverterFunc V1Beta1ReviewConverterFunc, v1ConverterFunc V1ReviewConverterFunc) http.Handler { func NewReviewWebhookHandler(t *testing.T, v1beta1ConverterFunc V1Beta1ReviewConverterFunc, v1ConverterFunc V1ReviewConverterFunc) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
data, err := ioutil.ReadAll(r.Body) data, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return

3
staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package fixtures package fixtures
import ( import (
"io/ioutil"
"os" "os"
"strings" "strings"
"time" "time"
@ -55,7 +54,7 @@ func StartDefaultServerWithConfigAccess(t servertesting.Logger, flags ...string)
func startDefaultServer(t servertesting.Logger, flags ...string) (func(), servertesting.TestServer, error) { func startDefaultServer(t servertesting.Logger, flags ...string) (func(), servertesting.TestServer, error) {
// create kubeconfig which will not actually be used. But authz/authn needs it to startup. // create kubeconfig which will not actually be used. But authz/authn needs it to startup.
fakeKubeConfig, err := ioutil.TempFile("", "kubeconfig") fakeKubeConfig, err := os.CreateTemp("", "kubeconfig")
if err != nil { if err != nil {
return nil, servertesting.TestServer{}, err return nil, servertesting.TestServer{}, err
} }