Skip to content

Migrate away from deprecated ioutil #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate away from deprecated ioutil #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/controller/cabundleinjector/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package cabundleinjector
import (
"context"
"fmt"
"io/ioutil"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"os"
"strings"
"time"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
kubeinformers "k8s.io/client-go/informers"
Expand Down Expand Up @@ -52,18 +52,18 @@ func StartCABundleInjector(ctx context.Context, controllerContext *controllercmd
// TODO(marun) Detect and respond to changes in this path rather than
// depending on the operator for redeployment
caBundleFile := "/var/run/configmaps/signing-cabundle/ca-bundle.crt"
caBundleContent, err := ioutil.ReadFile(caBundleFile)
caBundleContent, err := os.ReadFile(caBundleFile)
if err != nil {
return err
}

// this construction matches what the old kube controller manager did. It added the entire ca.crt to the service-ca.crt.
vulnerableLegacyCABundleContent, err := ioutil.ReadFile(caBundleFile)
vulnerableLegacyCABundleContent, err := os.ReadFile(caBundleFile)
if err != nil {
return err
}
saTokenCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
saTokenCABundleContent, err := ioutil.ReadFile(saTokenCAFile)
saTokenCABundleContent, err := os.ReadFile(saTokenCAFile)
if err != nil && !os.IsNotExist(err) {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/controller/servingcert/starter/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"crypto/x509"
"fmt"
"io/ioutil"
"os"
"time"

Expand Down Expand Up @@ -103,7 +102,7 @@ func StartServiceServingCertSigner(ctx context.Context, controllerContext *contr
// bridge trust between the current and previous CA, but a new cluster
// will not have a previous CA.
func readIntermediateCACert(filename string) (*x509.Certificate, error) {
certsPEMBlock, err := ioutil.ReadFile(filename)
certsPEMBlock, err := os.ReadFile(filename)
if os.IsNotExist(err) {
klog.V(4).Infof("%q does not exist which indicates that an intermediate certificate was not specified", filename)
return nil, nil
Expand Down
5 changes: 2 additions & 3 deletions test/util/rotate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"crypto/x509"
"encoding/base64"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
Expand Down Expand Up @@ -59,7 +58,7 @@ func CheckRotation(t *testing.T, dnsName string, oldCertPEM, oldKeyPEM, oldBundl
func checkClientTrust(t *testing.T, testName, dnsName string, certPEM, keyPEM, bundlePEM []byte) {
// Emulate how a service will consume the serving cert by writing
// the cert and key to disk.
certFile, err := ioutil.TempFile("", v1.TLSCertKey)
certFile, err := os.CreateTemp("", v1.TLSCertKey)
if err != nil {
t.Fatalf("error creating tmpfile for cert: %v", err)

Expand All @@ -75,7 +74,7 @@ func checkClientTrust(t *testing.T, testName, dnsName string, certPEM, keyPEM, b
t.Fatalf("Error writing cert to disk: %v", err)
}

keyFile, err := ioutil.TempFile("", v1.TLSPrivateKeyKey)
keyFile, err := os.CreateTemp("", v1.TLSPrivateKeyKey)
if err != nil {
t.Fatalf("error creating tmpfile for key: %v", err)

Expand Down