From c1469fa04df78143f581f33d0e703d6e3e461b05 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Thu, 4 Jun 2020 00:05:30 -0400 Subject: [PATCH] Update gateway examples to use server names (#122) Signed-off-by: Shriram Rajagopalan --- tsb/gateway/v2/ingress_gateway.pb.go | 3 ++- tsb/gateway/v2/ingress_gateway.pb.html | 3 ++- tsb/gateway/v2/ingress_gateway.proto | 3 ++- tsb/gateway/v2/tier1_gateway.pb.go | 9 ++++++--- tsb/gateway/v2/tier1_gateway.pb.html | 9 ++++++--- tsb/gateway/v2/tier1_gateway.proto | 9 ++++++--- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tsb/gateway/v2/ingress_gateway.pb.go b/tsb/gateway/v2/ingress_gateway.pb.go index 0e30d31f33..3dc9cc7561 100644 --- a/tsb/gateway/v2/ingress_gateway.pb.go +++ b/tsb/gateway/v2/ingress_gateway.pb.go @@ -33,7 +33,8 @@ // labels: // app: gateway // http: -// - port: 9443 +// - name: bookinfo +// port: 9443 // hostname: bookinfo.com // tls: // mode: SIMPLE diff --git a/tsb/gateway/v2/ingress_gateway.pb.html b/tsb/gateway/v2/ingress_gateway.pb.html index af1776fba7..2ce0fa09e0 100644 --- a/tsb/gateway/v2/ingress_gateway.pb.html +++ b/tsb/gateway/v2/ingress_gateway.pb.html @@ -37,7 +37,8 @@ labels: app: gateway http: - - port: 9443 + - name: bookinfo + port: 9443 hostname: bookinfo.com tls: mode: SIMPLE diff --git a/tsb/gateway/v2/ingress_gateway.proto b/tsb/gateway/v2/ingress_gateway.proto index 4132142a2e..6bb2f1d911 100644 --- a/tsb/gateway/v2/ingress_gateway.proto +++ b/tsb/gateway/v2/ingress_gateway.proto @@ -38,7 +38,8 @@ syntax = "proto3"; // labels: // app: gateway // http: -// - port: 9443 +// - name: bookinfo +// port: 9443 // hostname: bookinfo.com // tls: // mode: SIMPLE diff --git a/tsb/gateway/v2/tier1_gateway.pb.go b/tsb/gateway/v2/tier1_gateway.pb.go index c0001cd4d2..6d5ec4edc9 100644 --- a/tsb/gateway/v2/tier1_gateway.pb.go +++ b/tsb/gateway/v2/tier1_gateway.pb.go @@ -29,7 +29,8 @@ // labels: // app: gateway // externalServers: -// - hostname: movieinfo.com # TLS termination and Istio mTLS to upstream +// - name: movieinfo +// hostname: movieinfo.com # TLS termination and Istio mTLS to upstream // tls: // mode: SIMPLE // secretName: movieinfo-secrets @@ -67,10 +68,12 @@ // labels: // app: gateway // internalServers: # forwarding gateway -// - hostname: movieinfo.com +// - name: movieinfo +// hostname: movieinfo.com // clusters: // - network: vpc-02 # the target gateway IPs will be automatically determined -// - hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com +// - name: bookinfo +// hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com //``` // // ** NOTE:** If two clusters have direct connectivity, declaring diff --git a/tsb/gateway/v2/tier1_gateway.pb.html b/tsb/gateway/v2/tier1_gateway.pb.html index 1b78edf221..ba8d06ead3 100644 --- a/tsb/gateway/v2/tier1_gateway.pb.html +++ b/tsb/gateway/v2/tier1_gateway.pb.html @@ -33,7 +33,8 @@ labels: app: gateway externalServers: - - hostname: movieinfo.com # TLS termination and Istio mTLS to upstream + - name: movieinfo + hostname: movieinfo.com # TLS termination and Istio mTLS to upstream tls: mode: SIMPLE secretName: movieinfo-secrets @@ -70,10 +71,12 @@ labels: app: gateway internalServers: # forwarding gateway - - hostname: movieinfo.com + - name: movieinfo + hostname: movieinfo.com clusters: - network: vpc-02 # the target gateway IPs will be automatically determined - - hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com + - name: bookinfo + hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com

** NOTE:** If two clusters have direct connectivity, declaring diff --git a/tsb/gateway/v2/tier1_gateway.proto b/tsb/gateway/v2/tier1_gateway.proto index 583344ffad..5c2ab87b8e 100644 --- a/tsb/gateway/v2/tier1_gateway.proto +++ b/tsb/gateway/v2/tier1_gateway.proto @@ -34,7 +34,8 @@ syntax = "proto3"; // labels: // app: gateway // externalServers: -// - hostname: movieinfo.com # TLS termination and Istio mTLS to upstream +// - name: movieinfo +// hostname: movieinfo.com # TLS termination and Istio mTLS to upstream // tls: // mode: SIMPLE // secretName: movieinfo-secrets @@ -72,10 +73,12 @@ syntax = "proto3"; // labels: // app: gateway // internalServers: # forwarding gateway -// - hostname: movieinfo.com +// - name: movieinfo +// hostname: movieinfo.com // clusters: // - network: vpc-02 # the target gateway IPs will be automatically determined -// - hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com +// - name: bookinfo +// hostname: bookinfo.com # route to any ingress gateway exposing bookinfo.com //``` // // ** NOTE:** If two clusters have direct connectivity, declaring