From 7d18407e6a652cc8ecf62647d5eefc7ba12ddad0 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Wed, 7 Oct 2020 10:53:23 -0500
Subject: [PATCH] command: remove conditional envoy bootstrap generation for
 versions <=1.10.0 since those are not supported (#8855)

---
 .changelog/8855.txt                    | 3 +++
 command/connect/envoy/bootstrap_tpl.go | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/8855.txt

diff --git a/.changelog/8855.txt b/.changelog/8855.txt
new file mode 100644
index 000000000..5820f8049
--- /dev/null
+++ b/.changelog/8855.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+command: remove conditional envoy bootstrap generation for versions <=1.10.0 since those are not supported
+```
diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go
index bbd87a23c..cc093b96e 100644
--- a/command/connect/envoy/bootstrap_tpl.go
+++ b/command/connect/envoy/bootstrap_tpl.go
@@ -200,7 +200,6 @@ const bootstrapTemplate = `{
         }
       }
     }
-  {{- if ne .EnvoyVersion "1.10.0"}}
   },
   "layered_runtime":{
     "layers": [
@@ -213,7 +212,6 @@ const bootstrapTemplate = `{
         }
       }
     ]
-  {{- end }}
   }
 }
 `