From 71d88cccee96503ecb08cd836159374d6785c51a Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Mon, 24 Nov 2025 15:54:49 -0600 Subject: [PATCH] Migrate away from deprecated ioutil --- pkg/cloud/libvirt/client/cloudinit.go | 9 ++++----- pkg/cloud/libvirt/client/ignition.go | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/cloud/libvirt/client/cloudinit.go b/pkg/cloud/libvirt/client/cloudinit.go index 7ff5f97c3..ca2535582 100644 --- a/pkg/cloud/libvirt/client/cloudinit.go +++ b/pkg/cloud/libvirt/client/cloudinit.go @@ -5,7 +5,6 @@ import ( "context" "encoding/base64" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -144,21 +143,21 @@ func (ci *defCloudInit) createISO() (string, error) { // object func (ci *defCloudInit) createFiles() (string, error) { glog.Info("Creating ISO contents") - tmpDir, err := ioutil.TempDir("", "cloudinit") + tmpDir, err := os.MkdirTemp("", "cloudinit") if err != nil { return "", fmt.Errorf("Cannot create tmp directory for cloudinit ISO generation: %s", err) } // user-data - if err = ioutil.WriteFile(filepath.Join(tmpDir, userDataFileName), []byte(ci.UserData), os.ModePerm); err != nil { + if err = os.WriteFile(filepath.Join(tmpDir, userDataFileName), []byte(ci.UserData), os.ModePerm); err != nil { return "", fmt.Errorf("Error while writing user-data to file: %s", err) } // meta-data - if err = ioutil.WriteFile(filepath.Join(tmpDir, metaDataFileName), []byte(ci.MetaData), os.ModePerm); err != nil { + if err = os.WriteFile(filepath.Join(tmpDir, metaDataFileName), []byte(ci.MetaData), os.ModePerm); err != nil { return "", fmt.Errorf("Error while writing meta-data to file: %s", err) } // network-config - if err = ioutil.WriteFile(filepath.Join(tmpDir, networkConfigFileName), []byte(ci.NetworkConfig), os.ModePerm); err != nil { + if err = os.WriteFile(filepath.Join(tmpDir, networkConfigFileName), []byte(ci.NetworkConfig), os.ModePerm); err != nil { return "", fmt.Errorf("Error while writing network-config to file: %s", err) } diff --git a/pkg/cloud/libvirt/client/ignition.go b/pkg/cloud/libvirt/client/ignition.go index eddb596c7..0048cb7bf 100644 --- a/pkg/cloud/libvirt/client/ignition.go +++ b/pkg/cloud/libvirt/client/ignition.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "os" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -100,7 +99,7 @@ func (ign *defIgnition) createAndUpload(client *libvirtClient) (string, error) { // Dumps the Ignition object to a temporary ignition file func (ign *defIgnition) createFile() (string, error) { glog.Info("Creating Ignition temporary file") - tempFile, err := ioutil.TempFile("", ign.Name) + tempFile, err := os.CreateTemp("", ign.Name) if err != nil { return "", fmt.Errorf("Cannot create tmp file for Ignition: %s", err)