public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-06 23:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Release-1.23] Replace deprecated ioutil package (#6236)

Browse Source 
* check integration test null pointer

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Remove rotate retries

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Replace ioutil package

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Rebase fix

Signed-off-by: Derek Nola <derek.nola@suse.com>

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola
2022-10-07 19:02:58 -07:00
committed by GitHub
parent 8752dbdce6
commit 39361a8053
41 changed files with 136 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/https.go
View File

@@ -5,7 +5,7 @@ import (
"crypto/tls"
"errors"
"fmt"
"io/ioutil"
"io"
"log"
"net"
"net/http"
@@ -115,7 +115,7 @@ func (c *Cluster) initClusterAndHTTPS(ctx context.Context) error {
if logrus.IsLevelEnabled(logrus.DebugLevel) {
server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags)
} else {
server.ErrorLog = log.New(ioutil.Discard, "Cluster-Http-Server", 0)
server.ErrorLog = log.New(io.Discard, "Cluster-Http-Server", 0)
}
// Start the supervisor http server on the tls listener