Skip to content

Commit db90544

Browse files
authored
rename conformance infra namespace (#1667)
1 parent bbc2f37 commit db90544

12 files changed

+56
-57
lines changed

conformance/resources/base.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
apiVersion: v1
88
kind: Namespace
99
metadata:
10-
name: gateway-conformance-infra
10+
name: inference-conformance-infra
1111
labels:
12-
gateway-conformance: infra
12+
inference-conformance: infra
1313
---
1414
apiVersion: v1
1515
kind: Namespace
1616
metadata:
17-
name: gateway-conformance-app-backend
17+
name: inference-conformance-app-backend
1818
labels:
19-
gateway-conformance: backend
19+
inference-conformance: backend
2020
---
2121
# A basic Gateway resource that allows HTTPRoutes from the same namespace.
2222
# Tests can use this as a parent reference for routes that target InferencePools.
2323
apiVersion: gateway.networking.k8s.io/v1
2424
kind: Gateway
2525
metadata:
2626
name: conformance-primary
27-
namespace: gateway-conformance-infra
27+
namespace: inference-conformance-infra
2828
spec:
2929
gatewayClassName: "{GATEWAY_CLASS_NAME}"
3030
listeners:
@@ -42,7 +42,7 @@ apiVersion: gateway.networking.k8s.io/v1
4242
kind: Gateway
4343
metadata:
4444
name: conformance-secondary
45-
namespace: gateway-conformance-infra
45+
namespace: inference-conformance-infra
4646
spec:
4747
gatewayClassName: "{GATEWAY_CLASS_NAME}"
4848
listeners:
@@ -55,14 +55,14 @@ spec:
5555
from: All
5656

5757
### The following defines the essential resources for the gateway conformance test.
58-
### All resources are created in the 'gateway-conformance-app-backend' namespace.
58+
### All resources are created in the 'inference-conformance-app-backend' namespace.
5959
---
6060
# Deploys a mock backend service to act as a model server.
6161
apiVersion: apps/v1
6262
kind: Deployment
6363
metadata:
6464
name: primary-inference-model-server-deployment
65-
namespace: gateway-conformance-app-backend
65+
namespace: inference-conformance-app-backend
6666
labels:
6767
app: primary-inference-model-server
6868
spec:
@@ -106,7 +106,7 @@ apiVersion: apps/v1
106106
kind: Deployment
107107
metadata:
108108
name: secondary-inference-model-server-deployment
109-
namespace: gateway-conformance-app-backend
109+
namespace: inference-conformance-app-backend
110110
labels:
111111
app: secondary-inference-model-server
112112
spec:
@@ -150,7 +150,7 @@ apiVersion: inference.networking.k8s.io/v1
150150
kind: InferencePool
151151
metadata:
152152
name: primary-inference-pool
153-
namespace: gateway-conformance-app-backend
153+
namespace: inference-conformance-app-backend
154154
spec:
155155
selector:
156156
matchLabels:
@@ -167,7 +167,7 @@ apiVersion: v1
167167
kind: Service
168168
metadata:
169169
name: primary-endpoint-picker-svc
170-
namespace: gateway-conformance-app-backend
170+
namespace: inference-conformance-app-backend
171171
spec:
172172
selector:
173173
app: primary-app-backend-epp
@@ -183,7 +183,7 @@ apiVersion: apps/v1
183183
kind: Deployment
184184
metadata:
185185
name: primary-app-endpoint-picker
186-
namespace: gateway-conformance-app-backend
186+
namespace: inference-conformance-app-backend
187187
labels:
188188
app: primary-app-backend-epp
189189
spec:
@@ -206,7 +206,7 @@ spec:
206206
- --pool-name
207207
- "primary-inference-pool"
208208
- --pool-namespace
209-
- "gateway-conformance-app-backend"
209+
- "inference-conformance-app-backend"
210210
- --v
211211
- "4"
212212
- --zap-encoder
@@ -247,7 +247,7 @@ apiVersion: inference.networking.k8s.io/v1
247247
kind: InferencePool
248248
metadata:
249249
name: secondary-inference-pool
250-
namespace: gateway-conformance-app-backend
250+
namespace: inference-conformance-app-backend
251251
spec:
252252
selector:
253253
matchLabels:
@@ -265,7 +265,7 @@ apiVersion: v1
265265
kind: Service
266266
metadata:
267267
name: secondary-endpoint-picker-svc
268-
namespace: gateway-conformance-app-backend
268+
namespace: inference-conformance-app-backend
269269
spec:
270270
selector:
271271
app: secondary-app-backend-epp
@@ -281,7 +281,7 @@ apiVersion: apps/v1
281281
kind: Deployment
282282
metadata:
283283
name: secondary-app-endpoint-picker
284-
namespace: gateway-conformance-app-backend
284+
namespace: inference-conformance-app-backend
285285
labels:
286286
app: secondary-app-backend-epp
287287
spec:
@@ -304,7 +304,7 @@ spec:
304304
- --pool-name
305305
- "secondary-inference-pool"
306306
- --pool-namespace
307-
- "gateway-conformance-app-backend"
307+
- "inference-conformance-app-backend"
308308
- --v
309309
- "4"
310310
- --zap-encoder
@@ -344,7 +344,7 @@ apiVersion: v1
344344
kind: ConfigMap
345345
metadata:
346346
name: plugins-config
347-
namespace: gateway-conformance-app-backend
347+
namespace: inference-conformance-app-backend
348348
data:
349349
conformance-plugins.yaml: |
350350
apiVersion: inference.networking.x-k8s.io/v1alpha1
@@ -361,7 +361,7 @@ apiVersion: rbac.authorization.k8s.io/v1
361361
kind: Role
362362
metadata:
363363
name: inference-model-reader
364-
namespace: gateway-conformance-app-backend
364+
namespace: inference-conformance-app-backend
365365
rules:
366366
- apiGroups: ["inference.networking.x-k8s.io"]
367367
resources: ["inferenceobjectives", "inferencepools"]
@@ -377,11 +377,11 @@ apiVersion: rbac.authorization.k8s.io/v1
377377
kind: RoleBinding
378378
metadata:
379379
name: epp-to-inference-model-reader
380-
namespace: gateway-conformance-app-backend
380+
namespace: inference-conformance-app-backend
381381
subjects:
382382
- kind: ServiceAccount
383383
name: default
384-
namespace: gateway-conformance-app-backend
384+
namespace: inference-conformance-app-backend
385385
roleRef:
386386
kind: Role
387387
name: inference-model-reader

conformance/resources/resourcename.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package resources
1919
import "k8s.io/apimachinery/pkg/types"
2020

2121
const (
22-
AppBackendNamespace = "gateway-conformance-app-backend"
23-
InfraNamespace = "gateway-conformance-infra"
22+
AppBackendNamespace = "inference-conformance-app-backend"
23+
InfraNamespace = "inference-conformance-infra"
2424
PrimaryGatewayName = "conformance-primary"
2525
SecondaryGatewayName = "conformance-secondary"
2626

conformance/scripts/istio/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
GATEWAY_API_VERSION ?= v1.3.0
44
INFERENCE_EXTENSION_VERSION ?= v0.4.0
55
ISTIO_VERSION ?= 1.27-alpha.0551127f00634403cddd4634567e65a8ecc499a7
6-
ISTIO_HUB ?=
6+
ISTIO_HUB ?=
77
ISTIO_PROFILE ?= minimal
88

99
# Conformance test variables
@@ -72,7 +72,7 @@ apiVersion: networking.istio.io/v1
7272
kind: DestinationRule
7373
metadata:
7474
name: primary-endpoint-picker-tls
75-
namespace: gateway-conformance-app-backend
75+
namespace: inference-conformance-app-backend
7676
spec:
7777
host: primary-endpoint-picker-svc
7878
trafficPolicy:
@@ -84,7 +84,7 @@ apiVersion: networking.istio.io/v1
8484
kind: DestinationRule
8585
metadata:
8686
name: secondary-endpoint-picker-tls
87-
namespace: gateway-conformance-app-backend
87+
namespace: inference-conformance-app-backend
8888
spec:
8989
host: secondary-endpoint-picker-svc
9090
trafficPolicy:
@@ -432,7 +432,7 @@ setup-crds: setup-gateway-api-crds setup-inference-extension-crds
432432
# Setup TLS for EPP
433433
setup-tls:
434434
@echo "Setting up TLS for EPP..."
435-
-kubectl create namespace gateway-conformance-app-backend || true
435+
-kubectl create namespace inference-conformance-app-backend || true
436436
$(file >/tmp/tls-destination-rules.yaml,$(TLS_DESTINATION_RULES))
437437
kubectl apply -f /tmp/tls-destination-rules.yaml
438438
@rm -f /tmp/tls-destination-rules.yaml
@@ -518,7 +518,7 @@ readme-update: $(REPORT_BASE_DIR)/README.md
518518
# Clean up resources
519519
clean:
520520
@echo "Cleaning up..."
521-
kubectl delete namespace gateway-conformance-app-backend --ignore-not-found=true
521+
kubectl delete namespace inference-conformance-app-backend --ignore-not-found=true
522522
@echo "Cleaning up downloaded istioctl binaries..."
523523
@rm -f $(ISTIOCTL_DIR)/istioctl-*
524524
@echo "Note: If using minikube, run 'minikube delete' to completely clean up"

conformance/tests/epp_unavailable_fail_open.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
22
kind: HTTPRoute
33
metadata:
44
name: httproute-for-failopen-pool-gw
5-
namespace: gateway-conformance-app-backend
5+
namespace: inference-conformance-app-backend
66
spec:
77
parentRefs:
88
- group: gateway.networking.k8s.io
99
kind: Gateway
1010
name: conformance-secondary
11-
namespace: gateway-conformance-infra
11+
namespace: inference-conformance-infra
1212
sectionName: http
1313
hostnames:
1414
- "secondary.example.com"

conformance/tests/gateway_following_epp_routing.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
22
kind: HTTPRoute
33
metadata:
44
name: httproute-for-primary-gw
5-
namespace: gateway-conformance-app-backend
5+
namespace: inference-conformance-app-backend
66
spec:
77
parentRefs:
88
- group: gateway.networking.k8s.io
99
kind: Gateway
1010
name: conformance-primary
11-
namespace: gateway-conformance-infra
11+
namespace: inference-conformance-infra
1212
sectionName: http
1313
hostnames:
1414
- "primary.example.com"
@@ -21,4 +21,3 @@ spec:
2121
- path:
2222
type: PathPrefix
2323
value: /primary-gateway-test
24-

conformance/tests/httproute_invalid_inferencepool_ref.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
22
kind: HTTPRoute
33
metadata:
44
name: httproute-to-non-existent-pool
5-
namespace: gateway-conformance-app-backend
5+
namespace: inference-conformance-app-backend
66
spec:
77
parentRefs:
88
- group: gateway.networking.k8s.io
99
kind: Gateway
1010
name: conformance-primary
11-
namespace: gateway-conformance-infra
11+
namespace: inference-conformance-infra
1212
sectionName: http
1313
rules:
1414
- backendRefs:

conformance/tests/httproute_multiple_gateways_different_pools.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apiVersion: gateway.networking.k8s.io/v1
33
kind: HTTPRoute
44
metadata:
55
name: route-for-primary-gateway
6-
namespace: gateway-conformance-app-backend
6+
namespace: inference-conformance-app-backend
77
spec:
88
parentRefs:
99
- kind: Gateway
1010
name: conformance-primary
11-
namespace: gateway-conformance-infra
11+
namespace: inference-conformance-infra
1212
hostnames:
1313
- "primary.example.com"
1414
rules:
@@ -25,12 +25,12 @@ apiVersion: gateway.networking.k8s.io/v1
2525
kind: HTTPRoute
2626
metadata:
2727
name: route-for-secondary-gateway
28-
namespace: gateway-conformance-app-backend
28+
namespace: inference-conformance-app-backend
2929
spec:
3030
parentRefs:
3131
- kind: Gateway
3232
name: conformance-secondary
33-
namespace: gateway-conformance-infra
33+
namespace: inference-conformance-infra
3434
hostnames:
3535
- "secondary.example.com"
3636
rules:

conformance/tests/inferencepool_accepted.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ apiVersion: gateway.networking.k8s.io/v1
33
kind: HTTPRoute
44
metadata:
55
name: httproute-for-inferencepool-accepted
6-
namespace: gateway-conformance-app-backend
6+
namespace: inference-conformance-app-backend
77
spec:
88
parentRefs:
99
- group: gateway.networking.k8s.io
1010
kind: Gateway
1111
name: conformance-primary
12-
namespace: gateway-conformance-infra
12+
namespace: inference-conformance-infra
1313
sectionName: http
1414
rules:
1515
- backendRefs:
1616
- group: inference.networking.k8s.io
1717
kind: InferencePool
1818
name: primary-inference-pool
19-
# namespace: gateway-conformance-app-backend - is omitted since it is in the same namespace as HTTPRoute
19+
# namespace: inference-conformance-app-backend - is omitted since it is in the same namespace as HTTPRoute
2020
matches:
2121
- path:
2222
type: PathPrefix

conformance/tests/inferencepool_httproute_port_validation.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ apiVersion: gateway.networking.k8s.io/v1
44
kind: HTTPRoute
55
metadata:
66
name: httproute-pool-port-unspecified
7-
namespace: gateway-conformance-app-backend
7+
namespace: inference-conformance-app-backend
88
spec:
99
parentRefs:
1010
- group: gateway.networking.k8s.io
1111
kind: Gateway
1212
name: conformance-primary
13-
namespace: gateway-conformance-infra
13+
namespace: inference-conformance-infra
1414
sectionName: http
1515
hostnames:
1616
- "port-unspecified.example.com"
@@ -30,13 +30,13 @@ apiVersion: gateway.networking.k8s.io/v1
3030
kind: HTTPRoute
3131
metadata:
3232
name: httproute-pool-port-matching
33-
namespace: gateway-conformance-app-backend
33+
namespace: inference-conformance-app-backend
3434
spec:
3535
parentRefs:
3636
- group: gateway.networking.k8s.io
3737
kind: Gateway
3838
name: conformance-primary
39-
namespace: gateway-conformance-infra
39+
namespace: inference-conformance-infra
4040
sectionName: http
4141
hostnames:
4242
- "port-matching.example.com"
@@ -56,13 +56,13 @@ apiVersion: gateway.networking.k8s.io/v1
5656
kind: HTTPRoute
5757
metadata:
5858
name: httproute-pool-port-non-matching
59-
namespace: gateway-conformance-app-backend
59+
namespace: inference-conformance-app-backend
6060
spec:
6161
parentRefs:
6262
- group: gateway.networking.k8s.io
6363
kind: Gateway
6464
name: conformance-primary
65-
namespace: gateway-conformance-infra
65+
namespace: inference-conformance-infra
6666
sectionName: http
6767
hostnames:
6868
- "port-non-matching.example.com"

0 commit comments

Comments
 (0)