tools/examples: remove v1_to_bootstrap and v1 example configs

configs/BUILD

@@ -29,19 +29,10 @@ filegroup(
     }),
 )
 
-genrule(
-    name = "v1_upgraded_configs",
-    srcs = ["google_com_proxy.yaml"],
-    outs = ["google_com_proxy.v2.upgraded.json"],
-    cmd = "$(location //tools:v1_to_bootstrap) $(location google_com_proxy.yaml) > $@",
-    tools = ["//tools:v1_to_bootstrap"],
-)
-
 genrule(
     name = "example_configs",
     srcs = [
         ":configs",
-        ":v1_upgraded_configs",
         "//examples:configs",
         "//test/config/integration/certs",
     ],

configs/configgen.sh

@@ -25,4 +25,4 @@ for FILE in $*; do
 done
 
 # tar is having issues with -C for some reason so just cd into OUT_DIR.
-(cd "$OUT_DIR"; tar -hcvf example_configs.tar *.json *.yaml certs/*.pem)
+(cd "$OUT_DIR"; tar -hcvf example_configs.tar *.yaml certs/*.pem)

docs/root/configuration/overview/v2_overview.rst

@@ -332,17 +332,6 @@ The management server could respond to EDS requests with:
               address: 127.0.0.2
               port_value: 1234
 
-Upgrading from v1 configuration
--------------------------------
-
-While new v2 bootstrap JSON/YAML can be written, it might be expedient to upgrade an existing
-v1 JSON/YAML configuration to v2. To do this (in an Envoy source tree),
-you can run:
-
-.. code-block:: console
-
-  bazel run //tools:v1_to_bootstrap <path to v1 JSON/YAML configuration file>
-
 .. _config_overview_v2_management_server:
 
 Management server

test/config_test/example_configs_test.cc

@@ -17,9 +17,9 @@ TEST(ExampleConfigsTest, All) {
 
 #ifdef __APPLE__
   // freebind/freebind.yaml is not supported on macOS and disabled via Bazel.
-  EXPECT_EQ(21UL, ConfigTest::run(directory));
+  EXPECT_EQ(20UL, ConfigTest::run(directory));
 #else
-  EXPECT_EQ(22UL, ConfigTest::run(directory));
+  EXPECT_EQ(21UL, ConfigTest::run(directory));
 #endif
 
   ConfigTest::testMerge();

tools/BUILD

@@ -36,17 +36,3 @@ envoy_cc_binary(
         "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc",
     ] + envoy_cc_platform_dep("//source/exe:platform_impl_lib"),
 )
-
-envoy_cc_binary(
-    name = "v1_to_bootstrap",
-    srcs = ["v1_to_bootstrap.cc"],
-    deps = [
-        "//source/common/api:api_lib",
-        "//source/common/config:bootstrap_json_lib",
-        "//source/common/json:json_loader_lib",
-        "//source/common/protobuf:utility_lib",
-        "//source/common/stats:isolated_store_lib",
-        "//source/common/stats:stats_options_lib",
-        "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc",
-    ] + envoy_cc_platform_dep("//source/exe:platform_impl_lib"),
-)

tools/envoy_collect/envoy_collect.py

@@ -4,7 +4,7 @@
 Example use:
 
   ./tools/envoy_collect.py --output-path=./envoy.tar -c
-  ./configs/google_com_proxy.json --service-node foo
+  ./configs/google_com_proxy.v2.yaml --service-node foo
   <Ctrl-C>
   tar -tvf ./envoy.tar
   -rw------- htuch/eng         0 2017-08-13 21:13 access_0.log