Merge branch 'main' into dev-add-stats-matcher-code

envoyproxy · Sep 7, 2023 · c5527b1 · c5527b1
2 parents d6b7f81 + 2e6211a
commit c5527b1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/docs/latest/user/multicluster-service.md b/docs/latest/user/multicluster-service.md
@@ -4,7 +4,7 @@ The Multicluster Service API ServiceImport object can be used as part of the Gat
 
 We will use [Submariner project](https://github.com/submariner-io/submariner) for setting up the multicluster environment for exporting the service to be routed from peer clusters.
 
-# Setting KIND clusters and installing Submariner.
+## Setting KIND clusters and installing Submariner.
 
 - We will be using KIND clusters to demonstrate this example.
 
@@ -32,7 +32,7 @@ subctl join --kubeconfig output/kubeconfigs/kind-config-cluster2 broker-info.sub
 
 Once the above steps are done and all the pods are up in both the clusters. We are ready for installing envoy gateway.
 
-# Install EnvoyGateway
+## Install EnvoyGateway
 
 Install the Gateway API CRDs and Envoy Gateway in cluster1:
 
@@ -46,7 +46,7 @@ Wait for Envoy Gateway to become available:
 kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-gateway --for=condition=Available --kubeconfig output/kubeconfigs/kind-config-cluster1
 ```
 
-# Install Application
+## Install Application
 
 Install the backend application in cluster2 and export it through subctl command.
 
@@ -55,9 +55,9 @@ kubectl apply -f https://raw.githubusercontent.com/envoyproxy/gateway/latest/exa
 subctl export service backend --namespace default --kubeconfig output/kubeconfigs/kind-config-cluster2
 ```
 
-# Create GatewayAPI Objects
+## Create Gateway API Objects
 
-Create the GatewayAPI objects GatewayClass, Gateway and HTTPRoute in cluster1 to set up the routing.
+Create the Gateway API objects GatewayClass, Gateway and HTTPRoute in cluster1 to set up the routing.
 
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/envoyproxy/gateway/latest/examples/kubernetes/multicluster-service.yaml --kubeconfig output/kubeconfigs/kind-config-cluster1
@@ -81,4 +81,4 @@ Curl the example app through Envoy proxy:
 
 ```shell
 curl --verbose --header "Host: www.example.com" http://localhost:8888/get
-```
+```
diff --git a/docs/latest/user_docs.rst b/docs/latest/user_docs.rst
@@ -31,3 +31,4 @@ Learn how to deploy, use, and operate Envoy Gateway.
   user/gateway-address
   user/gatewayapi-support
   user/proxy-observability
+  user/multicluster-service
diff --git a/examples/kubernetes/multicluster-service.yaml b/examples/kubernetes/multicluster-service.yaml
@@ -1,9 +1,26 @@
+apiVersion: config.gateway.envoyproxy.io/v1alpha1
+kind: EnvoyProxy
+metadata:
+  name: custom-proxy-config
+  namespace: envoy-gateway-system
+spec:
+  provider:
+    kubernetes:
+      envoyService:
+        type: ClusterIP
+    type: Kubernetes
+---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
+  parametersRef:
+    group: config.gateway.envoyproxy.io
+    kind: EnvoyProxy
+    name: custom-proxy-config
+    namespace: envoy-gateway-system
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
@@ -39,7 +56,7 @@ spec:
             type: PathPrefix
             value: /
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: ReferenceGrant
 metadata:
   namespace: submariner-operator