diff --git a/examples/BUILD b/examples/BUILD index 2ad8bbe29b5a7..72c67907b8793 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -14,9 +14,14 @@ filegroup( "cors/backend/service-envoy.yaml", "cors/frontend/front-envoy.yaml", "cors/frontend/service-envoy.yaml", + "csrf/crosssite/front-envoy.yaml", + "csrf/samesite/front-envoy.yaml", + "csrf/service-envoy.yaml", "ext_authz/config/grpc-service/v2.yaml", "ext_authz/config/grpc-service/v3.yaml", "ext_authz/config/http-service.yaml", + "ext_authz/config/opa-service/v2.yaml", + "fault-injection/envoy.yaml", "front-proxy/front-envoy.yaml", "front-proxy/service-envoy.yaml", "grpc-bridge/client/envoy-proxy.yaml", @@ -27,6 +32,8 @@ filegroup( "load-reporting-service/service-envoy-w-lrs.yaml", "lua/envoy.yaml", "lua/lib/mylibrary.lua", + "mysql/envoy.yaml", + "redis/envoy.yaml", "zipkin-tracing/front-envoy-zipkin.yaml", "zipkin-tracing/service1-envoy-zipkin.yaml", "zipkin-tracing/service2-envoy-zipkin.yaml", diff --git a/examples/cors/backend/Dockerfile-frontenvoy b/examples/cors/backend/Dockerfile-frontenvoy index 83b5ba806c6a1..0b2e25a0de1bd 100644 --- a/examples/cors/backend/Dockerfile-frontenvoy +++ b/examples/cors/backend/Dockerfile-frontenvoy @@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install -y \ curl +COPY ./front-envoy.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml index 35427012b465c..af233b442c410 100644 --- a/examples/cors/backend/docker-compose.yaml +++ b/examples/cors/backend/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - volumes: - - ./front-envoy.yaml:/etc/front-envoy.yaml networks: - envoymesh expose: diff --git a/examples/cors/frontend/Dockerfile-frontenvoy b/examples/cors/frontend/Dockerfile-frontenvoy index 83b5ba806c6a1..0b2e25a0de1bd 100644 --- a/examples/cors/frontend/Dockerfile-frontenvoy +++ b/examples/cors/frontend/Dockerfile-frontenvoy @@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install -y \ curl +COPY ./front-envoy.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml index 5b230317cb7df..7872d92ae83df 100644 --- a/examples/cors/frontend/docker-compose.yaml +++ b/examples/cors/frontend/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - volumes: - - ./front-envoy.yaml:/etc/front-envoy.yaml networks: - envoymesh expose: diff --git a/examples/csrf/Dockerfile-frontenvoy b/examples/csrf/crosssite/Dockerfile-frontenvoy similarity index 67% rename from examples/csrf/Dockerfile-frontenvoy rename to examples/csrf/crosssite/Dockerfile-frontenvoy index 83b5ba806c6a1..0b2e25a0de1bd 100644 --- a/examples/csrf/Dockerfile-frontenvoy +++ b/examples/csrf/crosssite/Dockerfile-frontenvoy @@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install -y \ curl +COPY ./front-envoy.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/csrf/crosssite/docker-compose.yml b/examples/csrf/crosssite/docker-compose.yml index 31e2df9579795..4a2f3fdbf43e4 100644 --- a/examples/csrf/crosssite/docker-compose.yml +++ b/examples/csrf/crosssite/docker-compose.yml @@ -3,10 +3,8 @@ services: front-envoy: build: - context: .. + context: . dockerfile: Dockerfile-frontenvoy - volumes: - - ./front-envoy.yaml:/etc/front-envoy.yaml networks: - envoymesh expose: diff --git a/examples/csrf/crosssite/front-envoy.yaml b/examples/csrf/crosssite/front-envoy.yaml index ea4b7a5f3316c..879a0fa665761 100644 --- a/examples/csrf/crosssite/front-envoy.yaml +++ b/examples/csrf/crosssite/front-envoy.yaml @@ -15,7 +15,7 @@ static_resources: - name: envoy.access_loggers.file typed_config: "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog - path: "/var/log/access.log" + path: "/dev/stdout" route_config: name: local_route virtual_hosts: diff --git a/examples/csrf/samesite/Dockerfile-frontenvoy b/examples/csrf/samesite/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..0b2e25a0de1bd --- /dev/null +++ b/examples/csrf/samesite/Dockerfile-frontenvoy @@ -0,0 +1,7 @@ +FROM envoyproxy/envoy-dev:latest + +RUN apt-get update && apt-get -q install -y \ + curl +COPY ./front-envoy.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml +CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/csrf/samesite/docker-compose.yml b/examples/csrf/samesite/docker-compose.yml index 45ef76f05b7fa..2fcac143f6f69 100644 --- a/examples/csrf/samesite/docker-compose.yml +++ b/examples/csrf/samesite/docker-compose.yml @@ -3,10 +3,8 @@ services: front-envoy: build: - context: .. + context: . dockerfile: Dockerfile-frontenvoy - volumes: - - ./front-envoy.yaml:/etc/front-envoy.yaml networks: - envoymesh expose: diff --git a/examples/csrf/samesite/front-envoy.yaml b/examples/csrf/samesite/front-envoy.yaml index e47aff2ec0f81..cc18e2080a244 100644 --- a/examples/csrf/samesite/front-envoy.yaml +++ b/examples/csrf/samesite/front-envoy.yaml @@ -15,7 +15,7 @@ static_resources: - name: envoy.access_loggers.file typed_config: "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog - path: "/var/log/access.log" + path: "/dev/stdout" route_config: name: local_route virtual_hosts: @@ -23,14 +23,17 @@ static_resources: domains: - "*" cors: - allow_origin: - - "*" + allow_origin_string_match: + - safe_regex: + google_re2: {} + regex: \* filter_enabled: default_value: numerator: 100 denominator: HUNDRED - per_filter_config: + typed_per_filter_config: envoy.filters.http.csrf: + "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy filter_enabled: default_value: numerator: 100 @@ -46,8 +49,9 @@ static_resources: prefix: "/csrf/disabled" route: cluster: generic_service - per_filter_config: + typed_per_filter_config: envoy.filters.http.csrf: + "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy filter_enabled: default_value: numerator: 0 @@ -56,8 +60,9 @@ static_resources: prefix: "/csrf/shadow" route: cluster: generic_service - per_filter_config: + typed_per_filter_config: envoy.filters.http.csrf: + "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy filter_enabled: default_value: numerator: 0 @@ -70,14 +75,17 @@ static_resources: prefix: "/csrf/additional_origin" route: cluster: generic_service - per_filter_config: + typed_per_filter_config: envoy.filters.http.csrf: + "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy filter_enabled: default_value: numerator: 100 denominator: HUNDRED additional_origins: - - regex: .* + - safe_regex: + google_re2: {} + regex: .* - match: prefix: "/" route: @@ -86,7 +94,8 @@ static_resources: - name: envoy.filters.http.cors typed_config: {} - name: envoy.filters.http.csrf - config: + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy filter_enabled: default_value: numerator: 0 diff --git a/examples/ext_authz/Dockerfile-frontenvoy b/examples/ext_authz/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..f329c86ce6559 --- /dev/null +++ b/examples/ext_authz/Dockerfile-frontenvoy @@ -0,0 +1,9 @@ +FROM envoyproxy/envoy-dev:latest + +RUN apt-get update && apt-get -q install -y \ + curl +COPY ./config /etc/envoy-config +COPY ./run_envoy.sh /run_envoy.sh +RUN chmod go+r -R /etc/envoy-config \ + && chmod go+rx /run_envoy.sh /etc/envoy-config /etc/envoy-config/* +CMD /run_envoy.sh diff --git a/examples/ext_authz/docker-compose.yaml b/examples/ext_authz/docker-compose.yaml index e7fb59a7f2c31..148ecc489f8e7 100644 --- a/examples/ext_authz/docker-compose.yaml +++ b/examples/ext_authz/docker-compose.yaml @@ -3,10 +3,10 @@ services: front-envoy: build: - context: ../ - dockerfile: front-proxy/Dockerfile-frontenvoy - volumes: - - ./${FRONT_ENVOY_YAML}:/etc/front-envoy.yaml + context: . + dockerfile: Dockerfile-frontenvoy + environment: + - FRONT_ENVOY_YAML networks: - envoymesh expose: diff --git a/examples/ext_authz/run_envoy.sh b/examples/ext_authz/run_envoy.sh new file mode 100755 index 0000000000000..c9bb7ca58b4d3 --- /dev/null +++ b/examples/ext_authz/run_envoy.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/local/bin/envoy -c "/etc/envoy-${FRONT_ENVOY_YAML}" --service-cluster front-proxy diff --git a/examples/fault-injection/Dockerfile-envoy b/examples/fault-injection/Dockerfile-envoy index f4c09bae67c5e..13dec2521a999 100644 --- a/examples/fault-injection/Dockerfile-envoy +++ b/examples/fault-injection/Dockerfile-envoy @@ -1,4 +1,6 @@ FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get install -y curl tree +COPY ./envoy.yaml /etc/envoy.yaml +RUN chmod go+r /etc/envoy.yaml COPY enable_delay_fault_injection.sh disable_delay_fault_injection.sh enable_abort_fault_injection.sh disable_abort_fault_injection.sh send_request.sh / diff --git a/examples/fault-injection/docker-compose.yaml b/examples/fault-injection/docker-compose.yaml index fe8ec0c9d68fb..50daad870d67a 100644 --- a/examples/fault-injection/docker-compose.yaml +++ b/examples/fault-injection/docker-compose.yaml @@ -6,7 +6,6 @@ services: dockerfile: Dockerfile-envoy command: /usr/local/bin/envoy -c /etc/envoy.yaml volumes: - - ./envoy.yaml:/etc/envoy.yaml - ./runtime:/srv/runtime networks: - envoymesh diff --git a/examples/fault-injection/envoy.yaml b/examples/fault-injection/envoy.yaml index 661e5ad88f544..ac0bd82b3568a 100644 --- a/examples/fault-injection/envoy.yaml +++ b/examples/fault-injection/envoy.yaml @@ -63,6 +63,9 @@ admin: socket_address: address: 0.0.0.0 port_value: 9901 -runtime: - symlink_root: /srv/runtime/current - subdirectory: envoy +layered_runtime: + layers: + - name: disk_layer_0 + disk_layer: + symlink_root: /srv/runtime/current + subdirectory: envoy diff --git a/examples/front-proxy/Dockerfile-frontenvoy b/examples/front-proxy/Dockerfile-frontenvoy index 83b5ba806c6a1..0b2e25a0de1bd 100644 --- a/examples/front-proxy/Dockerfile-frontenvoy +++ b/examples/front-proxy/Dockerfile-frontenvoy @@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install -y \ curl +COPY ./front-envoy.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/front-proxy/docker-compose.yaml b/examples/front-proxy/docker-compose.yaml index f8de52edd2986..cac5826a46d21 100644 --- a/examples/front-proxy/docker-compose.yaml +++ b/examples/front-proxy/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - volumes: - - ./front-envoy.yaml:/etc/front-envoy.yaml networks: - envoymesh expose: diff --git a/examples/grpc-bridge/Dockerfile-client b/examples/grpc-bridge/Dockerfile-client new file mode 100644 index 0000000000000..da27eecaf6891 --- /dev/null +++ b/examples/grpc-bridge/Dockerfile-client @@ -0,0 +1,5 @@ +FROM envoyproxy/envoy-dev:latest + +COPY ./client/envoy-proxy.yaml /etc/client-envoy-proxy.yaml +RUN chmod go+r /etc/client-envoy-proxy.yaml +CMD /usr/local/bin/envoy -c /etc/client-envoy-proxy.yaml diff --git a/examples/grpc-bridge/Dockerfile-server b/examples/grpc-bridge/Dockerfile-server new file mode 100644 index 0000000000000..a59690934ede4 --- /dev/null +++ b/examples/grpc-bridge/Dockerfile-server @@ -0,0 +1,5 @@ +FROM envoyproxy/envoy-dev:latest + +COPY ./server/envoy-proxy.yaml /etc/server-envoy-proxy.yaml +RUN chmod go+r /etc/server-envoy-proxy.yaml +CMD /usr/local/bin/envoy -c /etc/server-envoy-proxy.yaml --service-cluster backend-proxy diff --git a/examples/grpc-bridge/docker-compose.yaml b/examples/grpc-bridge/docker-compose.yaml index c09707a310e55..3ffaa58447c6b 100644 --- a/examples/grpc-bridge/docker-compose.yaml +++ b/examples/grpc-bridge/docker-compose.yaml @@ -17,10 +17,9 @@ services: - kv-backend-service grpc-server-proxy: - image: envoyproxy/envoy:latest - command: /usr/local/bin/envoy -c /etc/server-envoy-proxy.yaml --service-cluster backend-proxy - volumes: - - ./server/envoy-proxy.yaml:/etc/server-envoy-proxy.yaml + build: + context: . + dockerfile: Dockerfile-server networks: envoymesh: aliases: @@ -45,10 +44,9 @@ services: - grpc-client grpc-client-proxy: - image: envoyproxy/envoy:latest - command: /usr/local/bin/envoy -c /etc/client-envoy-proxy.yaml - volumes: - - ./client/envoy-proxy.yaml:/etc/client-envoy-proxy.yaml + build: + context: . + dockerfile: Dockerfile-client networks: envoymesh: aliases: diff --git a/examples/jaeger-native-tracing/Dockerfile-frontenvoy b/examples/jaeger-native-tracing/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..5379dfe5e242c --- /dev/null +++ b/examples/jaeger-native-tracing/Dockerfile-frontenvoy @@ -0,0 +1,17 @@ +FROM envoyproxy/envoy-dev:latest + +RUN apt-get update && apt-get -q install -y \ + curl +COPY ./front-envoy-jaeger.yaml /etc/front-envoy.yaml +# +# for discussion on jaeger binary compatibility, and the source of the file, see here: +# https://github.com/envoyproxy/envoy/issues/11382#issuecomment-638012072 +# +RUN echo "4a7d17d4724ee890490bcd6cfdedb12a02316a3d33214348d30979abd201f1ca /usr/local/lib/libjaegertracing_plugin.so" > /tmp/checksum \ + && curl -Ls https://github.com/tetratelabs/getenvoy-package/files/3518103/getenvoy-centos-jaegertracing-plugin.tar.gz \ + | tar zxf - -C /usr/local/lib \ + && mv /usr/local/lib/libjaegertracing.so.0.4.2 /usr/local/lib/libjaegertracing_plugin.so \ + && sha256sum -c /tmp/checksum \ + && rm /tmp/checksum \ + && chmod go+r /etc/front-envoy.yaml +CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/jaeger-native-tracing/docker-compose.yaml b/examples/jaeger-native-tracing/docker-compose.yaml index ca8fccb3d52b1..b0060928551aa 100644 --- a/examples/jaeger-native-tracing/docker-compose.yaml +++ b/examples/jaeger-native-tracing/docker-compose.yaml @@ -3,13 +3,8 @@ services: front-envoy: build: - context: ../ - dockerfile: front-proxy/Dockerfile-frontenvoy - volumes: - - ./front-envoy-jaeger.yaml:/etc/front-envoy.yaml - - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh - - ./start-front.sh:/start-front.sh - entrypoint: /start-front.sh + context: . + dockerfile: Dockerfile-frontenvoy networks: - envoymesh expose: @@ -28,9 +23,7 @@ services: dockerfile: Dockerfile-service volumes: - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml - - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh - - ./start-service.sh:/start-service.sh - entrypoint: /start-service.sh + - ./libjaegertracing.so.0.4.2:/usr/local/lib/libjaegertracing_plugin.so networks: envoymesh: aliases: @@ -49,9 +42,7 @@ services: dockerfile: Dockerfile-service volumes: - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml - - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh - - ./start-service.sh:/start-service.sh - entrypoint: /start-service.sh + - ./libjaegertracing.so.0.4.2:/usr/local/lib/libjaegertracing_plugin.so networks: envoymesh: aliases: diff --git a/examples/jaeger-native-tracing/start-front.sh b/examples/jaeger-native-tracing/start-front.sh deleted file mode 100755 index 0f2eff4030211..0000000000000 --- a/examples/jaeger-native-tracing/start-front.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -/install-jaeger-plugin.sh -/usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/jaeger-native-tracing/start-service.sh b/examples/jaeger-native-tracing/start-service.sh deleted file mode 100755 index e4d9643215e07..0000000000000 --- a/examples/jaeger-native-tracing/start-service.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -/install-jaeger-plugin.sh -/usr/local/bin/start_service.sh diff --git a/examples/jaeger-tracing/Dockerfile-frontenvoy b/examples/jaeger-tracing/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..e955e76bb9b85 --- /dev/null +++ b/examples/jaeger-tracing/Dockerfile-frontenvoy @@ -0,0 +1,7 @@ +FROM envoyproxy/envoy-dev:latest + +RUN apt-get update && apt-get -q install -y \ + curl +COPY ./front-envoy-jaeger.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml +CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/jaeger-tracing/docker-compose.yaml b/examples/jaeger-tracing/docker-compose.yaml index 94fbfb62bfa1d..22026eac8befa 100644 --- a/examples/jaeger-tracing/docker-compose.yaml +++ b/examples/jaeger-tracing/docker-compose.yaml @@ -3,10 +3,8 @@ services: front-envoy: build: - context: ../ - dockerfile: front-proxy/Dockerfile-frontenvoy - volumes: - - ./front-envoy-jaeger.yaml:/etc/front-envoy.yaml + context: . + dockerfile: Dockerfile-frontenvoy networks: - envoymesh expose: diff --git a/examples/lua/Dockerfile-proxy b/examples/lua/Dockerfile-proxy index 5ba5c9c33a0db..03cb54ac245bf 100644 --- a/examples/lua/Dockerfile-proxy +++ b/examples/lua/Dockerfile-proxy @@ -1,3 +1,5 @@ FROM envoyproxy/envoy-dev:latest ADD ./lib/mylibrary.lua /lib/mylibrary.lua +COPY ./envoy.yaml /etc/envoy.yaml +RUN chmod go+r /etc/envoy.yaml /lib/mylibrary.lua CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml index 716ae8f6c4ff9..c5472e4aa8fd1 100644 --- a/examples/lua/docker-compose.yaml +++ b/examples/lua/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-proxy - volumes: - - ./envoy.yaml:/etc/envoy.yaml networks: - envoymesh expose: diff --git a/examples/mysql/Dockerfile-proxy b/examples/mysql/Dockerfile-proxy index ad18604cd0c78..09595e6e6279e 100644 --- a/examples/mysql/Dockerfile-proxy +++ b/examples/mysql/Dockerfile-proxy @@ -1,3 +1,5 @@ FROM envoyproxy/envoy-dev:latest +COPY ./envoy.yaml /etc/envoy.yaml +RUN chmod go+r /etc/envoy.yaml CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml index d4b8b13e13c1e..720a05acb2a2c 100644 --- a/examples/mysql/docker-compose.yaml +++ b/examples/mysql/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-proxy - volumes: - - ./envoy.yaml:/etc/envoy.yaml networks: envoymesh: aliases: diff --git a/examples/zipkin-tracing/Dockerfile-frontenvoy b/examples/zipkin-tracing/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..87040962caf2f --- /dev/null +++ b/examples/zipkin-tracing/Dockerfile-frontenvoy @@ -0,0 +1,7 @@ +FROM envoyproxy/envoy-dev:latest + +RUN apt-get update && apt-get -q install -y \ + curl +COPY ./front-envoy-zipkin.yaml /etc/front-envoy.yaml +RUN chmod go+r /etc/front-envoy.yaml +CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy diff --git a/examples/zipkin-tracing/docker-compose.yaml b/examples/zipkin-tracing/docker-compose.yaml index 488ccccf1bb65..dc82e926ef5a9 100644 --- a/examples/zipkin-tracing/docker-compose.yaml +++ b/examples/zipkin-tracing/docker-compose.yaml @@ -3,10 +3,8 @@ services: front-envoy: build: - context: ../ - dockerfile: front-proxy/Dockerfile-frontenvoy - volumes: - - ./front-envoy-zipkin.yaml:/etc/front-envoy.yaml + context: . + dockerfile: Dockerfile-frontenvoy networks: - envoymesh expose: diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc index 6d68ccc0c4244..788b04f293c84 100644 --- a/test/config_test/example_configs_test.cc +++ b/test/config_test/example_configs_test.cc @@ -21,9 +21,9 @@ TEST(ExampleConfigsTest, All) { #ifdef __APPLE__ // freebind/freebind.yaml is not supported on macOS and disabled via Bazel. - EXPECT_EQ(28UL, ConfigTest::run(directory)); + EXPECT_EQ(35UL, ConfigTest::run(directory)); #else - EXPECT_EQ(29UL, ConfigTest::run(directory)); + EXPECT_EQ(36UL, ConfigTest::run(directory)); #endif ConfigTest::testMerge();