diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go index ba685efd0..4e51ac665 100644 --- a/internal/ingress/controller/template/template.go +++ b/internal/ingress/controller/template/template.go @@ -1228,12 +1228,12 @@ func buildOpentracing(c, s interface{}) string { buf := bytes.NewBufferString("") - switch { - case cfg.DatadogCollectorHost != "": + //nolint:gocritic // rewriting if-else to switch statement is not more readable + if cfg.DatadogCollectorHost != "" { 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;") - 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;") } diff --git a/internal/net/ssl/ssl.go b/internal/net/ssl/ssl.go index c6c519d51..7ffab8bd0 100644 --- a/internal/net/ssl/ssl.go +++ b/internal/net/ssl/ssl.go @@ -227,7 +227,7 @@ func ConfigureCRL(name string, crl []byte, sslCert *ingress.SSLCert) error { _, err := x509.ParseRevocationList(pemCRLBlock.Bytes) if err != nil { - return errors.New(err.Error()) + return err } err = os.WriteFile(crlFileName, crl, 0o600) diff --git a/internal/nginx/maxmind.go b/internal/nginx/maxmind.go index 8e601c731..bd6bc1048 100644 --- a/internal/nginx/maxmind.go +++ b/internal/nginx/maxmind.go @@ -185,12 +185,13 @@ func downloadDatabase(dbName string) error { 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 { return err } - outFile.Close() - return nil } } diff --git a/test/e2e/endpointslices/topology.go b/test/e2e/endpointslices/topology.go index 8ff71b254..3352edbb8 100644 --- a/test/e2e/endpointslices/topology.go +++ b/test/e2e/endpointslices/topology.go @@ -85,6 +85,7 @@ var _ = framework.IngressNginxDescribeSerial("[TopologyHints] topology aware rou } 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) } else { // two replicas should have two endpoints without topology hints