Skip to content

Commit

Permalink
Merge pull request #1245 from EmilyShepherd/update-examples-to-v1beta1
Browse files Browse the repository at this point in the history
Update examples to v1beta1
  • Loading branch information
k8s-ci-robot authored Jul 13, 2022
2 parents 547122f + 57be2f0 commit 482d988
Show file tree
Hide file tree
Showing 58 changed files with 79 additions and 120 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#$ Used in:
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#$ Used in:
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#$ Used in:
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#$ Used in:
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#$ Used in:
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/basic-http.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: GatewayClass
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/cross-namespace-routing/0-namespaces.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/multiple-ns.md
apiVersion: v1
kind: Namespace
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/cross-namespace-routing/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/cross-namespace-routing/site-route.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/cross-namespace-routing/store-route.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-filter.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/concepts/api-overview.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-route-attachment/gateway-strict.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/concepts/api-overview.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-route-attachment/httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/concepts/api-overview.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-routing/bar-httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-routing/foo-httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/http-routing/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
3 changes: 0 additions & 3 deletions examples/v1alpha2/simple-gateway/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/traffic-splitting.md
#$ - site-src/v1alpha2/guides/simple-gateway.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
1 change: 0 additions & 1 deletion examples/v1alpha2/simple-gateway/httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/simple-gateway.md
#$ - site-src/blog/2021/introducing-v1alpha2.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/tls-basic.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/tls.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/traffic-splitting/simple-split.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/traffic-splitting/traffic-split-1.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
3 changes: 0 additions & 3 deletions examples/v1alpha2/traffic-splitting/traffic-split-2.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/traffic-splitting.md
#$ - site-src/v1alpha2/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/traffic-splitting/traffic-split-3.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: HTTPRoute
metadata:
Expand Down
2 changes: 0 additions & 2 deletions examples/v1alpha2/wildcard-tls-gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#$ Used in:
#$ - site-src/v1alpha2/guides/tls.md
apiVersion: gateway.networking.k8s.io/v1alpha2
kind: Gateway
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/basic-http.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/api-types/httproute.md
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: GatewayClass
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/cross-namespace-routing/0-namespaces.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/multiple-ns.md
#$ - site-src/guides/multiple-ns.md
apiVersion: v1
kind: Namespace
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/cross-namespace-routing/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/multiple-ns.md
#$ - site-src/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/cross-namespace-routing/site-route.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/multiple-ns.md
#$ - site-src/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/cross-namespace-routing/store-route.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/multiple-ns.md
#$ - site-src/guides/multiple-ns.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/http-filter.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/api-types/httproute.md
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/http-routing/bar-httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/http-routing.md
#$ - site-src/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/http-routing/foo-httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/http-routing.md
#$ - site-src/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/http-routing/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/http-routing.md
#$ - site-src/guides/http-routing.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
Expand Down
4 changes: 2 additions & 2 deletions examples/v1beta1/simple-gateway/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#$ Used in:
#$ - site-src/v1beta1/guides/traffic-splitting.md
#$ - site-src/v1beta1/guides/simple-gateway.md
#$ - site-src/guides/traffic-splitting.md
#$ - site-src/guides/simple-gateway.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/simple-gateway/httproute.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/simple-gateway.md
#$ - site-src/guides/simple-gateway.md
#$ - site-src/blog/2021/introducing-v1beta1.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/tls-basic.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/tls.md
#$ - site-src/guides/tls.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/traffic-splitting/simple-split.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/traffic-splitting.md
#$ - site-src/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/traffic-splitting/traffic-split-1.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/traffic-splitting.md
#$ - site-src/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
4 changes: 2 additions & 2 deletions examples/v1beta1/traffic-splitting/traffic-split-2.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#$ Used in:
#$ - site-src/v1beta1/guides/traffic-splitting.md
#$ - site-src/v1beta1/api-types/httproute.md
#$ - site-src/guides/traffic-splitting.md
#$ - site-src/api-types/httproute.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/traffic-splitting/traffic-split-3.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/traffic-splitting.md
#$ - site-src/guides/traffic-splitting.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/wildcard-tls-gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#$ Used in:
#$ - site-src/v1beta1/guides/tls.md
#$ - site-src/guides/tls.md
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
Expand Down
2 changes: 1 addition & 1 deletion site-src/api-types/gatewayclass.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@ example.net/gateway/v2.1 // Use version 2.1
example.net/gateway // Use the default version
```

[gatewayclass]: https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.GatewayClass
[gatewayclass]: /references/spec/#gateway.networking.k8s.io/v1beta1.GatewayClass
[ingress-class-api]: https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class
28 changes: 14 additions & 14 deletions site-src/api-types/httproute.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ here for implementations to support other types of parent resources.

The following example shows how a Route would attach to the `acme-lb` Gateway:
```yaml
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: httproute-example
Expand Down Expand Up @@ -56,7 +56,7 @@ rules and filters (optional).
The following example defines hostname "my.example.com":
```yaml
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: httproute-example
Expand All @@ -78,7 +78,7 @@ independent, i.e. this rule will be matched if any single match is satisfied.
Take the following matches configuration as an example:
```yaml
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
...
matches:
Expand Down Expand Up @@ -111,7 +111,7 @@ strategies, rate-limiting, and traffic shaping.
The following example adds header "my-header: foo" to HTTP requests with Host
header "my.filter.com".
```yaml
{% include 'v1alpha2/http-filter.yaml' %}
{% include 'v1beta1/http-filter.yaml' %}
```

API conformance is defined based on the filter type. The effects of ordering
Expand Down Expand Up @@ -143,14 +143,14 @@ The following example forwards HTTP requests for prefix `/bar` to service
"my-service1" on port `8080` and HTTP requests for prefix `/some/thing` with
header `magic: foo` to service "my-service2" on port `8080`:
```yaml
{% include 'v1alpha2/basic-http.yaml' %}
{% include 'v1beta1/basic-http.yaml' %}
```

The following example uses the `weight` field to forward 90% of HTTP requests to
`foo.example.com` to the "foo-v1" Service and the other 10% to the "foo-v2"
Service:
```yaml
{% include 'v1alpha2/traffic-splitting/traffic-split-2.yaml' %}
{% include 'v1beta1/traffic-splitting/traffic-split-2.yaml' %}
```

Reference the [backendRef][backendRef] API documentation for additional details
Expand All @@ -176,7 +176,7 @@ appropriate when the route is modified.
The following example indicates HTTPRoute "http-example" has been accepted by
Gateway "gw-example" in namespace "gw-example-ns":
```yaml
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-example
Expand All @@ -197,12 +197,12 @@ only one Route rule may match each request. For more information on how conflict
resolution applies to merging, refer to the [API specification][httprouterule].
[httproute]: /references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute
[httprouterule]: /references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRouteRule
[hostname]: /references/spec/#gateway.networking.k8s.io/v1alpha2.Hostname
[httproute]: /references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRoute
[httprouterule]: /references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRouteRule
[hostname]: /references/spec/#gateway.networking.k8s.io/v1beta1.Hostname
[rfc-3986]: https://tools.ietf.org/html/rfc3986
[matches]: /references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRouteMatch
[filters]: /references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRouteFilter
[backendRef]: /references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPBackendRef
[parentRef]: /references/spec/#gateway.networking.k8s.io/v1alpha2.ParentRef
[matches]: /references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRouteMatch
[filters]: /references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRouteFilter
[backendRef]: /references/spec/#gateway.networking.k8s.io/v1beta1.HTTPBackendRef
[parentRef]: /references/spec/#gateway.networking.k8s.io/v1beta1.ParentRef
Loading

0 comments on commit 482d988

Please sign in to comment.