From c9d237d96d567e76b9579b2770253e76a4bfb105 Mon Sep 17 00:00:00 2001 From: Alex Konradi Date: Wed, 18 Nov 2020 10:23:04 -0500 Subject: [PATCH 1/2] vrp: allow supervisord to open its log file (#14066) Change the default location of the log file and give supervisord permissions to write to it. Signed-off-by: Alex Konradi Signed-off-by: Christoph Pakulski --- ci/Dockerfile-envoy-google-vrp | 3 +++ configs/google-vrp/supervisor.conf | 1 + 2 files changed, 4 insertions(+) diff --git a/ci/Dockerfile-envoy-google-vrp b/ci/Dockerfile-envoy-google-vrp index 868b6a5840df..730f8daabbb5 100644 --- a/ci/Dockerfile-envoy-google-vrp +++ b/ci/Dockerfile-envoy-google-vrp @@ -15,6 +15,9 @@ ADD configs/google-vrp/supervisor.conf /etc/supervisor.conf ADD test/config/integration/certs/serverkey.pem /etc/envoy/certs/serverkey.pem ADD test/config/integration/certs/servercert.pem /etc/envoy/certs/servercert.pem # ADD %local envoy bin% /usr/local/bin/envoy +RUN chmod 777 /var/log/supervisor +RUN chmod a+r /etc/supervisor.conf /etc/envoy/* /etc/envoy/certs/* +RUN chmod a+rx /usr/local/bin/launch_envoy.sh EXPOSE 10000 EXPOSE 10001 diff --git a/configs/google-vrp/supervisor.conf b/configs/google-vrp/supervisor.conf index e019581d079c..1e1d09f33660 100644 --- a/configs/google-vrp/supervisor.conf +++ b/configs/google-vrp/supervisor.conf @@ -1,5 +1,6 @@ [supervisord] nodaemon=true +logfile=/var/log/supervisor/supervisord.log [program:envoy-edge] command=launch_envoy.sh -c /etc/envoy/envoy-edge.yaml %(ENV_ENVOY_EDGE_EXTRA_ARGS)s From 2098858a35029bd477a5dac5575758772554a648 Mon Sep 17 00:00:00 2001 From: Christoph Pakulski Date: Fri, 4 Dec 2020 19:38:36 +0000 Subject: [PATCH 2/2] Added release note. Signed-off-by: Christoph Pakulski --- docs/root/version_history/current.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 84ab09df6d44..2716c2c7df9e 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -7,3 +7,4 @@ Changes * proxy_proto: fixed a bug where network filters would not have the correct downstreamRemoteAddress() when accessed from the StreamInfo. This could result in incorrect enforcement of RBAC rules in the RBAC network filter (but not in the RBAC HTTP filter), or incorrect access log addresses from tcp_proxy. * tls: fix read resumption after triggering buffer high-watermark and all remaining request/response bytes are stored in the SSL connection's internal buffers. * udp: fixed issue in which receiving truncated UDP datagrams would cause Envoy to crash. +* vrp: allow supervisord to open its log file.