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

Release new helm chart with certgen fixed (#7478)

Browse source 
* Update go version, modules and remove ioutil

* Release new helm chart with certgen fixed
This commit is contained in:
Ricardo Katz 2021-08-12 16:05:50 -03:00 • committed by GitHub
parent fd8687c648
commit f973f3ffda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 794 additions and 614 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/admission/controller/server.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package controller
import (
"io/ioutil"
"io"
"net/http"
admissionv1 "k8s.io/api/admission/v1"
@ -59,7 +59,7 @@ func NewAdmissionControllerServer(ac AdmissionController) *AdmissionControllerSe
func (acs *AdmissionControllerServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
defer req.Body.Close()
data, err := ioutil.ReadAll(req.Body)
data, err := io.ReadAll(req.Body)
if err != nil {
klog.ErrorS(err, "Failed to read request body")
w.WriteHeader(http.StatusBadRequest)

4
internal/file/file.go
View file

@ -19,7 +19,7 @@ package file
import (
"crypto/sha1" // #nosec
"encoding/hex"
"io/ioutil"
"os"
"k8s.io/klog/v2"
)
@ -27,7 +27,7 @@ import (
// SHA1 returns the SHA1 of a file.
func SHA1(filename string) string {
hasher := sha1.New() // #nosec
s, err := ioutil.ReadFile(filename)
s, err := os.ReadFile(filename)
if err != nil {
klog.ErrorS(err, "Error reading file", "path", filename)
return ""

4
internal/file/file_test.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package file
import (
"io/ioutil"
"os"
"testing"
)
@ -31,7 +31,7 @@ func TestSHA1(t *testing.T) {
}
for _, test := range tests {
f, err := ioutil.TempFile("", "sha-test")
f, err := os.CreateTemp("", "sha-test")
if err != nil {
t.Fatal(err)
}

6
internal/ingress/annotations/auth/main.go
View file

@ -18,7 +18,7 @@ package auth
import (
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
@ -183,7 +183,7 @@ func dumpSecretAuthFile(filename string, secret *api.Secret) error {
}
}
err := ioutil.WriteFile(filename, val, file.ReadWriteByUser)
err := os.WriteFile(filename, val, file.ReadWriteByUser)
if err != nil {
return ing_errors.LocationDenied{
Reason: errors.Wrap(err, "unexpected error creating password file"),
@ -202,7 +202,7 @@ func dumpSecretAuthMap(filename string, secret *api.Secret) error {
builder.WriteString("\n")
}
err := ioutil.WriteFile(filename, []byte(builder.String()), file.ReadWriteByUser)
err := os.WriteFile(filename, []byte(builder.String()), file.ReadWriteByUser)
if err != nil {
return ing_errors.LocationDenied{
Reason: errors.Wrap(err, "unexpected error creating password file"),

5
internal/ingress/annotations/auth/main_test.go
View file

@ -18,7 +18,6 @@ package auth
import (
"fmt"
"io/ioutil"
"os"
"testing"
"time"
@ -209,12 +208,12 @@ func TestIngressAuthInvalidSecretKey(t *testing.T) {
}
func dummySecretContent(t *testing.T) (string, string, *api.Secret) {
dir, err := ioutil.TempDir("", fmt.Sprintf("%v", time.Now().Unix()))
dir, err := os.MkdirTemp("", fmt.Sprintf("%v", time.Now().Unix()))
if err != nil {
t.Error(err)
}
tmpfile, err := ioutil.TempFile("", "example-")
tmpfile, err := os.CreateTemp("", "example-")
if err != nil {
t.Error(err)
}

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

@ -18,8 +18,8 @@ package controller
import (
"fmt"
"io/ioutil"
"net/http"
"os"
"strconv"
"strings"
@ -46,7 +46,7 @@ func (n *NGINXController) Check(_ *http.Request) error {
return errors.Wrap(err, "reading /proc directory")
}
f, err := ioutil.ReadFile(nginx.PID)
f, err := os.ReadFile(nginx.PID)
if err != nil {
return errors.Wrapf(err, "reading %v", nginx.PID)
}

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

@ -22,7 +22,7 @@ import (
"crypto/x509/pkix"
"encoding/asn1"
"fmt"
"io/ioutil"
"io"
"os"
"os/exec"
"path/filepath"
@ -122,7 +122,7 @@ func (ntc testNginxTestCommand) Test(cfg string) ([]byte, error) {
return nil, err
}
defer fd.Close()
bytes, err := ioutil.ReadAll(fd)
bytes, err := io.ReadAll(fd)
if err != nil {
ntc.t.Errorf("could not read generated nginx configuration: %v", err.Error())
}

15
internal/ingress/controller/nginx.go
View file

@ -22,7 +22,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
@ -611,12 +610,12 @@ func (n NGINXController) testTemplate(cfg []byte) error {
if len(cfg) == 0 {
return fmt.Errorf("invalid NGINX configuration (empty)")
}
tmpfile, err := ioutil.TempFile("", tempNginxPattern)
tmpfile, err := os.CreateTemp("", tempNginxPattern)
if err != nil {
return err
}
defer tmpfile.Close()
err = ioutil.WriteFile(tmpfile.Name(), cfg, file.ReadWriteByUser)
err = os.WriteFile(tmpfile.Name(), cfg, file.ReadWriteByUser)
if err != nil {
return err
}
@ -661,14 +660,14 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
if klog.V(2).Enabled() {
src, _ := ioutil.ReadFile(cfgPath)
src, _ := os.ReadFile(cfgPath)
if !bytes.Equal(src, content) {
tmpfile, err := ioutil.TempFile("", "new-nginx-cfg")
tmpfile, err := os.CreateTemp("", "new-nginx-cfg")
if err != nil {
return err
}
defer tmpfile.Close()
err = ioutil.WriteFile(tmpfile.Name(), content, file.ReadWriteByUser)
err = os.WriteFile(tmpfile.Name(), content, file.ReadWriteByUser)
if err != nil {
return err
}
@ -691,7 +690,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
}
err = ioutil.WriteFile(cfgPath, content, file.ReadWriteByUser)
err = os.WriteFile(cfgPath, content, file.ReadWriteByUser)
if err != nil {
return err
}
@ -1088,7 +1087,7 @@ func createOpentracingCfg(cfg ngx_config.Configuration) error {
// Expand possible environment variables before writing the configuration to file.
expanded := os.ExpandEnv(tmplBuf.String())
return ioutil.WriteFile("/etc/nginx/opentracing.json", []byte(expanded), file.ReadWriteByUser)
return os.WriteFile("/etc/nginx/opentracing.json", []byte(expanded), file.ReadWriteByUser)
}
func cleanTempNginxCfg() error {

9
internal/ingress/controller/nginx_test.go
View file

@ -19,7 +19,6 @@ package controller
import (
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"net/http/httptest"
@ -179,7 +178,7 @@ func TestConfigureDynamically(t *testing.T) {
t.Errorf("expected a 'POST' request, got '%s'", r.Method)
}
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil && err != io.EOF {
t.Fatal(err)
}
@ -339,7 +338,7 @@ func TestConfigureCertificates(t *testing.T) {
t.Errorf("expected a 'POST' request, got '%s'", r.Method)
}
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil && err != io.EOF {
t.Fatal(err)
}
@ -478,7 +477,7 @@ func TestCleanTempNginxCfg(t *testing.T) {
t.Fatal(err)
}
tmpfile, err := ioutil.TempFile("", tempNginxPattern)
tmpfile, err := os.CreateTemp("", tempNginxPattern)
if err != nil {
t.Fatal(err)
}
@ -495,7 +494,7 @@ func TestCleanTempNginxCfg(t *testing.T) {
t.Fatal(err)
}
tmpfile, err = ioutil.TempFile("", tempNginxPattern)
tmpfile, err = os.CreateTemp("", tempNginxPattern)
if err != nil {
t.Fatal(err)
}

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

@ -20,7 +20,7 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"reflect"
"sort"
"sync"
@ -946,7 +946,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"
@ -1331,14 +1330,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)
}

3
internal/ingress/controller/template/template.go
View file

@ -24,7 +24,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"math/rand" // #nosec
"net"
"net/url"
@ -77,7 +76,7 @@ type Template struct {
//NewTemplate returns a new Template instance or an
//error if the specified template file contains errors
func NewTemplate(file string) (*Template, error) {
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
return nil, errors.Wrapf(err, "unexpected error reading template %v", file)
}

9
internal/ingress/controller/template/template_test.go
View file

@ -20,7 +20,6 @@ import (
"bytes"
"encoding/base64"
"fmt"
"io/ioutil"
"net"
"os"
"path"
@ -479,7 +478,7 @@ func TestTemplateWithData(t *testing.T) {
t.Errorf("unexpected error reading json file: %v", err)
}
defer f.Close()
data, err := ioutil.ReadFile(f.Name())
data, err := os.ReadFile(f.Name())
if err != nil {
t.Error("unexpected error reading json file: ", err)
}
@ -523,7 +522,7 @@ func BenchmarkTemplateWithData(b *testing.B) {
b.Errorf("unexpected error reading json file: %v", err)
}
defer f.Close()
data, err := ioutil.ReadFile(f.Name())
data, err := os.ReadFile(f.Name())
if err != nil {
b.Error("unexpected error reading json file: ", err)
}
@ -1744,7 +1743,7 @@ func TestCleanConf(t *testing.T) {
}
actual := &bytes.Buffer{}
{
data, err := ioutil.ReadFile(testDataDir + "/cleanConf.src.conf")
data, err := os.ReadFile(testDataDir + "/cleanConf.src.conf")
if err != nil {
t.Error("unexpected error reading conf file: ", err)
}
@ -1755,7 +1754,7 @@ func TestCleanConf(t *testing.T) {
}
}
expected, err := ioutil.ReadFile(testDataDir + "/cleanConf.expected.conf")
expected, err := os.ReadFile(testDataDir + "/cleanConf.expected.conf")
if err != nil {
t.Error("unexpected error reading conf file: ", err)
}

3
internal/ingress/controller/util.go
View file

@ -18,7 +18,6 @@ package controller
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
@ -146,7 +145,7 @@ func (nc NginxCommand) Test(cfg string) ([]byte, error) {
// getSysctl returns the value for the specified sysctl setting
func getSysctl(sysctl string) (int, error) {
data, err := ioutil.ReadFile(path.Join("/proc/sys", sysctl))
data, err := os.ReadFile(path.Join("/proc/sys", sysctl))
if err != nil {
return -1, err
}

3
internal/ingress/metric/collectors/socket.go
View file

@ -19,7 +19,6 @@ package collectors
import (
"fmt"
"io"
"io/ioutil"
"net"
"os"
"syscall"
@ -442,7 +441,7 @@ func (sc *SocketCollector) SetHosts(hosts sets.String) {
// handleMessages process the content received in a network connection
func handleMessages(conn io.ReadCloser, fn func([]byte)) {
defer conn.Close()
data, err := ioutil.ReadAll(conn)
data, err := io.ReadAll(conn)
if err != nil {
return
}

4
internal/net/dns/dns.go
View file

@ -17,8 +17,8 @@ limitations under the License.
package dns
import (
"io/ioutil"
"net"
"os"
"strings"
"k8s.io/klog/v2"
@ -29,7 +29,7 @@ var defResolvConf = "/etc/resolv.conf"
// GetSystemNameServers returns the list of nameservers located in the file /etc/resolv.conf
func GetSystemNameServers() ([]net.IP, error) {
var nameservers []net.IP
file, err := ioutil.ReadFile(defResolvConf)
file, err := os.ReadFile(defResolvConf)
if err != nil {
return nameservers, err
}

5
internal/net/dns/dns_test.go
View file

@ -17,7 +17,6 @@ limitations under the License.
package dns
import (
"io/ioutil"
"net"
"os"
"testing"
@ -34,14 +33,14 @@ func TestGetDNSServers(t *testing.T) {
t.Error("expected at least 1 nameserver in /etc/resolv.conf")
}
f, err := ioutil.TempFile("", "fw")
f, err := os.CreateTemp("", "fw")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer f.Close()
defer os.Remove(f.Name())
ioutil.WriteFile(f.Name(), []byte(`
os.WriteFile(f.Name(), []byte(`
# comment
; comment
nameserver 2001:4860:4860::8844

17
internal/net/ssl/ssl.go
View file

@ -29,7 +29,6 @@ import (
"encoding/pem"
"errors"
"fmt"
"io/ioutil"
"math/big"
"net"
"os"
@ -181,7 +180,7 @@ func CheckCACert(caBytes []byte) ([]*x509.Certificate, error) {
func StoreSSLCertOnDisk(name string, sslCert *ingress.SSLCert) (string, error) {
pemFileName, _ := getPemFileName(name)
err := ioutil.WriteFile(pemFileName, []byte(sslCert.PemCertKey), file.ReadWriteByUser)
err := os.WriteFile(pemFileName, []byte(sslCert.PemCertKey), file.ReadWriteByUser)
if err != nil {
return "", fmt.Errorf("could not create PEM certificate file %v: %v", pemFileName, err)
}
@ -209,7 +208,7 @@ func ConfigureCACertWithCertAndKey(name string, ca []byte, sslCert *ingress.SSLC
return fmt.Errorf("could not write ca data to cert file %v: %v", sslCert.CAFileName, err)
}
return ioutil.WriteFile(sslCert.CAFileName, buffer.Bytes(), 0644)
return os.WriteFile(sslCert.CAFileName, buffer.Bytes(), 0644)
}
// ConfigureCRL creates a CRL file and append it into the SSLCert
@ -232,7 +231,7 @@ func ConfigureCRL(name string, crl []byte, sslCert *ingress.SSLCert) error {
return fmt.Errorf(err.Error())
}
err = ioutil.WriteFile(crlFileName, crl, 0644)
err = os.WriteFile(crlFileName, crl, 0644)
if err != nil {
return fmt.Errorf("could not write CRL file %v: %v", crlFileName, err)
}
@ -250,7 +249,7 @@ func ConfigureCACert(name string, ca []byte, sslCert *ingress.SSLCert) error {
caName := fmt.Sprintf("ca-%v.pem", name)
fileName := fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, caName)
err := ioutil.WriteFile(fileName, ca, 0644)
err := os.WriteFile(fileName, ca, 0644)
if err != nil {
return fmt.Errorf("could not write CA file %v: %v", fileName, err)
}
@ -332,7 +331,7 @@ func parseSANExtension(value []byte) (dnsNames, emailAddresses []string, ipAddre
func AddOrUpdateDHParam(name string, dh []byte) (string, error) {
pemFileName, pemName := getPemFileName(name)
tempPemFile, err := ioutil.TempFile(file.DefaultSSLDirectory, pemName)
tempPemFile, err := os.CreateTemp(file.DefaultSSLDirectory, pemName)
klog.V(3).InfoS("Creating temporal file for DH", "path", tempPemFile.Name(), "name", pemName)
if err != nil {
@ -351,7 +350,7 @@ func AddOrUpdateDHParam(name string, dh []byte) (string, error) {
defer os.Remove(tempPemFile.Name())
pemCerts, err := ioutil.ReadFile(tempPemFile.Name())
pemCerts, err := os.ReadFile(tempPemFile.Name())
if err != nil {
return "", err
}
@ -530,12 +529,12 @@ func (tl *TLSListener) TLSConfig() *tls.Config {
func (tl *TLSListener) load() {
klog.InfoS("loading tls certificate", "path", tl.certificatePath, "key", tl.keyPath)
certBytes, err := ioutil.ReadFile(tl.certificatePath)
certBytes, err := os.ReadFile(tl.certificatePath)
if err != nil {
tl.certificate = nil
tl.err = err
}
keyBytes, err := ioutil.ReadFile(tl.keyPath)
keyBytes, err := os.ReadFile(tl.keyPath)
if err != nil {
tl.certificate = nil
tl.err = err

6
internal/net/ssl/ssl_test.go
View file

@ -28,11 +28,11 @@ import (
"encoding/pem"
"errors"
"fmt"
"io/ioutil"
"math"
"math/big"
"net/http"
"net/http/httptest"
"os"
"strings"
"sync"
"testing"
@ -393,7 +393,7 @@ func encodeCertPEM(cert *x509.Certificate) []byte {
func newFakeCertificate(t *testing.T) ([]byte, string, string) {
cert, key := getFakeHostSSLCert("localhost")
certFile, err := ioutil.TempFile("", "crt-")
certFile, err := os.CreateTemp("", "crt-")
if err != nil {
t.Errorf("failed to write test key: %v", err)
}
@ -401,7 +401,7 @@ func newFakeCertificate(t *testing.T) ([]byte, string, string) {
certFile.Write(cert)
defer certFile.Close()
keyFile, err := ioutil.TempFile("", "key-")
keyFile, err := os.CreateTemp("", "key-")
if err != nil {
t.Errorf("failed to write test key: %v", err)
}

8
internal/nginx/main.go
View file

@ -20,7 +20,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"os/exec"
@ -69,7 +69,7 @@ func NewGetStatusRequest(path string) (int, []byte, error) {
}
defer res.Body.Close()
data, err := ioutil.ReadAll(res.Body)
data, err := io.ReadAll(res.Body)
if err != nil {
return 0, nil, err
}
@ -93,7 +93,7 @@ func NewPostStatusRequest(path, contentType string, data interface{}) (int, []by
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
body, err := io.ReadAll(res.Body)
if err != nil {
return 0, nil, err
}
@ -133,7 +133,7 @@ func readFileToString(path string) (string, error) {
}
defer f.Close()
contents, err := ioutil.ReadAll(f)
contents, err := io.ReadAll(f)
if err != nil {
return "", err
}

4
internal/runtime/cpu_linux.go
View file

@ -19,8 +19,8 @@ limitations under the License.
package runtime
import (
"io/ioutil"
"math"
"os"
"path/filepath"
"runtime"
"strconv"
@ -52,7 +52,7 @@ func NumCPU() int {
}
func readCgroupFileToInt64(cgroupPath, cgroupFile string) int64 {
contents, err := ioutil.ReadFile(filepath.Join(cgroupPath, cgroupFile))
contents, err := os.ReadFile(filepath.Join(cgroupPath, cgroupFile))
if err != nil {
return -1
}

9
internal/watch/file_watcher_test.go
View file

@ -17,7 +17,6 @@ limitations under the License.
package watch
import (
"io/ioutil"
"os"
"path"
"path/filepath"
@ -37,7 +36,7 @@ func prepareTimeout() chan bool {
}
func TestFileWatcher(t *testing.T) {
f, err := ioutil.TempFile("", "fw")
f, err := os.CreateTemp("", "fw")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -62,7 +61,7 @@ func TestFileWatcher(t *testing.T) {
t.Fatalf("expected no events before writing a file")
case <-timeoutChan:
}
ioutil.WriteFile(f.Name(), []byte{}, file.ReadWriteByUser)
os.WriteFile(f.Name(), []byte{}, file.ReadWriteByUser)
select {
case <-events:
case <-timeoutChan:
@ -71,7 +70,7 @@ func TestFileWatcher(t *testing.T) {
}
func TestFileWatcherWithNestedSymlink(t *testing.T) {
target1, err := ioutil.TempFile("", "t1")
target1, err := os.CreateTemp("", "t1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -115,7 +114,7 @@ func TestFileWatcherWithNestedSymlink(t *testing.T) {
}
defer fw.Close()
target2, err := ioutil.TempFile("", "t2")
target2, err := os.CreateTemp("", "t2")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}