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

Update nginx image, use docker buildx and remove qemu (#4923)

Browse source 
* Update nginx image, use docker buildx and remove qemu

* Update e2e image
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-01-14 20:52:57 -03:00 • committed by GitHub
parent e726f25d03
commit c8015c7734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -949,7 +949,7 @@ func buildOpentracing(input interface{}) string {
buf.WriteString("opentracing_load_tracer /usr/local/lib/libjaegertracing_plugin.so /etc/nginx/opentracing.json;")
}
} else 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/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;")
}
buf.WriteString("\r\n")

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

@ -1184,7 +1184,7 @@ func TestBuildOpenTracing(t *testing.T) {
EnableOpentracing: true,
DatadogCollectorHost: "datadog-host.com",
}
expected = "opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n"
expected = "opentracing_load_tracer /usr/local/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n"
actual = buildOpentracing(cfgDatadog)
if expected != actual {