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/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)
}