Skip to content

Commit 6176b0f

Browse files
authored
conformance: update tests to use gatewayv1 APIs (#4722)
* update Gateway version to v1 in UDP conformance test Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * update conformance tests v1beta1 apis to v1 Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>
1 parent 61a46b7 commit 6176b0f

21 files changed

Lines changed: 136 additions & 140 deletions

conformance/base/manifests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
labels:
1414
gateway-conformance: infra
1515
---
16-
apiVersion: gateway.networking.k8s.io/v1beta1
16+
apiVersion: gateway.networking.k8s.io/v1
1717
kind: Gateway
1818
metadata:
1919
name: same-namespace
@@ -28,7 +28,7 @@ spec:
2828
namespaces:
2929
from: Same
3030
---
31-
apiVersion: gateway.networking.k8s.io/v1beta1
31+
apiVersion: gateway.networking.k8s.io/v1
3232
kind: Gateway
3333
metadata:
3434
name: same-namespace-with-https-listener
@@ -88,7 +88,7 @@ spec:
8888
name: tls-validity-checks-certificate
8989
namespace: gateway-conformance-infra
9090
---
91-
apiVersion: gateway.networking.k8s.io/v1beta1
91+
apiVersion: gateway.networking.k8s.io/v1
9292
kind: Gateway
9393
metadata:
9494
name: all-namespaces
@@ -103,7 +103,7 @@ spec:
103103
namespaces:
104104
from: All
105105
---
106-
apiVersion: gateway.networking.k8s.io/v1beta1
106+
apiVersion: gateway.networking.k8s.io/v1
107107
kind: Gateway
108108
metadata:
109109
name: backend-namespaces

conformance/conformance.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
v1 "sigs.k8s.io/gateway-api/apis/v1"
2626
"sigs.k8s.io/gateway-api/apis/v1alpha2"
2727
"sigs.k8s.io/gateway-api/apis/v1alpha3"
28-
"sigs.k8s.io/gateway-api/apis/v1beta1"
2928
xv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1"
3029
confv1 "sigs.k8s.io/gateway-api/conformance/apis/v1"
3130
"sigs.k8s.io/gateway-api/conformance/tests"
@@ -65,7 +64,6 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
6564

6665
require.NoError(t, v1alpha3.Install(client.Scheme()))
6766
require.NoError(t, v1alpha2.Install(client.Scheme()))
68-
require.NoError(t, v1beta1.Install(client.Scheme()))
6967
require.NoError(t, xv1alpha1.Install(client.Scheme()))
7068
require.NoError(t, v1.Install(client.Scheme()))
7169
require.NoError(t, apiextensionsv1.AddToScheme(client.Scheme()))
@@ -84,7 +82,7 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
8482
*flags.ImplementationVersion,
8583
*flags.ImplementationContact,
8684
)
87-
var usable, unusable []v1beta1.GatewaySpecAddress
85+
var usable, unusable []v1.GatewaySpecAddress
8886
if v := *flags.UsableAddress; v != "" {
8987
usable = append(usable, parseAddress(v))
9088
}
@@ -122,16 +120,16 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
122120
}
123121
}
124122

125-
func parseAddress(v string) v1beta1.GatewaySpecAddress {
123+
func parseAddress(v string) v1.GatewaySpecAddress {
126124
_, err := netip.ParseAddr(v)
127125
if err == nil {
128-
return v1beta1.GatewaySpecAddress{
129-
Type: ptr.To(v1beta1.IPAddressType),
126+
return v1.GatewaySpecAddress{
127+
Type: ptr.To(v1.IPAddressType),
130128
Value: v,
131129
}
132130
}
133-
return v1beta1.GatewaySpecAddress{
134-
Type: ptr.To(v1beta1.HostnameAddressType),
131+
return v1.GatewaySpecAddress{
132+
Type: ptr.To(v1.HostnameAddressType),
135133
Value: v,
136134
}
137135
}

conformance/tests/gateway-secret-invalid-reference-grant.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
name: certificate
2020
namespace: gateway-conformance-web-backend
2121
---
22-
apiVersion: gateway.networking.k8s.io/v1beta1
22+
apiVersion: gateway.networking.k8s.io/v1
2323
kind: ReferenceGrant
2424
metadata:
2525
name: reference-grant-wrong-namespace
@@ -34,7 +34,7 @@ spec:
3434
kind: Secret
3535
name: certificate
3636
---
37-
apiVersion: gateway.networking.k8s.io/v1beta1
37+
apiVersion: gateway.networking.k8s.io/v1
3838
kind: ReferenceGrant
3939
metadata:
4040
name: reference-grant-wrong-from-group
@@ -49,7 +49,7 @@ spec:
4949
kind: Secret
5050
name: certificate
5151
---
52-
apiVersion: gateway.networking.k8s.io/v1beta1
52+
apiVersion: gateway.networking.k8s.io/v1
5353
kind: ReferenceGrant
5454
metadata:
5555
name: reference-grant-wrong-from-kind
@@ -64,7 +64,7 @@ spec:
6464
kind: Secret
6565
name: certificate
6666
---
67-
apiVersion: gateway.networking.k8s.io/v1beta1
67+
apiVersion: gateway.networking.k8s.io/v1
6868
kind: ReferenceGrant
6969
metadata:
7070
name: reference-grant-wrong-from-namespace
@@ -79,7 +79,7 @@ spec:
7979
kind: Secret
8080
name: certificate
8181
---
82-
apiVersion: gateway.networking.k8s.io/v1beta1
82+
apiVersion: gateway.networking.k8s.io/v1
8383
kind: ReferenceGrant
8484
metadata:
8585
name: reference-grant-wrong-to-group
@@ -94,7 +94,7 @@ spec:
9494
kind: Secret
9595
name: not-the-certificate-youre-looking-for
9696
---
97-
apiVersion: gateway.networking.k8s.io/v1beta1
97+
apiVersion: gateway.networking.k8s.io/v1
9898
kind: ReferenceGrant
9999
metadata:
100100
name: reference-grant-wrong-to-kind
@@ -109,7 +109,7 @@ spec:
109109
kind: Service
110110
name: certificate
111111
---
112-
apiVersion: gateway.networking.k8s.io/v1beta1
112+
apiVersion: gateway.networking.k8s.io/v1
113113
kind: ReferenceGrant
114114
metadata:
115115
name: reference-grant-wrong-to-name

conformance/tests/gateway-secret-reference-grant-all-in-namespace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
name: certificate
2020
namespace: gateway-conformance-web-backend
2121
---
22-
apiVersion: gateway.networking.k8s.io/v1beta1
22+
apiVersion: gateway.networking.k8s.io/v1
2323
kind: ReferenceGrant
2424
metadata:
2525
name: reference-grant-all-in-namespace

conformance/tests/gateway-secret-reference-grant-specific.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
name: certificate
2020
namespace: gateway-conformance-web-backend
2121
---
22-
apiVersion: gateway.networking.k8s.io/v1beta1
22+
apiVersion: gateway.networking.k8s.io/v1
2323
kind: ReferenceGrant
2424
metadata:
2525
name: reference-grant-specific

conformance/tests/gateway-with-attached-routes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ spec:
106106
- name: infra-backend-v1
107107
port: 8080
108108
---
109-
apiVersion: gateway.networking.k8s.io/v1beta1
109+
apiVersion: gateway.networking.k8s.io/v1
110110
kind: Gateway
111111
metadata:
112112
name: unresolved-gateway-with-one-attached-unresolved-route
@@ -134,7 +134,7 @@ spec:
134134
name: does-not-exist
135135
mode: Terminate
136136
---
137-
apiVersion: gateway.networking.k8s.io/v1beta1
137+
apiVersion: gateway.networking.k8s.io/v1
138138
kind: HTTPRoute
139139
metadata:
140140
name: http-route-4

conformance/tests/httproute-invalid-reference-grant.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: gateway.networking.k8s.io/v1beta1
2+
apiVersion: gateway.networking.k8s.io/v1
33
kind: ReferenceGrant
44
metadata:
55
name: reference-grant-wrong-namespace
@@ -14,7 +14,7 @@ spec:
1414
kind: Service
1515
name: web-backend
1616
---
17-
apiVersion: gateway.networking.k8s.io/v1beta1
17+
apiVersion: gateway.networking.k8s.io/v1
1818
kind: ReferenceGrant
1919
metadata:
2020
name: reference-grant-wrong-from-group
@@ -29,7 +29,7 @@ spec:
2929
kind: Service
3030
name: web-backend
3131
---
32-
apiVersion: gateway.networking.k8s.io/v1beta1
32+
apiVersion: gateway.networking.k8s.io/v1
3333
kind: ReferenceGrant
3434
metadata:
3535
name: reference-grant-wrong-from-kind
@@ -44,7 +44,7 @@ spec:
4444
kind: Service
4545
name: web-backend
4646
---
47-
apiVersion: gateway.networking.k8s.io/v1beta1
47+
apiVersion: gateway.networking.k8s.io/v1
4848
kind: ReferenceGrant
4949
metadata:
5050
name: reference-grant-wrong-from-namespace
@@ -59,7 +59,7 @@ spec:
5959
kind: Service
6060
name: web-backend
6161
---
62-
apiVersion: gateway.networking.k8s.io/v1beta1
62+
apiVersion: gateway.networking.k8s.io/v1
6363
kind: ReferenceGrant
6464
metadata:
6565
name: reference-grant-wrong-to-group
@@ -74,7 +74,7 @@ spec:
7474
kind: Service
7575
name: web-backend
7676
---
77-
apiVersion: gateway.networking.k8s.io/v1beta1
77+
apiVersion: gateway.networking.k8s.io/v1
7878
kind: ReferenceGrant
7979
metadata:
8080
name: reference-grant-wrong-to-kind
@@ -89,7 +89,7 @@ spec:
8989
kind: Secret
9090
name: web-backend
9191
---
92-
apiVersion: gateway.networking.k8s.io/v1beta1
92+
apiVersion: gateway.networking.k8s.io/v1
9393
kind: ReferenceGrant
9494
metadata:
9595
name: reference-grant-wrong-to-name

conformance/tests/httproute-partially-invalid-via-invalid-reference-grant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: gateway.networking.k8s.io/v1beta1
1+
apiVersion: gateway.networking.k8s.io/v1
22
kind: ReferenceGrant
33
metadata:
44
name: invalid-reference-grant

conformance/tests/httproute-reference-grant.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/types"
2626

27-
"sigs.k8s.io/gateway-api/apis/v1beta1"
27+
v1 "sigs.k8s.io/gateway-api/apis/v1"
2828
"sigs.k8s.io/gateway-api/conformance/utils/http"
2929
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
3030
confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
@@ -64,7 +64,7 @@ var HTTPRouteReferenceGrant = confsuite.ConformanceTest{
6464

6565
ctx, cancel := context.WithTimeout(context.Background(), suite.TimeoutConfig.DeleteTimeout)
6666
defer cancel()
67-
rg := v1beta1.ReferenceGrant{
67+
rg := v1.ReferenceGrant{
6868
ObjectMeta: metav1.ObjectMeta{
6969
Name: "reference-grant",
7070
Namespace: confsuite.WebBackendNamespace,

conformance/tests/httproute-reference-grant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: gateway.networking.k8s.io/v1beta1
1+
apiVersion: gateway.networking.k8s.io/v1
22
kind: ReferenceGrant
33
metadata:
44
name: reference-grant

0 commit comments

Comments
 (0)