envoy: Upstream rebase

Rebase to newer upstream Envoy to get tcp_proxy fixes.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>

Dockerfile

@@ -8,7 +8,7 @@
 # versions to be built while allowing the new versions to make changes
 # that are not backwards compatible.
 #
-FROM quay.io/cilium/cilium-builder:2018-09-11 as builder
+FROM quay.io/cilium/cilium-builder:2018-09-17 as builder
 LABEL maintainer="maintainer@cilium.io"
 WORKDIR /go/src/github.com/cilium/cilium
 COPY . ./

Vagrantfile

@@ -128,7 +128,7 @@ Vagrant.configure(2) do |config|
         vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
 
         config.vm.box = "cilium/ubuntu-dev"
-        config.vm.box_version = "114"
+        config.vm.box_version = "119"
         vb.memory = ENV['VM_MEMORY'].to_i
         vb.cpus = ENV['VM_CPUS'].to_i
         if ENV["NFS"] then

envoy/BAZEL_VERSION

@@ -1 +1 @@
-0.16.1
+0.17.1

envoy/BUILD

@@ -133,7 +133,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":cilium_socket_option_lib",
-        ":accesslog_proto",
+        ":accesslog_proto_cc",
         ":cilium_l7policy_cc",
         "@envoy//source/exe:envoy_common_lib",
         "@envoy//source/common/network:address_lib",

envoy/BUILD_DEPS

@@ -34,9 +34,5 @@ envoy_cc_binary(
         "@envoy//source/common/router:config_utility_lib",
         "@envoy//source/exe:envoy_main_entry_lib",
         "@envoy//source/exe:envoy_common_lib",
-        "@istio_proxy//src/envoy/http/authn:filter_lib",
-        "@istio_proxy//src/envoy/http/jwt_auth:http_filter_factory",
-        "@istio_proxy//src/envoy/http/mixer:filter_lib",
-        "@istio_proxy//src/envoy/tcp/mixer:filter_lib",
     ],
 )

envoy/Makefile

@@ -45,10 +45,10 @@ else
 
 # Dockerfile builds require special options
 ifdef PKG_BUILD
-BAZEL_BUILD_OPTS = --spawn_strategy=standalone --genrule_strategy=standalone --local_resources 4096,2.0,1.0 --jobs=4
+BAZEL_BUILD_OPTS = --spawn_strategy=standalone --genrule_strategy=standalone --local_resources 4096,2.0,1.0 --jobs=3
 all: clean-bins release shutdown-bazel
 else
-BAZEL_BUILD_OPTS = --experimental_strict_action_env --local_resources 4096,2.0,1.0 --jobs=4
+BAZEL_BUILD_OPTS = --experimental_strict_action_env --local_resources 4096,2.0,1.0 --jobs=3
 all: clean-bins envoy-default api shutdown-bazel
 endif
 

envoy/WORKSPACE

@@ -7,11 +7,11 @@ workspace(name = "cilium")
 #
 # No other line in this file may have ENVOY_SHA followed by an equals sign!
 #
-ENVOY_SHA = "2d8386532f68899ca1fe6476dc458b0df1260b29"
+ENVOY_SHA = "f936fc60f488cfae07f5e5d20d7381f0f23482fe"
 
 http_archive(
     name = "envoy",
-    url = "https://github.com/istio/envoy/archive/" + ENVOY_SHA + ".zip",
+    url = "https://github.com/envoyproxy/envoy/archive/" + ENVOY_SHA + ".zip",
     strip_prefix = "envoy-" + ENVOY_SHA,
 )
 
@@ -42,7 +42,7 @@ go_register_toolchains()
 # Dependencies for Istio filters.
 # Cf. https://github.com/istio/proxy.
 
-ISTIO_PROXY_SHA = "99cfc3f74c414dd4fa4aa784a0f8b13e22b81893"
+ISTIO_PROXY_SHA = "490d26feeff134b907f700e08e58a9e6219dce11"
 
 http_archive(
     name = "istio_proxy",

envoy/cilium_bpf_metadata.cc

@@ -70,7 +70,7 @@ createHostMap(Server::Configuration::ListenerFactoryContext& context) {
   return context.singletonManager().getTyped<const Cilium::PolicyHostMap>(
     SINGLETON_MANAGER_REGISTERED_NAME(cilium_host_map), [&context] {
       auto map = std::make_shared<Cilium::PolicyHostMap>(
-          context.localInfo().node(), context.clusterManager(),
+          context.localInfo(), context.clusterManager(),
 	  context.dispatcher(), context.random(), context.scope(),
 	  context.threadLocal());
       map->startSubscription();

envoy/cilium_host_map.cc

@@ -143,12 +143,12 @@ PolicyHostMap::PolicyHostMap(std::unique_ptr<Envoy::Config::Subscription<cilium:
 }
 
 // This is used in production
-PolicyHostMap::PolicyHostMap(const envoy::api::v2::core::Node& node, Upstream::ClusterManager& cm,
+PolicyHostMap::PolicyHostMap(const LocalInfo::LocalInfo& local_info, Upstream::ClusterManager& cm,
 			     Event::Dispatcher& dispatcher, Runtime::RandomGenerator& random,
 			     Stats::Scope &scope, ThreadLocal::SlotAllocator& tls)
   : PolicyHostMap(tls) {
   scope_ = scope.createScope(name_);
-  subscription_ = subscribe<cilium::NetworkPolicyHosts>("cilium.NetworkPolicyHostsDiscoveryService.StreamNetworkPolicyHosts", node, cm, dispatcher, random, *scope_);
+  subscription_ = subscribe<cilium::NetworkPolicyHosts>("cilium.NetworkPolicyHostsDiscoveryService.StreamNetworkPolicyHosts", local_info, cm, dispatcher, random, *scope_);
 }
 
 void PolicyHostMap::onConfigUpdate(const ResourceVector& resources, const std::string& version_info) {

envoy/cilium_host_map.h

@@ -49,7 +49,7 @@ class PolicyHostMap : public Singleton::Instance,
                       public std::enable_shared_from_this<PolicyHostMap>,
                       public Logger::Loggable<Logger::Id::config> {
 public:
-  PolicyHostMap(const envoy::api::v2::core::Node& node,
+  PolicyHostMap(const LocalInfo::LocalInfo& local_info,
 		Upstream::ClusterManager& cm, Event::Dispatcher& dispatcher,
 		Runtime::RandomGenerator& random, Stats::Scope &scope, ThreadLocal::SlotAllocator& tls);
   PolicyHostMap(std::unique_ptr<Envoy::Config::Subscription<cilium::NetworkPolicyHosts>>&& subscription,

envoy/cilium_l7policy.cc

@@ -65,7 +65,7 @@ createPolicyMap(Server::Configuration::FactoryContext& context) {
   return context.singletonManager().getTyped<const Cilium::NetworkPolicyMap>(
     SINGLETON_MANAGER_REGISTERED_NAME(cilium_network_policy), [&context] {
       auto map = std::make_shared<Cilium::NetworkPolicyMap>(
-	  context.localInfo().node(), context.clusterManager(),
+	  context.localInfo(), context.clusterManager(),
 	  context.dispatcher(), context.random(), context.scope(),
 	  context.threadLocal());
       map->startSubscription();

envoy/cilium_network_policy.cc

@@ -31,13 +31,13 @@ NetworkPolicyMap::NetworkPolicyMap(std::unique_ptr<Envoy::Config::Subscription<c
 }
 
 // This is used in production
-NetworkPolicyMap::NetworkPolicyMap(const envoy::api::v2::core::Node& node,
+NetworkPolicyMap::NetworkPolicyMap(const LocalInfo::LocalInfo& local_info,
 				   Upstream::ClusterManager& cm, Event::Dispatcher& dispatcher,
 				   Runtime::RandomGenerator& random, Stats::Scope &scope,
 				   ThreadLocal::SlotAllocator& tls)
   : NetworkPolicyMap(tls) {
   scope_ = scope.createScope(name_);
-  subscription_ = subscribe<cilium::NetworkPolicy>("cilium.NetworkPolicyDiscoveryService.StreamNetworkPolicies", node, cm, dispatcher, random, *scope_);
+  subscription_ = subscribe<cilium::NetworkPolicy>("cilium.NetworkPolicyDiscoveryService.StreamNetworkPolicies", local_info, cm, dispatcher, random, *scope_);
 }
 
 void NetworkPolicyMap::onConfigUpdate(const ResourceVector& resources, const std::string& version_info) {

envoy/cilium_network_policy.h

@@ -22,7 +22,7 @@ class NetworkPolicyMap : public Singleton::Instance,
                          public Logger::Loggable<Logger::Id::config> {
 public:
   NetworkPolicyMap(ThreadLocal::SlotAllocator& tls);
-  NetworkPolicyMap(const envoy::api::v2::core::Node& node, Upstream::ClusterManager& cm,
+  NetworkPolicyMap(const LocalInfo::LocalInfo& local_info, Upstream::ClusterManager& cm,
 		   Event::Dispatcher& dispatcher, Runtime::RandomGenerator& random,
 		   Stats::Scope &scope, ThreadLocal::SlotAllocator& tls);
   NetworkPolicyMap(std::unique_ptr<Envoy::Config::Subscription<cilium::NetworkPolicy>>&& subscription,

envoy/grpc_subscription.h

@@ -12,7 +12,7 @@ namespace Cilium {
 
 template <typename Protocol>
 std::unique_ptr<Envoy::Config::Subscription<Protocol>>
-subscribe(const std::string& grpc_method, const envoy::api::v2::core::Node& node,
+subscribe(const std::string& grpc_method, const LocalInfo::LocalInfo& local_info,
 	  Upstream::ClusterManager& cm, Event::Dispatcher& dispatcher,
 	  Runtime::RandomGenerator& random, Stats::Scope &scope) {
   // Hard-coded Cilium gRPC cluster
@@ -28,7 +28,7 @@ subscribe(const std::string& grpc_method, const envoy::api::v2::core::Node& node
   }
 
   return std::make_unique<Config::GrpcSubscriptionImpl<Protocol>>(
-                node,
+                local_info,
 		Config::Utility::factoryForGrpcApiConfigSource(cm.grpcAsyncClientManager(),
 							       api_config_source,
 							       scope)->create(),