DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update go version, modules and remove ioutil

Browse source
This commit is contained in:
Ricardo Katz 2021-08-06 11:18:17 -03:00
parent 6f0401fc73
commit d226d831bd
31 changed files with 576 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/ingress/controller/store/store.go
View file

@ -20,7 +20,7 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"reflect"
"sort"
"sync"
@ -851,7 +851,7 @@ func (s *k8sStore) writeSSLSessionTicketKey(cmap *corev1.ConfigMap, fileName str
return
}
err = ioutil.WriteFile(fileName, decodedTicket, file.ReadWriteByUser)
err = os.WriteFile(fileName, decodedTicket, file.ReadWriteByUser)
if err != nil {
klog.Errorf("unexpected error writing ssl-session-ticket-key to %s: %v", fileName, err)
return

5
internal/ingress/controller/store/store_test.go
View file

@ -20,7 +20,6 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"sync"
"sync/atomic"
@ -959,14 +958,14 @@ func TestWriteSSLSessionTicketKey(t *testing.T) {
},
}
f, err := ioutil.TempFile("", "ssl-session-ticket-test")
f, err := os.CreateTemp("", "ssl-session-ticket-test")
if err != nil {
t.Fatal(err)
}
s.writeSSLSessionTicketKey(cmap, f.Name())
content, err := ioutil.ReadFile(f.Name())
content, err := os.ReadFile(f.Name())
if err != nil {
t.Fatal(err)
}