Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs to use v1beta1 #1238

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions apis/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
Copyright 2020 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package apis
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-redirect
spec:
hostnames:
- redirect.example
rules:
- matches:
- path:
type: PathPrefix
value: /cayenne
filters:
- type: RequestRedirect
requestRedirect:
path:
type: ReplaceFullPath
replaceFullPath: /paprika
statusCode: 302
backendRefs:
- name: example-svc
weight: 1
port: 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-redirect
spec:
hostnames:
- redirect.example
rules:
- filters:
- type: RequestRedirect
requestRedirect:
scheme: https
statusCode: 301
backendRefs:
- name: example-svc
weight: 1
port: 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-redirect
spec:
hostnames:
- redirect.example
rules:
- matches:
- path:
type: PathPrefix
value: /cayenne
filters:
- type: RequestRedirect
requestRedirect:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /paprika
statusCode: 302
backendRefs:
- name: example-svc
weight: 1
port: 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-rewrite
spec:
hostnames:
- rewrite.example
rules:
- matches:
- path:
type: PathPrefix
value: /cardamom
filters:
- type: URLRewrite
urlRewrite:
hostname: elsewhere.example
path:
type: ReplaceFullPath
replaceFullPath: /fennel
backendRefs:
- name: example-svc
weight: 1
port: 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-rewrite
spec:
hostnames:
- rewrite.example
rules:
- filters:
- type: URLRewrite
urlRewrite:
hostname: elsewhere.example
backendRefs:
- name: example-svc
weight: 1
port: 80
18 changes: 18 additions & 0 deletions examples/experimental/v1beta1/http-redirect.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-1
namespace: gateway-api-example-ns1
spec:
parentRefs:
- name: my-filter-gateway
sectionName: http
hostnames:
- my-filter.example.com
rules:
- filters:
- type: RequestRedirect
requestRedirect:
path:
type: ReplaceFullPath
replaceFullPath: /foo
18 changes: 18 additions & 0 deletions examples/experimental/v1beta1/http-rewrite.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-filter-1
namespace: gateway-api-example-ns1
spec:
parentRefs:
- name: my-filter-gateway
sectionName: http
hostnames:
- my-filter.example.com
rules:
- filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: /foo
8 changes: 4 additions & 4 deletions hack/api-docs/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ gendoc::exec() {
"$@"
}

if [ "$#" != "2" ]; then
echo "usage: generate.sh API_VERSION OUTFILE"
if [ "$#" != "1" ]; then
echo "usage: generate.sh OUTFILE"
exit 2
fi

gendoc::build
gendoc::exec \
-api-dir "sigs.k8s.io/gateway-api/apis/${1}" \
-out-file "${2}"
-api-dir "sigs.k8s.io/gateway-api/apis/" \
-out-file "${1}"
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ spec:
- filters:
- type: RequestHeaderModifier
requestRedirect:
port: 443
port: 443

13 changes: 13 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/duplicate-listeners.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: duplicate-listeners
spec:
gatewayClassName: acme-lb
listeners:
- name: same
protocol: HTTP
port: 80
- name: same
protocol: HTTP
port: 443
11 changes: 11 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/hostname-tcp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: hostname-tcp
spec:
gatewayClassName: acme-lb
listeners:
- name: example
hostname: example.com
protocol: TCP
port: 80
11 changes: 11 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/hostname-udp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: hostname-udp
spec:
gatewayClassName: acme-lb
listeners:
- name: example
hostname: example.com
protocol: UDP
port: 80
10 changes: 10 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/invalid-listener-name.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: invalid-listener-name
spec:
gatewayClassName: acme-lb
listeners:
- name: bad>
protocol: HTTP
port: 80
10 changes: 10 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/invalid-listener-port.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: invalid-listener-port
spec:
gatewayClassName: acme-lb
listeners:
- name: foo
protocol: HTTP
port: 123456789
16 changes: 16 additions & 0 deletions hack/invalid-examples/v1beta1/gateway/tlsconfig-tcp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: tlsconfig-tcp
spec:
gatewayClassName: acme-lb
listeners:
- name: example
protocol: TCP
port: 443
tls:
certificateRefs:
- kind: Secret
group: ""
name: bar-example-com-cert

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: GatewayClass
metadata:
name: invalid-controller
spec:
controllerName: example
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: duplicate-header-match
spec:
rules:
- matches:
- headers:
- name: foo
value: bar
- name: foo
value: bar
12 changes: 12 additions & 0 deletions hack/invalid-examples/v1beta1/httproute/duplicate-query-match.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: duplicate-query-match
spec:
rules:
- matches:
- queryParams:
- name: foo
value: bar
- name: foo
value: bar
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: portless-backend
spec:
parentRefs:
- name: prod-web
rules:
- backendRefs:
- name: foo
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: portless-service
spec:
parentRefs:
- name: prod-web
rules:
- backendRefs:
- name: foo
kind: Service
group: ""
10 changes: 10 additions & 0 deletions hack/invalid-examples/v1beta1/httproute/invalid-backend-group.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-backend-group
spec:
rules:
- backendRefs:
- group: "*"
name: foo
port: 80
10 changes: 10 additions & 0 deletions hack/invalid-examples/v1beta1/httproute/invalid-backend-kind.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-backend-kind
spec:
rules:
- backendRefs:
- kind: "*"
name: foo
port: 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-backend-port
spec:
rules:
- backendRefs:
- name: my-service1
port: 800080
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-filter-duplicate
spec:
rules:
- filters:
- type: RequestHeaderModifier
requestHeaderModifier:
add:
- name: my-header
value: foo
- type: RequestHeaderModifier
requestHeaderModifier:
add:
- name: my-header
value: bar

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-filter-empty
spec:
rules:
- filters:
- type: RequestHeaderModifier
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: invalid-filter-wrong-field
spec:
rules:
- filters:
- type: RequestHeaderModifier
requestRedirect:
port: 443

Loading