From b18f7d02cb195ea357797dccd43cf12b124a5f32 Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Thu, 20 Jun 2019 16:20:14 +0000
Subject: [PATCH] runtime: distinct symlink root and subdir in layered runtime.
 (#7335)

Without a distinction between the root and subdir, we can't watch for
symlink swaps that cover multiple layers.

Risk level: Low
Testing: additional test expects added.

Signed-off-by: Harvey Tuch <htuch@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ 49b5a915324e44b9445e3fc5434e0deffaf3f94f
---
 envoy/config/bootstrap/v2/bootstrap.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/envoy/config/bootstrap/v2/bootstrap.proto b/envoy/config/bootstrap/v2/bootstrap.proto
index d7d412da..f8083ca6 100644
--- a/envoy/config/bootstrap/v2/bootstrap.proto
+++ b/envoy/config/bootstrap/v2/bootstrap.proto
@@ -248,6 +248,11 @@ message RuntimeLayer {
     // treated.
     string symlink_root = 1;
 
+    // Specifies the subdirectory to load within the root directory. This is
+    // useful if multiple systems share the same delivery mechanism. Envoy
+    // configuration elements can be contained in a dedicated subdirectory.
+    string subdirectory = 3;
+
     // :ref:`Append <config_runtime_local_disk_service_cluster_subdirs>` the
     // service cluster to the path under symlink root.
     bool append_service_cluster = 2;