From 3ad6ad2cdd3a226728643dd233596ad1df84e7ca Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 5 Oct 2021 21:10:49 +0200 Subject: [PATCH] devnet: fix grpc-web Tilt route and remove envoy Change-Id: I8fd49b32b7b0d8ad9724b920d59e64024c183faa --- Tiltfile | 14 ---- bridge_ui/src/utils/consts.ts | 2 +- devnet/envoy-proxy.yaml | 128 ---------------------------------- devnet/node.yaml | 3 + explorer/.env.sample | 2 +- 5 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 devnet/envoy-proxy.yaml diff --git a/Tiltfile b/Tiltfile index bfd91478b..fe29e2948 100644 --- a/Tiltfile +++ b/Tiltfile @@ -130,20 +130,6 @@ k8s_resource("guardian", resource_deps = ["proto-gen", "solana-devnet"], port_fo port_forward(2345, name = "Debugger [:2345]"), ]) -# publicRPC proxy that allows grpc over http1, for local development - -k8s_yaml_with_ns("./devnet/envoy-proxy.yaml") - -k8s_resource( - "envoy-proxy", - resource_deps = ["guardian"], - objects = ["envoy-proxy:ConfigMap"], - port_forwards = [ - port_forward(8080, name = "gRPC proxy for guardian's publicRPC data [:8080]"), - port_forward(9901, name = "gRPC proxy admin [:9901]"), # for proxy debugging - ], -) - # solana client cli (used for devnet setup) docker_build( diff --git a/bridge_ui/src/utils/consts.ts b/bridge_ui/src/utils/consts.ts index 0a2291c5c..80b0bed78 100644 --- a/bridge_ui/src/utils/consts.ts +++ b/bridge_ui/src/utils/consts.ts @@ -83,7 +83,7 @@ export const WORMHOLE_RPC_HOSTS = "https://wormhole-v2-testnet-api.mcf.rocks", "https://wormhole-v2-testnet-api.chainlayer.network" ] - : ["http://localhost:8080"]; + : ["http://localhost:7071"]; export const ETH_NETWORK_CHAIN_ID = CLUSTER === "mainnet" ? 1 : CLUSTER === "testnet" ? 5 : 1337; export const SOLANA_HOST = process.env.REACT_APP_SOLANA_API_URL diff --git a/devnet/envoy-proxy.yaml b/devnet/envoy-proxy.yaml deleted file mode 100644 index 8097153e7..000000000 --- a/devnet/envoy-proxy.yaml +++ /dev/null @@ -1,128 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: envoy-proxy - name: envoy-proxy -spec: - ports: - - name: http-debug - port: 8080 - protocol: TCP - - name: admin-debug - port: 9901 - protocol: TCP - selector: - app: envoy-proxy ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - labels: - app: envoy-proxy - name: envoy-proxy -spec: - serviceName: envoy-proxy - replicas: 1 - selector: - matchLabels: - app: envoy-proxy - template: - metadata: - labels: - app: envoy-proxy - spec: - containers: - - name: envoy-proxy - image: envoyproxy/envoy:v1.17.0@sha256:80df344b5651c57265a03b47f583c139d3ce955415746c00cf5aff08c7e78e44 - volumeMounts: - - name: config-volume - mountPath: /etc/envoy/envoy.yaml - subPath: envoy.yaml - command: [ - "/usr/local/bin/envoy", - "-c", - "/etc/envoy/envoy.yaml", - "-l", - "trace", - "--log-path", - "/tmp/envoy_info.log"] - ports: - - containerPort: 8080 - name: http-debug - protocol: TCP - - containerPort: 9901 - name: admin-debug - protocol: TCP - volumes: - - name: config-volume - configMap: - name: envoy-proxy ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: envoy-proxy - labels: - app: envoy-proxy -selector: - matchLabels: - app: envoy-proxy -data: - envoy.yaml: | - admin: - access_log_path: /tmp/admin_access.log - address: - socket_address: { address: 0.0.0.0, port_value: 9901 } - - static_resources: - listeners: - - name: listener_0 - address: - socket_address: { address: 0.0.0.0, port_value: 8080 } - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - codec_type: auto - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: local_service - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: echo_service - timeout: 0s - max_stream_duration: - grpc_timeout_header_max: 0s - cors: - allow_origin_string_match: - - prefix: "*" - allow_methods: GET, PUT, DELETE, POST, OPTIONS - allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout - max_age: "1728000" - expose_headers: custom-header-1,grpc-status,grpc-message - http_filters: - - name: envoy.filters.http.grpc_web - - name: envoy.filters.http.cors - - name: envoy.filters.http.router - clusters: - - name: echo_service - connect_timeout: 0.25s - type: logical_dns - http2_protocol_options: {} - lb_policy: round_robin - load_assignment: - cluster_name: cluster_0 - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: guardian - port_value: 7070 ---- diff --git a/devnet/node.yaml b/devnet/node.yaml index 982bdbc76..4061fa508 100644 --- a/devnet/node.yaml +++ b/devnet/node.yaml @@ -123,6 +123,9 @@ spec: - containerPort: 7070 name: public-grpc protocol: TCP + - containerPort: 7071 + name: public-grpcweb + protocol: TCP - containerPort: 2345 name: debugger protocol: TCP diff --git a/explorer/.env.sample b/explorer/.env.sample index 2ad2e6a07..700ba73c2 100644 --- a/explorer/.env.sample +++ b/explorer/.env.sample @@ -4,7 +4,7 @@ GATSBY_SITE_URL=http://localhost:8000 GATSBY_GA_TAG=G-tag-goes-here GATSBY_ENVIRONMENT=development -GATSBY_APP_RPC_URL=http://localhost:8080 +GATSBY_APP_RPC_URL=http://localhost:7071 GATSBY_BIGTABLE_URL=https://us-central1-wormhole-315720.cloudfunctions.net/BT-reader-test