Skip to content

Commit 628fe6a

Browse files
authored
chore: update gatewayv1beta1 to gatewayv1 in examples and docs (#4935)
* update gatewayv1beta1 to gatewayv1 in examples and docs * update CHANGELOG
1 parent cda824c commit 628fe6a

10 files changed

+22
-19
lines changed

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Adding a new version? You'll need three changes:
155155
- Bump version of gateway API to `1.0.0-rc1` and support `Gateway`, `GatewayClass`
156156
and `HTTPRoute` in API version `gateway.networking.k8s.io/v1`.
157157
[#4893](https://github.com/Kong/kubernetes-ingress-controller/pull/4893)
158+
- Update `Gateway`s, `GatewayClass`es and `HTTPRoute`s in examples to API
159+
version `gateway.networking.k8s.io/v1`.
160+
[#4935](https://github.com/Kong/kubernetes-ingress-controller/pull/4935)
158161

159162

160163
### Added
@@ -398,7 +401,7 @@ Adding a new version? You'll need three changes:
398401
[#4458](https://github.com/Kong/kubernetes-ingress-controller/pull/4458)
399402

400403
[gojson]: https://github.com/goccy/go-json
401-
[httproute-specification]: https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRoute
404+
[httproute-specification]: https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.HTTPRoute
402405
[grpcroute-specification]: https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.GRPCRouteRule
403406

404407
## [2.10.5]

examples/gateway-grpcroute.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JRzJBZ0VBTUJBR0J5cUdTTTQ5QWdFR0JTdUJCQUFpQklHZU1JR2JBZ0VCQkRERFJuZGdQWVphb25WdXFIaXUKNXV1WVdJK0ExNkJZTG9VQm5ZMC85Qkw5VTBzNDdHN0xDL2IwNXdFLzdVUEpFQktoWkFOaUFBUkI1eC9PekdZLwpBTFRxNDJ6ZVRLSXNOdnB1dWVBemhtMFplREJ3WVBmM2R4dGlacTZkOEU5RzNHcUh2cEVwMUwzRE9yaXI2Z0h4CjAreEFxQUUyR1VsT3Y2SVVmME9MdHNGa1Z4aXJINUtjMVJkblIwTTBGdGJpczlWTWtkQzkyaWM9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
4646
type: kubernetes.io/tls
4747
---
48-
apiVersion: gateway.networking.k8s.io/v1beta1
48+
apiVersion: gateway.networking.k8s.io/v1
4949
kind: GatewayClass
5050
metadata:
5151
name: kong
@@ -54,7 +54,7 @@ metadata:
5454
spec:
5555
controllerName: konghq.com/kic-gateway-controller
5656
---
57-
apiVersion: gateway.networking.k8s.io/v1beta1
57+
apiVersion: gateway.networking.k8s.io/v1
5858
kind: Gateway
5959
metadata:
6060
name: kong

examples/gateway-httproute.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
app: nginx
7575
type: ClusterIP
7676
---
77-
apiVersion: gateway.networking.k8s.io/v1beta1
77+
apiVersion: gateway.networking.k8s.io/v1
7878
kind: GatewayClass
7979
metadata:
8080
name: kong
@@ -83,7 +83,7 @@ metadata:
8383
spec:
8484
controllerName: konghq.com/kic-gateway-controller
8585
---
86-
apiVersion: gateway.networking.k8s.io/v1beta1
86+
apiVersion: gateway.networking.k8s.io/v1
8787
kind: Gateway
8888
metadata:
8989
name: kong
@@ -94,7 +94,7 @@ spec:
9494
protocol: HTTP
9595
port: 80
9696
---
97-
apiVersion: gateway.networking.k8s.io/v1beta1
97+
apiVersion: gateway.networking.k8s.io/v1
9898
kind: HTTPRoute
9999
metadata:
100100
name: httproute-testing

examples/gateway-referencegrant-httproute.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- group: ""
6060
kind: Service
6161
---
62-
apiVersion: gateway.networking.k8s.io/v1beta1
62+
apiVersion: gateway.networking.k8s.io/v1
6363
kind: GatewayClass
6464
metadata:
6565
name: kong
@@ -68,7 +68,7 @@ metadata:
6868
spec:
6969
controllerName: konghq.com/kic-gateway-controller
7070
---
71-
apiVersion: gateway.networking.k8s.io/v1beta1
71+
apiVersion: gateway.networking.k8s.io/v1
7272
kind: Gateway
7373
metadata:
7474
name: kong
@@ -80,7 +80,7 @@ spec:
8080
protocol: HTTP
8181
port: 80
8282
---
83-
apiVersion: gateway.networking.k8s.io/v1beta1
83+
apiVersion: gateway.networking.k8s.io/v1
8484
kind: HTTPRoute
8585
metadata:
8686
name: httproute-testing

examples/gateway-tcproute.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
app: tcpecho
4040
type: ClusterIP
4141
---
42-
apiVersion: gateway.networking.k8s.io/v1beta1
42+
apiVersion: gateway.networking.k8s.io/v1
4343
kind: GatewayClass
4444
metadata:
4545
name: kong
@@ -48,7 +48,7 @@ metadata:
4848
spec:
4949
controllerName: konghq.com/kic-gateway-controller
5050
---
51-
apiVersion: gateway.networking.k8s.io/v1beta1
51+
apiVersion: gateway.networking.k8s.io/v1
5252
kind: Gateway
5353
metadata:
5454
name: kong

examples/gateway-tlsroute.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ data:
6363
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBNllBQmR1TDJJak9NN1l5T2xkNGNuVXgyUElNNzlNZHVHMEQ1N0NxdjMyV0ZVMnF4ClcyM0VkMTZXNkYydjhJSkl2bEtzQ3dZSit0bHVGSExLeEU2TmZGa3NHTjhsOHkyM3pwTzBvZm1wRDJVSFliWDgKcGR5enoyeXFuMFlHc05raFNoZmJsTGl0Nm9mYzZsSGYzaURxMkVTNlQ1QURualdHb0R5Q3Q5YVhvUXRRR0FVVwo1MVJxckpJTzNSMFBOUjFoM0toU21RaGh2ZHZwbTRoWFAwazNML2xGTFJDR0Y2Q1dVbWdyRzFaM0pRN0FsUmFWCk1kVzh3N3hvZTN2YlZvV2xTQjI2clpCQVcxZFhTaG10TTQ3L1lyb0E1bmdBdUlCU3J2ZXdsQjI2L2dVN1BFZlYKYkNydmpKdVhjR1JQdjdZMGt3a3BzdFh5TklYQWlxRENqTW94NFFJREFRQUJBb0lCQVFEWEc4UzltSEwxcVJZQQpWWWVaeXlnRFJVaDdrTTZ3UHZWUmlEZDFlUkhTdFB6eGp3M2EwN0cxNGw4VnJCR0VlUkc0dkFLZ21TeWllcUl0CmxsNzBJQVc1ODVCclRVL3h5a0ZWdnI4ZXBSZzVCWEthY29SUTdKUjkxM2NNQ2YvcDllMzBDeXlQd3Q3OWU3SnAKNzRsVVluRFhVZUZ0b0pla3JWemJ5ME1GUjEwaXpyMW03QjZCUUtzbWF2MU51RGxkbjd1b1VlRFIvM2FOSS9kNgp3VnQ1VVNmVytvRDhYYTJQbWpDYnBxTk9oQ0FsOHlVRW9DanV5bEo3T1ErQUVYcGhjL2prTDdtYXpSNjduczYrCmpqZ29FNmlISXRXcWp6akRqaVRwdThzemVJUEh1TjNjM1Fkdm1YQlMyU3ZrRS9Vd1JCRUVPek1pdUlKMzdoa28KMHhnR0JnVFJBb0dCQU9zc2QxMjU3OTZoSFFnRk5TbFlFVWxWeTFQcll3eFI2N3FxemF1R1VHaVcram0zc1lCUwpPWFlpR1NBVDF2TXlKeTV0VnBUdHVLbEg4NjQ4aWRBd1BpQU5Ybk94NEt2SHBoTG9tb1VraXArTllTS3ZEc1MrCjB1Q3lUVWxnOEhyTnV5N2ZXMkdReFZhbFVMa2xHb05HeWFlbU1FcU1DZFU1QmVNREdTMW1PY2psQW9HQkFQNHQKbUtHbzUyQXF5cGNZVlRydlB1RUxSTVcxUFNBQ2kvUzRSYVpVbDMreEc4OW82U2VjVldubWdmUjJaTUMvamcrbwpHNGYzOGtkcUxrMUcvbEFNVzVWYndBRFR6dXJNTEdRNUUwckl5K2E0Nzc0UTJ4QjhJR2svbm4wUXVPM2dwZERTCjMyOFo0NUtyVWxwMEhQek9HRnZTbzBVcmx4Zm5zeUgvKzdFVWdtRk5Bb0dBWGRDL1RZUi9UREM1aEJtUHU0NkcKVnRzQzRkZGxDK1VpUkxVZWx1NWQ1VnRWTnZFd3ZpQVBEREZPRkozVmdlN2Y4b1ZycEwyd2pOZEhQcHFuMzRWZgpReW9TSTlVeDYxVVp5ekUvY3gzQXJ5V1hPbDdiWldFNmZxaWliRU5mcTUybXJtd3I2Qi80bVRnWm04SlJjVTByCjVOVkhMblh1OWtCcE9NWmpwTmpDOUlFQ2dZRUF4MU4yZUgvK1Fub01PWVZKZ1ZnUkZXWkMzbENNeU1kMmZjanMKUmMzY3FMUjVQS1BuQTdzamVGTGQ0cG5kMVJIakZBQWU1dmZZTll6ZEZwanY0bEp1bDZoRjMrQTZTZ01uWk1rbAppZVlCa01QQ3JtaUZnbDMxQk5SeE0xNmp4MWYrY002TmpaRGQyQzBsL2UxRXRqUGhBbEVpM0tHY2NaQ3Y5NS9JCi8wczRHNWtDZ1lBdy9sa3dxTTg0Z3lwRjhWS0tydnVRa0NGbnhIa0tmRjBid0hJUHFBOTJoSzNTTVVocjd2MncKc0hURTJVeHE2ZUtEa01NUmdkZEYxSlBJQ2poZjR0cHYzSStVTlUxTUxDbFEwbVdLTUN4WXFBQ0JHcmx2Nit0bQpFTEJDaXFjL29CSnJXY3Fvc1NraFcxQjdEVWNYemtQUGVqR09RSUUrZ08yMkVxSW80QWhySUE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
6464
type: kubernetes.io/tls
6565
---
66-
apiVersion: gateway.networking.k8s.io/v1beta1
66+
apiVersion: gateway.networking.k8s.io/v1
6767
kind: GatewayClass
6868
metadata:
6969
name: kong
@@ -72,7 +72,7 @@ metadata:
7272
spec:
7373
controllerName: konghq.com/kic-gateway-controller
7474
---
75-
apiVersion: gateway.networking.k8s.io/v1beta1
75+
apiVersion: gateway.networking.k8s.io/v1
7676
kind: Gateway
7777
metadata:
7878
name: kong

examples/gateway-udproute.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
app: coredns
8080
type: ClusterIP
8181
---
82-
apiVersion: gateway.networking.k8s.io/v1beta1
82+
apiVersion: gateway.networking.k8s.io/v1
8383
kind: GatewayClass
8484
metadata:
8585
name: kong
@@ -88,7 +88,7 @@ metadata:
8888
spec:
8989
controllerName: konghq.com/kic-gateway-controller
9090
---
91-
apiVersion: gateway.networking.k8s.io/v1beta1
91+
apiVersion: gateway.networking.k8s.io/v1
9292
kind: Gateway
9393
metadata:
9494
name: kong

internal/controllers/gateway/httproute_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
410410

411411
// if there is no matched hosts in listeners for the httproute, the httproute should not be accepted
412412
// and have an "Accepted" condition with status false.
413-
// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRoute
413+
// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.HTTPRoute
414414
filteredHTTPRoute, err := filterHostnames(gateways, httproute.DeepCopy())
415415
// perform operations on the kong store only if the route is in accepted status and there is hostname matching
416416
if isRouteAccepted(gateways) && err == nil {

internal/dataplane/parser/translators/httproute_atc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func pathMatcherFromHTTPPathMatch(pathMatch *gatewayapi.HTTPPathMatch) atc.Match
167167
return atc.NewPredicateHTTPPath(atc.OpPrefixMatch, "/")
168168
}
169169
// if path ends with /, we should remove the trailing / because it should be ignored:
170-
// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1beta1.PathMatchType
170+
// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.PathMatchType
171171
path = strings.TrimSuffix(path, "/")
172172
return atc.Or(
173173
atc.NewPredicateHTTPPath(atc.OpEqual, path),

internal/util/k8s_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func TestGenerateTagsForObject(t *testing.T) {
255255
lo.ToPtr(K8sKindTagPrefix + "HTTPRoute"),
256256
lo.ToPtr(K8sUIDTagPrefix + "buryani"),
257257
lo.ToPtr(K8sGroupTagPrefix + "gateway.networking.k8s.io"),
258-
lo.ToPtr(K8sVersionTagPrefix + "v1beta1"),
258+
lo.ToPtr(K8sVersionTagPrefix + "v1"),
259259
lo.ToPtr("temir-jol"),
260260
lo.ToPtr("snaryad-soqqısı"),
261261
}
@@ -264,7 +264,7 @@ func TestGenerateTagsForObject(t *testing.T) {
264264
// Relevant kubernetes issue: https://github.com/kubernetes/kubernetes/issues/80609
265265
testObj := &gatewayapi.HTTPRoute{
266266
TypeMeta: metav1.TypeMeta{
267-
APIVersion: "gateway.networking.k8s.io/v1beta1",
267+
APIVersion: "gateway.networking.k8s.io/v1",
268268
Kind: "HTTPRoute",
269269
},
270270
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)