Skip to content
Open
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
42 changes: 21 additions & 21 deletions conformance/resources/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
apiVersion: v1
kind: Namespace
metadata:
name: gateway-conformance-infra
name: inference-conformance-infra
labels:
gateway-conformance: infra
inference-conformance: infra
---
apiVersion: v1
kind: Namespace
metadata:
name: gateway-conformance-app-backend
name: inference-conformance-app-backend
labels:
gateway-conformance: backend
inference-conformance: backend
---
# A basic Gateway resource that allows HTTPRoutes from the same namespace.
# Tests can use this as a parent reference for routes that target InferencePools.
apiVersion: gateway.networking.k8s.io/v1
kind: Gateway
metadata:
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
spec:
gatewayClassName: "{GATEWAY_CLASS_NAME}"
listeners:
Expand All @@ -42,7 +42,7 @@ apiVersion: gateway.networking.k8s.io/v1
kind: Gateway
metadata:
name: conformance-secondary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
spec:
gatewayClassName: "{GATEWAY_CLASS_NAME}"
listeners:
Expand All @@ -55,14 +55,14 @@ spec:
from: All

### The following defines the essential resources for the gateway conformance test.
### All resources are created in the 'gateway-conformance-app-backend' namespace.
### All resources are created in the 'inference-conformance-app-backend' namespace.
---
# Deploys a mock backend service to act as a model server.
apiVersion: apps/v1
kind: Deployment
metadata:
name: primary-inference-model-server-deployment
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
labels:
app: primary-inference-model-server
spec:
Expand Down Expand Up @@ -106,7 +106,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: secondary-inference-model-server-deployment
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
labels:
app: secondary-inference-model-server
spec:
Expand Down Expand Up @@ -150,7 +150,7 @@ apiVersion: inference.networking.k8s.io/v1
kind: InferencePool
metadata:
name: primary-inference-pool
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
selector:
matchLabels:
Expand All @@ -167,7 +167,7 @@ apiVersion: v1
kind: Service
metadata:
name: primary-endpoint-picker-svc
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
selector:
app: primary-app-backend-epp
Expand All @@ -183,7 +183,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: primary-app-endpoint-picker
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
labels:
app: primary-app-backend-epp
spec:
Expand All @@ -206,7 +206,7 @@ spec:
- --pool-name
- "primary-inference-pool"
- --pool-namespace
- "gateway-conformance-app-backend"
- "inference-conformance-app-backend"
- --v
- "4"
- --zap-encoder
Expand Down Expand Up @@ -247,7 +247,7 @@ apiVersion: inference.networking.k8s.io/v1
kind: InferencePool
metadata:
name: secondary-inference-pool
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
selector:
matchLabels:
Expand All @@ -265,7 +265,7 @@ apiVersion: v1
kind: Service
metadata:
name: secondary-endpoint-picker-svc
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
selector:
app: secondary-app-backend-epp
Expand All @@ -281,7 +281,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: secondary-app-endpoint-picker
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
labels:
app: secondary-app-backend-epp
spec:
Expand All @@ -304,7 +304,7 @@ spec:
- --pool-name
- "secondary-inference-pool"
- --pool-namespace
- "gateway-conformance-app-backend"
- "inference-conformance-app-backend"
- --v
- "4"
- --zap-encoder
Expand Down Expand Up @@ -344,7 +344,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: plugins-config
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
data:
conformance-plugins.yaml: |
apiVersion: inference.networking.x-k8s.io/v1alpha1
Expand All @@ -361,7 +361,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: inference-model-reader
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
rules:
- apiGroups: ["inference.networking.x-k8s.io"]
resources: ["inferenceobjectives", "inferencepools"]
Expand All @@ -377,11 +377,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: epp-to-inference-model-reader
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
subjects:
- kind: ServiceAccount
name: default
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
roleRef:
kind: Role
name: inference-model-reader
Expand Down
4 changes: 2 additions & 2 deletions conformance/resources/resourcename.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package resources
import "k8s.io/apimachinery/pkg/types"

const (
AppBackendNamespace = "gateway-conformance-app-backend"
InfraNamespace = "gateway-conformance-infra"
AppBackendNamespace = "inference-conformance-app-backend"
InfraNamespace = "inference-conformance-infra"
PrimaryGatewayName = "conformance-primary"
SecondaryGatewayName = "conformance-secondary"

Expand Down
10 changes: 5 additions & 5 deletions conformance/scripts/istio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
GATEWAY_API_VERSION ?= v1.3.0
INFERENCE_EXTENSION_VERSION ?= v0.4.0
ISTIO_VERSION ?= 1.27-alpha.0551127f00634403cddd4634567e65a8ecc499a7
ISTIO_HUB ?=
ISTIO_HUB ?=
ISTIO_PROFILE ?= minimal

# Conformance test variables
Expand Down Expand Up @@ -72,7 +72,7 @@ apiVersion: networking.istio.io/v1
kind: DestinationRule
metadata:
name: primary-endpoint-picker-tls
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
host: primary-endpoint-picker-svc
trafficPolicy:
Expand All @@ -84,7 +84,7 @@ apiVersion: networking.istio.io/v1
kind: DestinationRule
metadata:
name: secondary-endpoint-picker-tls
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
host: secondary-endpoint-picker-svc
trafficPolicy:
Expand Down Expand Up @@ -432,7 +432,7 @@ setup-crds: setup-gateway-api-crds setup-inference-extension-crds
# Setup TLS for EPP
setup-tls:
@echo "Setting up TLS for EPP..."
-kubectl create namespace gateway-conformance-app-backend || true
-kubectl create namespace inference-conformance-app-backend || true
$(file >/tmp/tls-destination-rules.yaml,$(TLS_DESTINATION_RULES))
kubectl apply -f /tmp/tls-destination-rules.yaml
@rm -f /tmp/tls-destination-rules.yaml
Expand Down Expand Up @@ -518,7 +518,7 @@ readme-update: $(REPORT_BASE_DIR)/README.md
# Clean up resources
clean:
@echo "Cleaning up..."
kubectl delete namespace gateway-conformance-app-backend --ignore-not-found=true
kubectl delete namespace inference-conformance-app-backend --ignore-not-found=true
@echo "Cleaning up downloaded istioctl binaries..."
@rm -f $(ISTIOCTL_DIR)/istioctl-*
@echo "Note: If using minikube, run 'minikube delete' to completely clean up"
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/epp_unavailable_fail_open.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-for-failopen-pool-gw
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-secondary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
hostnames:
- "secondary.example.com"
Expand Down
5 changes: 2 additions & 3 deletions conformance/tests/gateway_following_epp_routing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-for-primary-gw
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
hostnames:
- "primary.example.com"
Expand All @@ -21,4 +21,3 @@ spec:
- path:
type: PathPrefix
value: /primary-gateway-test

4 changes: 2 additions & 2 deletions conformance/tests/httproute_invalid_inferencepool_ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-to-non-existent-pool
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
rules:
- backendRefs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: route-for-primary-gateway
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
hostnames:
- "primary.example.com"
rules:
Expand All @@ -25,12 +25,12 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: route-for-secondary-gateway
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- kind: Gateway
name: conformance-secondary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
hostnames:
- "secondary.example.com"
rules:
Expand Down
6 changes: 3 additions & 3 deletions conformance/tests/inferencepool_accepted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-for-inferencepool-accepted
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
rules:
- backendRefs:
- group: inference.networking.k8s.io
kind: InferencePool
name: primary-inference-pool
# namespace: gateway-conformance-app-backend - is omitted since it is in the same namespace as HTTPRoute
# namespace: inference-conformance-app-backend - is omitted since it is in the same namespace as HTTPRoute
matches:
- path:
type: PathPrefix
Expand Down
12 changes: 6 additions & 6 deletions conformance/tests/inferencepool_httproute_port_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-pool-port-unspecified
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
hostnames:
- "port-unspecified.example.com"
Expand All @@ -30,13 +30,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-pool-port-matching
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
hostnames:
- "port-matching.example.com"
Expand All @@ -56,13 +56,13 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-pool-port-non-matching
namespace: gateway-conformance-app-backend
namespace: inference-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-primary
namespace: gateway-conformance-infra
namespace: inference-conformance-infra
sectionName: http
hostnames:
- "port-non-matching.example.com"
Expand Down
Loading