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

Fix comments

Browse source 
Signed-off-by: z1cheng <imchench@gmail.com>
This commit is contained in:
z1cheng 2023-08-11 14:27:33 +00:00
parent 64f7bf84ba
commit dbc161acc4
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1228,12 +1228,12 @@ func buildOpentracing(c, s interface{}) string {
buf := bytes.NewBufferString("") buf := bytes.NewBufferString("")
switch { //nolint:gocritic // rewriting if-else to switch statement is not more readable
case cfg.DatadogCollectorHost != "": if cfg.DatadogCollectorHost != "" {
buf.WriteString("opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;") buf.WriteString("opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;")
case cfg.ZipkinCollectorHost != "": } else if cfg.ZipkinCollectorHost != "" {
buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing_plugin.so /etc/nginx/opentracing.json;") buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing_plugin.so /etc/nginx/opentracing.json;")
case cfg.JaegerCollectorHost != "" || cfg.JaegerEndpoint != "": } else if cfg.JaegerCollectorHost != "" || cfg.JaegerEndpoint != "" {
buf.WriteString("opentracing_load_tracer /usr/local/lib/libjaegertracing_plugin.so /etc/nginx/opentracing.json;") buf.WriteString("opentracing_load_tracer /usr/local/lib/libjaegertracing_plugin.so /etc/nginx/opentracing.json;")
} }

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

@ -227,7 +227,7 @@ func ConfigureCRL(name string, crl []byte, sslCert *ingress.SSLCert) error {
_, err := x509.ParseRevocationList(pemCRLBlock.Bytes) _, err := x509.ParseRevocationList(pemCRLBlock.Bytes)
if err != nil { if err != nil {
return errors.New(err.Error()) return err
} }
err = os.WriteFile(crlFileName, crl, 0o600) err = os.WriteFile(crlFileName, crl, 0o600)

5
internal/nginx/maxmind.go
View file

@ -185,12 +185,13 @@ func downloadDatabase(dbName string) error {
return err return err
} }
//nolint:gocritic // TODO: will fix it on a followup PR
defer outFile.Close()
if _, err := io.CopyN(outFile, tarReader, header.Size); err != nil { if _, err := io.CopyN(outFile, tarReader, header.Size); err != nil {
return err return err
} }
outFile.Close()
return nil return nil
} }
} }

1
test/e2e/endpointslices/topology.go
View file

@ -85,6 +85,7 @@ var _ = framework.IngressNginxDescribeSerial("[TopologyHints] topology aware rou
} }
if gotHints { if gotHints {
// we have 2 replics, if there is just one backend it means that we are routing according slices hints to same zone as controller is
assert.Equal(ginkgo.GinkgoT(), 1, gotBackends) assert.Equal(ginkgo.GinkgoT(), 1, gotBackends)
} else { } else {
// two replicas should have two endpoints without topology hints // two replicas should have two endpoints without topology hints