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

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 {