Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove deprecated io/ioutil

Browse Source 
Signed-off-by: Dmitry Rybin <ayrowa@yandex.ru>
This commit is contained in:
Dmitry Rybin
2021-07-30 20:49:44 +02:00
parent d40685ab62
commit 7f425efa6b
18 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/manifestgen/install/install.go
View File

@@ -20,7 +20,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"path"
@@ -55,7 +54,7 @@ func Generate(options Options, manifestsBase string) (*manifestgen.Manifest, err
} else {
// download the manifests base from GitHub
if manifestsBase == "" {
manifestsBase, err = ioutil.TempDir("", options.Namespace)
manifestsBase, err = os.MkdirTemp("", options.Namespace)
if err != nil {
return nil, fmt.Errorf("temp dir error: %w", err)
}
@@ -78,7 +77,7 @@ func Generate(options Options, manifestsBase string) (*manifestgen.Manifest, err
}
}
content, err := ioutil.ReadFile(output)
content, err := os.ReadFile(output)
if err != nil {
return nil, err
}

5
pkg/manifestgen/install/manifests.go
View File

@@ -20,7 +20,6 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"net/http"
"os"
"path"
@@ -103,12 +102,12 @@ func generate(base string, options Options) error {
// workaround for kustomize not being able to patch the SA in ClusterRoleBindings
defaultNS := MakeDefaultOptions().Namespace
if defaultNS != options.Namespace {
rbac, err := ioutil.ReadFile(rbacFile)
rbac, err := os.ReadFile(rbacFile)
if err != nil {
return fmt.Errorf("reading rbac file failed: %w", err)
}
rbac = bytes.ReplaceAll(rbac, []byte(defaultNS), []byte(options.Namespace))
if err := ioutil.WriteFile(rbacFile, rbac, os.ModePerm); err != nil {
if err := os.WriteFile(rbacFile, rbac, os.ModePerm); err != nil {
return fmt.Errorf("replacing service account namespace in rbac failed: %w", err)
}
}