Run two envoys

Author: slonka

Dockerfile

@@ -75,7 +75,8 @@ WORKDIR /home/gradle/src
 RUN gradle :envoy-control-runner:assemble --parallel --no-daemon
 
 FROM envoyproxy/envoy-alpine-dev:6c2137468c25d167dbbe4719b0ecaf343bfb4233 as envoy
-COPY heroku/envoy.yaml /etc/envoy.yaml
+COPY heroku/envoy1.yaml /etc/envoy1.yaml
+COPY heroku/envoy2.yaml /etc/envoy2.yaml
 COPY heroku/envoy-front-proxy.yaml /etc/envoy-front-proxy.yaml
 COPY --from=consul /bin/consul /bin/consul
 
@@ -84,6 +85,7 @@ RUN mkdir /tmp/envoy-control-dist /tmp/envoy-control /bin/envoy-control /etc/env
 COPY --from=build /home/gradle/src/envoy-control-runner/build/distributions/ /tmp/envoy-control-dist
 COPY ./envoy-control-runner/src/main/resources/application.yaml /etc/envoy-control/
 COPY heroku/register-echo1.json /etc/envoy-control/
+COPY heroku/register-echo2.json /etc/envoy-control/
 RUN tar -xf /tmp/envoy-control-dist/envoy-control-runner*.tar -C /tmp/envoy-control
 RUN mv /tmp/envoy-control/envoy-control-runner*/ /bin/envoy-control/envoy-control-runner
 # APP_PORT: 8080

heroku/envoy.yaml renamed to heroku/envoy1.yaml

@@ -27,10 +27,15 @@ node:
     add_upstream_external_address_header: true
     resources_dir: "/etc/envoy/extra"
     proxy_settings:
+      incoming:
+        endpoints:
+          - pathPrefix: "/"
+            clients: ["echo2"]
       outgoing:
         dependencies:
           - service: "consul"
           - service: "echo1"
+          - service: "echo2"
 static_resources:
   listeners:
   - name: ingress_direct_response
@@ -60,7 +65,7 @@ static_resources:
                 direct_response:
                   status: 200
                   body:
-                    inline_string: "Hello"
+                    inline_string: "Hello from echo1"
           http_filters:
           - name: envoy.filters.http.router
   clusters:

heroku/envoy2.yaml

@@ -0,0 +1,97 @@
+admin:
+  access_log_path: /dev/stdout
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 10022
+dynamic_resources:
+  lds_config: {ads: {}}
+  cds_config: {ads: {}}
+  ads_config:
+    api_type: GRPC
+    grpc_services:
+      envoy_grpc:
+        cluster_name: envoy-control-xds
+node:
+  cluster: test-cluster
+  id: test-id
+  metadata:
+    service_name: "echo2"
+    ads: true
+    ingress_host: "0.0.0.0"
+    ingress_port: 10020
+    egress_host: "0.0.0.0"
+    egress_port: 10021
+    use_remote_address: true
+    access_log_enabled: false
+    add_upstream_external_address_header: true
+    resources_dir: "/etc/envoy/extra"
+    proxy_settings:
+      incoming:
+        endpoints:
+          - pathPrefix: "/"
+            clients: ["echo1"]
+      outgoing:
+        dependencies:
+          - service: "consul"
+          - service: "echo1"
+          - service: "echo2"
+static_resources:
+  listeners:
+  - name: ingress_direct_response
+    address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 10023
+    filter_chains:
+    - filters:
+      - name: envoy.filters.network.http_connection_manager
+        typed_config:
+          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
+          use_remote_address: true
+          stat_prefix: ingress_http
+          codec_type: AUTO
+          route_config:
+            name: local_route
+            virtual_hosts:
+            - name: local_service
+              domains: ["*"]
+              routes:
+              - match: { prefix: "/status/envoy/"}
+                route:
+                  cluster: this_admin
+                  prefix_rewrite: "/"
+              - match: { path: "/" }
+                direct_response:
+                  status: 200
+                  body:
+                    inline_string: "Hello from echo2"
+          http_filters:
+          - name: envoy.filters.http.router
+  clusters:
+    - name: local_service
+      connect_timeout: 1s
+      hosts:
+        - socket_address:
+            address: 127.0.0.1
+            port_value: 10023
+      http2_protocol_options: {}
+    - name: envoy-control-xds
+      connect_timeout: 1s
+      hosts:
+        - socket_address:
+            address: 127.0.0.1
+            port_value: 50000
+      http2_protocol_options: {}
+    - name: this_admin
+      type: STATIC
+      connect_timeout: 1s
+      load_assignment:
+        cluster_name: this_admin
+        endpoints:
+        - lb_endpoints:
+          - endpoint:
+              address:
+                socket_address:
+                  address: 127.0.0.1
+                  port_value: 10022

heroku/register-echo2.json

@@ -0,0 +1,15 @@
+{
+   "ID":"echo2",
+   "Name":"echo2",
+   "Tags":[
+      "primary"
+   ],
+   "Address":"127.0.0.1",
+   "Port":10020,
+   "Check":{
+      "DeregisterCriticalServiceAfter":"90m",
+      "http":"http://127.0.0.1:10020",
+      "Interval":"10s"
+   }
+}
+

heroku/run-envoy.sh

@@ -15,7 +15,8 @@ echo "Launching Envoy-control with $START_ARGUMENTS"
 
 # start envoys
 sed -i "s/{{.IngressListenerPort}}/${PORT:-10000}/g" /etc/envoy-front-proxy.yaml
-sh -c 'sleep 20; /usr/local/bin/envoy --base-id 1 -c /etc/envoy.yaml' &
+sh -c 'sleep 20; /usr/local/bin/envoy --base-id 1 -c /etc/envoy1.yaml' &
+sh -c 'sleep 20; /usr/local/bin/envoy --base-id 2 -c /etc/envoy2.yaml' &
 /usr/local/bin/envoy -c /etc/envoy-front-proxy.yaml &
 
 sh -c 'sleep 25; curl -X PUT -s localhost:8500/v1/agent/service/register -T /etc/envoy-control/register-echo1.json' &