From b3ca30586ad546ee05218561841aca7e263bafd6 Mon Sep 17 00:00:00 2001 From: David Jumani Date: Tue, 30 Sep 2025 10:13:04 -0400 Subject: [PATCH] rename conformance infra namespace --- conformance/resources/base.yaml | 42 +++++++++---------- conformance/resources/resourcename.go | 4 +- conformance/scripts/istio/Makefile | 10 ++--- .../tests/epp_unavailable_fail_open.yaml | 4 +- .../tests/gateway_following_epp_routing.yaml | 5 +-- .../httproute_invalid_inferencepool_ref.yaml | 4 +- ...ute_multiple_gateways_different_pools.yaml | 8 ++-- conformance/tests/inferencepool_accepted.yaml | 6 +-- ...ferencepool_httproute_port_validation.yaml | 12 +++--- .../inferencepool_invalid_epp_service.yaml | 6 +-- ...cepool_multiple_rules_different_pools.yaml | 4 +- .../inferencepool_resolvedrefs_condition.yaml | 8 ++-- 12 files changed, 56 insertions(+), 57 deletions(-) diff --git a/conformance/resources/base.yaml b/conformance/resources/base.yaml index a421f5006..2e1b378c3 100644 --- a/conformance/resources/base.yaml +++ b/conformance/resources/base.yaml @@ -7,16 +7,16 @@ 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. @@ -24,7 +24,7 @@ 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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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 @@ -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: @@ -206,7 +206,7 @@ spec: - --pool-name - "primary-inference-pool" - --pool-namespace - - "gateway-conformance-app-backend" + - "inference-conformance-app-backend" - --v - "4" - --zap-encoder @@ -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: @@ -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 @@ -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: @@ -304,7 +304,7 @@ spec: - --pool-name - "secondary-inference-pool" - --pool-namespace - - "gateway-conformance-app-backend" + - "inference-conformance-app-backend" - --v - "4" - --zap-encoder @@ -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 @@ -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"] @@ -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 diff --git a/conformance/resources/resourcename.go b/conformance/resources/resourcename.go index 4c0c7b4c2..4ac6437fe 100644 --- a/conformance/resources/resourcename.go +++ b/conformance/resources/resourcename.go @@ -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" diff --git a/conformance/scripts/istio/Makefile b/conformance/scripts/istio/Makefile index 309d8c459..cfce3cc9c 100644 --- a/conformance/scripts/istio/Makefile +++ b/conformance/scripts/istio/Makefile @@ -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 @@ -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: @@ -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: @@ -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 @@ -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" diff --git a/conformance/tests/epp_unavailable_fail_open.yaml b/conformance/tests/epp_unavailable_fail_open.yaml index 9388a017d..df3a6f0f5 100644 --- a/conformance/tests/epp_unavailable_fail_open.yaml +++ b/conformance/tests/epp_unavailable_fail_open.yaml @@ -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" diff --git a/conformance/tests/gateway_following_epp_routing.yaml b/conformance/tests/gateway_following_epp_routing.yaml index c4db6386e..d0f441af7 100644 --- a/conformance/tests/gateway_following_epp_routing.yaml +++ b/conformance/tests/gateway_following_epp_routing.yaml @@ -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" @@ -21,4 +21,3 @@ spec: - path: type: PathPrefix value: /primary-gateway-test - \ No newline at end of file diff --git a/conformance/tests/httproute_invalid_inferencepool_ref.yaml b/conformance/tests/httproute_invalid_inferencepool_ref.yaml index 15e7ad597..a0954cd4a 100644 --- a/conformance/tests/httproute_invalid_inferencepool_ref.yaml +++ b/conformance/tests/httproute_invalid_inferencepool_ref.yaml @@ -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: diff --git a/conformance/tests/httproute_multiple_gateways_different_pools.yaml b/conformance/tests/httproute_multiple_gateways_different_pools.yaml index caded16d8..17bf494f8 100644 --- a/conformance/tests/httproute_multiple_gateways_different_pools.yaml +++ b/conformance/tests/httproute_multiple_gateways_different_pools.yaml @@ -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: @@ -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: diff --git a/conformance/tests/inferencepool_accepted.yaml b/conformance/tests/inferencepool_accepted.yaml index 59710bae4..b155ae2c9 100644 --- a/conformance/tests/inferencepool_accepted.yaml +++ b/conformance/tests/inferencepool_accepted.yaml @@ -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 diff --git a/conformance/tests/inferencepool_httproute_port_validation.yaml b/conformance/tests/inferencepool_httproute_port_validation.yaml index 9c78117d9..53d8455c3 100644 --- a/conformance/tests/inferencepool_httproute_port_validation.yaml +++ b/conformance/tests/inferencepool_httproute_port_validation.yaml @@ -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" @@ -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" @@ -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" diff --git a/conformance/tests/inferencepool_invalid_epp_service.yaml b/conformance/tests/inferencepool_invalid_epp_service.yaml index b3dc70e19..3f3b8c49e 100644 --- a/conformance/tests/inferencepool_invalid_epp_service.yaml +++ b/conformance/tests/inferencepool_invalid_epp_service.yaml @@ -2,7 +2,7 @@ apiVersion: inference.networking.k8s.io/v1 kind: InferencePool metadata: name: pool-with-invalid-epp - namespace: gateway-conformance-app-backend + namespace: inference-conformance-app-backend spec: selector: matchLabels: @@ -19,11 +19,11 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: httproute-for-invalid-epp-pool - namespace: gateway-conformance-app-backend + namespace: inference-conformance-app-backend spec: parentRefs: - name: conformance-primary - namespace: gateway-conformance-infra + namespace: inference-conformance-infra rules: - backendRefs: - name: pool-with-invalid-epp diff --git a/conformance/tests/inferencepool_multiple_rules_different_pools.yaml b/conformance/tests/inferencepool_multiple_rules_different_pools.yaml index 2dd8f4a6e..0539a112e 100644 --- a/conformance/tests/inferencepool_multiple_rules_different_pools.yaml +++ b/conformance/tests/inferencepool_multiple_rules_different_pools.yaml @@ -3,11 +3,11 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: httproute-multiple-rules-different-pools - namespace: gateway-conformance-app-backend + namespace: inference-conformance-app-backend spec: parentRefs: - name: conformance-primary - namespace: gateway-conformance-infra + namespace: inference-conformance-infra rules: - matches: - path: diff --git a/conformance/tests/inferencepool_resolvedrefs_condition.yaml b/conformance/tests/inferencepool_resolvedrefs_condition.yaml index 8947168a8..05a2318e9 100644 --- a/conformance/tests/inferencepool_resolvedrefs_condition.yaml +++ b/conformance/tests/inferencepool_resolvedrefs_condition.yaml @@ -8,13 +8,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" @@ -33,13 +33,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: httproute-for-secondary-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"