Skip to content

Commit b74a58e

Browse files
committed
Stop using deprecated ioutils
1 parent d66b254 commit b74a58e

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

vertical-pod-autoscaler/e2e/utils/certs.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package utils
2020

2121
import (
2222
"crypto/x509"
23-
"io/ioutil"
2423
"os"
2524

2625
"k8s.io/client-go/util/cert"
@@ -38,7 +37,7 @@ type certContext struct {
3837
// SetupWebhookCert sets up the server cert. For example, user, apiservers and admission webhooks
3938
// can use the cert to prove their identity to the kube-apiserver.
4039
func SetupWebhookCert(namespaceName string) *certContext {
41-
certDir, err := ioutil.TempDir("", "test-e2e-server-cert")
40+
certDir, err := os.MkdirTemp("", "test-e2e-server-cert")
4241
if err != nil {
4342
framework.Failf("Failed to create a temp dir for cert generation %v", err)
4443
}
@@ -51,11 +50,11 @@ func SetupWebhookCert(namespaceName string) *certContext {
5150
if err != nil {
5251
framework.Failf("Failed to create CA cert for apiserver %v", err)
5352
}
54-
caCertFile, err := ioutil.TempFile(certDir, "ca.crt")
53+
caCertFile, err := os.CreateTemp(certDir, "ca.crt")
5554
if err != nil {
5655
framework.Failf("Failed to create a temp file for ca cert generation %v", err)
5756
}
58-
if err := ioutil.WriteFile(caCertFile.Name(), utils.EncodeCertPEM(signingCert), 0644); err != nil {
57+
if err := os.WriteFile(caCertFile.Name(), utils.EncodeCertPEM(signingCert), 0644); err != nil {
5958
framework.Failf("Failed to write CA cert %v", err)
6059
}
6160
key, err := utils.NewPrivateKey()
@@ -73,22 +72,22 @@ func SetupWebhookCert(namespaceName string) *certContext {
7372
if err != nil {
7473
framework.Failf("Failed to create cert%v", err)
7574
}
76-
certFile, err := ioutil.TempFile(certDir, "server.crt")
75+
certFile, err := os.CreateTemp(certDir, "server.crt")
7776
if err != nil {
7877
framework.Failf("Failed to create a temp file for cert generation %v", err)
7978
}
80-
keyFile, err := ioutil.TempFile(certDir, "server.key")
79+
keyFile, err := os.CreateTemp(certDir, "server.key")
8180
if err != nil {
8281
framework.Failf("Failed to create a temp file for key generation %v", err)
8382
}
84-
if err = ioutil.WriteFile(certFile.Name(), utils.EncodeCertPEM(signedCert), 0600); err != nil {
83+
if err = os.WriteFile(certFile.Name(), utils.EncodeCertPEM(signedCert), 0600); err != nil {
8584
framework.Failf("Failed to write cert file %v", err)
8685
}
8786
privateKeyPEM, err := keyutil.MarshalPrivateKeyToPEM(key)
8887
if err != nil {
8988
framework.Failf("Failed to marshal key %v", err)
9089
}
91-
if err = ioutil.WriteFile(keyFile.Name(), privateKeyPEM, 0644); err != nil {
90+
if err = os.WriteFile(keyFile.Name(), privateKeyPEM, 0644); err != nil {
9291
framework.Failf("Failed to write key file %v", err)
9392
}
9493
return &certContext{

vertical-pod-autoscaler/e2e/v1/e2e.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package autoscaling
2121
import (
2222
"context"
2323
"fmt"
24-
"io/ioutil"
24+
"os"
2525
"path"
2626
"testing"
2727
"time"
@@ -334,7 +334,7 @@ func gatherTestSuiteMetrics() error {
334334
metricsJSON := metricsForE2E.PrintJSON()
335335
if framework.TestContext.ReportDir != "" {
336336
filePath := path.Join(framework.TestContext.ReportDir, "MetricsForE2ESuite_"+time.Now().Format(time.RFC3339)+".json")
337-
if err := ioutil.WriteFile(filePath, []byte(metricsJSON), 0644); err != nil {
337+
if err := os.WriteFile(filePath, []byte(metricsJSON), 0644); err != nil {
338338
return fmt.Errorf("error writing to %q: %v", filePath, err)
339339
}
340340
} else {

0 commit comments

Comments
 (0)