From b5d0dcd455039c722b14ede5e569f116f53a6c66 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 5 Jun 2024 18:14:01 +0000 Subject: [PATCH] [CSM O11y] Follow-up from #36806 --- examples/cpp/csm/observability/Dockerfile.client | 2 -- examples/cpp/csm/observability/Dockerfile.server | 4 +--- examples/cpp/csm/observability/README.md | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/cpp/csm/observability/Dockerfile.client b/examples/cpp/csm/observability/Dockerfile.client index b3590593e33..6e6883b7634 100644 --- a/examples/cpp/csm/observability/Dockerfile.client +++ b/examples/cpp/csm/observability/Dockerfile.client @@ -34,6 +34,4 @@ RUN apt-get update \ COPY --from=0 /artifacts ./ -ENV GRPC_EXPERIMENTAL_XDS_ENABLE_OVERRIDE_HOST=true - ENTRYPOINT ["/csm_greeter_client"] diff --git a/examples/cpp/csm/observability/Dockerfile.server b/examples/cpp/csm/observability/Dockerfile.server index c532b03b91c..a6d82fdc793 100644 --- a/examples/cpp/csm/observability/Dockerfile.server +++ b/examples/cpp/csm/observability/Dockerfile.server @@ -22,7 +22,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python RUN mkdir /artifacts COPY . . -RUN OVERRIDE_BAZEL_VERSION=5.4.0 tools/bazel build //examples/cpp/csm/observability:csm_greeter_server +RUN tools/bazel build //examples/cpp/csm/observability:csm_greeter_server RUN cp -rL /workdir/bazel-bin/examples/cpp/csm/observability/csm_greeter_server /artifacts/ FROM python:3.9-slim-bookworm @@ -34,6 +34,4 @@ RUN apt-get update \ COPY --from=0 /artifacts ./ -ENV GRPC_EXPERIMENTAL_XDS_ENABLE_OVERRIDE_HOST=true - ENTRYPOINT ["/csm_greeter_server"] diff --git a/examples/cpp/csm/observability/README.md b/examples/cpp/csm/observability/README.md index 264be09b3d8..e8543d25a2d 100644 --- a/examples/cpp/csm/observability/README.md +++ b/examples/cpp/csm/observability/README.md @@ -1,6 +1,6 @@ # gRPC C++ CSM Hello World Example -This CSM example builds on the [Hello World Example](https://github.com/grpc/grpc/tree/master/examples/cpp/helloworld) and changes the gRPC client and server to accept configuration from an xDS control plane and test CSM observability. +This CSM example builds on the [Hello World Example](https://github.com/grpc/grpc/tree/master/examples/cpp/helloworld) and changes the gRPC client and server to test CSM observability. ## Configuration