diff --git a/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml b/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml index 006b54d7e5..cc7e821d3d 100644 --- a/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml +++ b/internal/gatewayapi/testdata/accesslog-als-backend.out.yaml @@ -196,6 +196,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -207,6 +208,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml b/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml index 68a9888b4d..62915fb712 100644 --- a/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml +++ b/internal/gatewayapi/testdata/accesslog-als-grpc.out.yaml @@ -105,6 +105,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -116,6 +117,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/accesslog.out.yaml b/internal/gatewayapi/testdata/accesslog.out.yaml index 54f7f72146..db60851eb7 100644 --- a/internal/gatewayapi/testdata/accesslog.out.yaml +++ b/internal/gatewayapi/testdata/accesslog.out.yaml @@ -125,6 +125,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -136,6 +137,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml index 3b2a27186a..112e20cee9 100644 --- a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml @@ -155,6 +155,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -166,6 +167,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-tls-settings-invalid.out.yaml b/internal/gatewayapi/testdata/backend-tls-settings-invalid.out.yaml index d4fd15c115..834b25180a 100644 --- a/internal/gatewayapi/testdata/backend-tls-settings-invalid.out.yaml +++ b/internal/gatewayapi/testdata/backend-tls-settings-invalid.out.yaml @@ -245,6 +245,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -256,6 +257,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-tls-settings.out.yaml b/internal/gatewayapi/testdata/backend-tls-settings.out.yaml index 12e91199b7..d1bed1ab78 100644 --- a/internal/gatewayapi/testdata/backend-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/backend-tls-settings.out.yaml @@ -601,6 +601,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -612,6 +613,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-with-auto-san-sni.out.yaml b/internal/gatewayapi/testdata/backend-with-auto-san-sni.out.yaml index 497dc002b1..47684c8631 100644 --- a/internal/gatewayapi/testdata/backend-with-auto-san-sni.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-auto-san-sni.out.yaml @@ -365,6 +365,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -376,6 +377,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml b/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml index 9585428f0e..f312411e88 100644 --- a/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-endpoint-zones.out.yaml @@ -141,6 +141,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -152,6 +153,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml index cc8906c395..361702581d 100644 --- a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml @@ -140,6 +140,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +152,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-with-hostname.out.yaml b/internal/gatewayapi/testdata/backend-with-hostname.out.yaml index 6b3229a63a..7238ff57c0 100644 --- a/internal/gatewayapi/testdata/backend-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-hostname.out.yaml @@ -142,6 +142,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -153,6 +154,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml b/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml index 6de04e535a..ec006f2d9a 100644 --- a/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-skip-tls-verify.out.yaml @@ -161,6 +161,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -172,6 +173,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml index f9c27e3c0f..9eda29aa7e 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml @@ -125,6 +125,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -136,6 +137,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml index 97f2675e33..c9dd797575 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-clustertrustbundle.out.yaml @@ -140,6 +140,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +152,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml index a6b5e4d8c8..504d8868a2 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml @@ -140,6 +140,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +152,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml index 3fd05f7df2..ae3496ecd1 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -140,6 +140,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +152,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-conflict.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-conflict.out.yaml index 04516bba48..27faac89d3 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-conflict.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-conflict.out.yaml @@ -215,6 +215,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -226,6 +227,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml index 3310c68bab..2d3b699ba0 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml @@ -280,6 +280,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -291,6 +292,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -378,6 +380,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls2-41698b8b namespace: envoy-gateway-system sectionName: "8080" @@ -389,6 +392,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls2-41698b8b namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml index e8bfb01faa..be3a79eeca 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -236,6 +236,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +248,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml index e932a38ce0..dc4ce78807 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -180,6 +180,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -191,6 +192,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml index 999f5698cd..ee8286bb5a 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml @@ -181,6 +181,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -192,6 +193,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-not-conflict-service.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-not-conflict-service.out.yaml index 8741319c8a..974c3d0929 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-not-conflict-service.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-not-conflict-service.out.yaml @@ -211,6 +211,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -222,6 +223,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-not-conflict.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-not-conflict.out.yaml index a8ae0aebf0..6d68c6a395 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-not-conflict.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-not-conflict.out.yaml @@ -212,6 +212,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -223,6 +224,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml index d8f516d339..de5090020c 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-serviceimport-target.out.yaml @@ -148,6 +148,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -159,6 +160,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml index 7a090f870b..a34a1149df 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-status-conditions-truncated.out.yaml @@ -2246,6 +2246,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2257,6 +2258,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2340,6 +2342,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2351,6 +2354,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2434,6 +2438,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2445,6 +2450,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2528,6 +2534,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2539,6 +2546,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2622,6 +2630,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2633,6 +2642,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2716,6 +2726,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2727,6 +2738,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2810,6 +2822,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2821,6 +2834,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2904,6 +2918,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2915,6 +2930,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2998,6 +3014,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -3009,6 +3026,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -3092,6 +3110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3103,6 +3122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3186,6 +3206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3197,6 +3218,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3280,6 +3302,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3291,6 +3314,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3374,6 +3398,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3385,6 +3410,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3468,6 +3494,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3479,6 +3506,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3562,6 +3590,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3573,6 +3602,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3656,6 +3686,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3667,6 +3698,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3750,6 +3782,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3761,6 +3794,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3844,6 +3878,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" @@ -3855,6 +3890,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml index 4f630fc081..d2fc525b3a 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-subjectaltnames.out.yaml @@ -145,6 +145,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +157,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml index 4b03c994ac..14589ad259 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -137,6 +137,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" @@ -148,6 +149,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-btls-a945b5bb namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml index 469935924e..151aa8c2f3 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml @@ -253,6 +253,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -264,6 +265,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +300,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -330,6 +333,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +345,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -375,6 +380,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml index ebbc35eff6..57a178a264 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml @@ -253,6 +253,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -264,6 +265,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +300,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -330,6 +333,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +345,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -375,6 +380,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml index 2c625a7d6b..f3e2068ac7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml @@ -257,6 +257,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -268,6 +269,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -302,6 +304,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -334,6 +337,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -345,6 +349,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -379,6 +384,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compression-json-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compression-json-merge.out.yaml index dc31230815..88796158e6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compression-json-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compression-json-merge.out.yaml @@ -171,6 +171,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -182,6 +183,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -216,6 +218,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compression-strategic-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compression-strategic-merge.out.yaml index 3497cc5b6f..3ca24987ce 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compression-strategic-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compression-strategic-merge.out.yaml @@ -310,6 +310,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -321,6 +322,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -355,6 +357,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -387,6 +390,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -420,6 +424,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml index 2c6a9a9460..f924b1e357 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compression.out.yaml @@ -134,6 +134,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -145,6 +146,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -179,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.disable.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.disable.out.yaml index 36cdb7685b..8750084ada 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.disable.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.disable.out.yaml @@ -134,6 +134,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -145,6 +146,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -179,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.enable.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.enable.out.yaml index 3643a42363..0c8c5f814f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.enable.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-basic.enable.out.yaml @@ -137,6 +137,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -148,6 +149,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -182,6 +184,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-disable-all.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-disable-all.out.yaml index 1147dd34f7..2e1245e2d7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-disable-all.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-disable-all.out.yaml @@ -177,6 +177,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -188,6 +189,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -222,6 +224,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-gzip.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-gzip.out.yaml index b18c321f71..d6b96c10b8 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-gzip.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-gzip.out.yaml @@ -169,6 +169,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +181,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -214,6 +216,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-zstd.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-zstd.out.yaml index fee028e6fb..d2a83d31a1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-zstd.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-enable-only-zstd.out.yaml @@ -169,6 +169,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +181,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -214,6 +216,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-switch-compression.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-switch-compression.out.yaml index 11b48a20da..1a22408a89 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-switch-compression.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge-switch-compression.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -220,6 +222,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge.out.yaml index da6899dd94..630c48ce93 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-json-merge.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -220,6 +222,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-strategic-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-strategic-merge.out.yaml index af59cfae32..c6634b6826 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-strategic-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-compressor-strategic-merge.out.yaml @@ -311,6 +311,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -322,6 +323,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -356,6 +358,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -388,6 +391,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -420,6 +424,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml index a23644df7f..a65ed5e27d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-proxy.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +179,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml index ded7e97bae..c8f0b3a43e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-connect-terminate.out.yaml @@ -134,6 +134,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -145,6 +146,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -179,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml index e543d2d161..b019fa1930 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-dns-lookup-family.out.yaml @@ -374,6 +374,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -385,6 +386,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml index c7b852db37..4ba2bfd789 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-spdy.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +179,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml index 082be0f036..055cdcc444 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-http-upgrade-websocket.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-invalid-no-section.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-invalid-no-section.out.yaml index 77420bc3c2..fc2cac82be 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-invalid-no-section.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-invalid-no-section.out.yaml @@ -164,6 +164,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +176,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -209,6 +211,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.in.yaml index 9ce7c95d67..cd46112723 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.in.yaml @@ -71,16 +71,6 @@ backendTrafficPolicies: app: web-service useClientProtocol: true services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - ports: - - port: 8080 - name: http - protocol: TCP - apiVersion: v1 kind: Service metadata: @@ -92,23 +82,6 @@ services: name: http protocol: TCP endpointSlices: -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-1 - namespace: default - labels: - kubernetes.io/service-name: service-1 - addressType: IPv4 - ports: - - name: http - protocol: TCP - port: 8080 - endpoints: - - addresses: - - 8.8.8.8 - conditions: - ready: true - apiVersion: discovery.k8s.io/v1 kind: EndpointSlice metadata: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.out.yaml index dfec216ac0..af9cd2e9f5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-multiple-targets-targetselector.out.yaml @@ -174,6 +174,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -185,6 +186,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -216,8 +218,6 @@ xdsIR: settings: - addressType: IP endpoints: - - host: 8.8.8.8 - port: 8080 - host: 7.7.7.7 port: 8080 metadata: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml index f40011dcea..d7bdc53071 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -271,6 +271,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -282,6 +283,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -316,6 +318,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -349,6 +352,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -387,6 +391,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml index 9e2dad3aa1..b398424dc4 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-request-buffer.out.yaml @@ -253,6 +253,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -264,6 +265,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +300,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -330,6 +333,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +345,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -375,6 +380,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-section-name-override.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-section-name-override.out.yaml index b65a3299d0..224d14397b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-section-name-override.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-section-name-override.out.yaml @@ -312,6 +312,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -323,6 +324,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -358,6 +360,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -395,6 +398,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -448,6 +452,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml index 8b36072cad..003e0f0124 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions-truncated.out.yaml @@ -2389,6 +2389,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2400,6 +2401,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2462,6 +2464,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2473,6 +2476,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2535,6 +2539,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2546,6 +2551,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2608,6 +2614,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2619,6 +2626,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2681,6 +2689,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2692,6 +2701,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2754,6 +2764,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2765,6 +2776,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2827,6 +2839,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2838,6 +2851,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2900,6 +2914,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2911,6 +2926,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2973,6 +2989,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -2984,6 +3001,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -3046,6 +3064,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3057,6 +3076,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3119,6 +3139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3130,6 +3151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3192,6 +3214,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3203,6 +3226,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3265,6 +3289,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3276,6 +3301,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3338,6 +3364,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3349,6 +3376,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3411,6 +3439,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3422,6 +3451,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3484,6 +3514,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3495,6 +3526,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3557,6 +3589,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3568,6 +3601,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3630,6 +3664,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" @@ -3641,6 +3676,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml index abedb8d044..ab1cc4b3fa 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -520,6 +520,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-another-namespace-not-same-namespace-gateway-8778384d namespace: envoy-gateway-system sectionName: "8080" @@ -531,6 +532,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-another-namespace-not-same-namespace-gateway-8778384d namespace: envoy-gateway-system sectionName: "8080" @@ -564,6 +566,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -575,6 +578,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -640,6 +644,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -651,6 +656,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml index 428d2dd7e0..547d9355db 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml @@ -331,6 +331,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -342,6 +343,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -376,6 +378,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -409,6 +412,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -420,6 +424,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -454,6 +459,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -488,6 +494,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml index d988002290..9d1d237e65 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-global-ratelimit.out.yaml @@ -301,6 +301,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -312,6 +313,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -346,6 +348,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -412,6 +415,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -423,6 +427,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -457,6 +462,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml index 9b7e433f60..f2ac0b3f9e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-local-ratelimit.out.yaml @@ -295,6 +295,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -306,6 +307,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -340,6 +342,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -403,6 +406,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -414,6 +418,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -448,6 +453,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml index 96d560de0b..1f7ed7302b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-gw-rl.out.yaml @@ -296,6 +296,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -307,6 +308,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +343,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -406,6 +409,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -417,6 +421,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -451,6 +456,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml index e2bbd4167b..980dccad6a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-only-httproute-rl.out.yaml @@ -296,6 +296,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -307,6 +308,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +343,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -410,6 +413,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -421,6 +425,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -455,6 +460,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-section.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-section.out.yaml index 27530646c2..5b83ecfd86 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-section.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-section.out.yaml @@ -451,6 +451,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -462,6 +463,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -497,6 +499,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -539,6 +542,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -572,6 +576,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -626,6 +631,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -664,6 +670,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml index a68073a3e3..b053ed3c91 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge-with-multi-parents.out.yaml @@ -271,6 +271,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -282,6 +283,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -316,6 +318,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -357,6 +360,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -368,6 +372,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -402,6 +407,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml index 3e4e8ada5d..1ed6823b5d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml @@ -247,6 +247,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -258,6 +259,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -292,6 +294,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -333,6 +336,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml index 555ddcde19..59a10b9f51 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-tracing.out.yaml @@ -150,6 +150,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -161,6 +162,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -195,6 +197,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml index 90a5865aad..7c566376f2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +177,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml index f468467085..3a6ac2acbd 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml @@ -313,6 +313,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -324,6 +325,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -358,6 +360,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -385,6 +388,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -396,6 +400,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -430,6 +435,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -461,6 +467,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml index 9dbc222ebe..7e3c24c41f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml @@ -257,6 +257,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -268,6 +269,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -302,6 +304,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -334,6 +337,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -345,6 +349,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -379,6 +384,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml index c2347f807e..3e7cd641ac 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml @@ -320,6 +320,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -331,6 +332,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -365,6 +367,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -398,6 +401,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -409,6 +413,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -443,6 +448,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -476,6 +482,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.in.yaml index c5c7d54a68..222b019919 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.in.yaml @@ -50,64 +50,3 @@ backendTrafficPolicies: endpointOverride: extractFrom: - header: "x-fallback-host" - -services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 1.2.3.4 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 8080 -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-2 - spec: - clusterIP: 5.6.7.8 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 8080 -endpointSlices: -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-1 - namespace: default - labels: - kubernetes.io/service-name: service-1 - addressType: IPv4 - ports: - - name: http - protocol: TCP - port: 8080 - endpoints: - - addresses: - - "1.2.3.4" - conditions: - ready: true -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-2 - namespace: default - labels: - kubernetes.io/service-name: service-2 - addressType: IPv4 - ports: - - name: http - protocol: TCP - port: 8080 - endpoints: - - addresses: - - "5.6.7.8" - conditions: - ready: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.out.yaml index 8390fde9d5..915c4ccaef 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-multiple-mixed.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,8 +179,6 @@ xdsIR: settings: - addressType: IP endpoints: - - host: 1.2.3.4 - port: 8080 - host: 7.7.7.7 port: 8080 metadata: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.in.yaml index d468cafeab..731930b9b4 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.in.yaml @@ -49,34 +49,3 @@ backendTrafficPolicies: endpointOverride: extractFrom: - header: "x-fallback-host" -services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 1.2.3.4 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 8080 -endpointSlices: -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-1 - namespace: default - labels: - kubernetes.io/service-name: service-1 - addressType: IPv4 - ports: - - name: http - protocol: TCP - port: 8080 - endpoints: - - addresses: - - "1.2.3.4" - conditions: - ready: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.out.yaml index d4bd22fa00..8891514055 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer-single-header.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,8 +179,6 @@ xdsIR: settings: - addressType: IP endpoints: - - host: 1.2.3.4 - port: 8080 - host: 7.7.7.7 port: 8080 metadata: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.in.yaml index ddca95774d..de6016822e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.in.yaml @@ -68,59 +68,3 @@ backendTrafficPolicies: endpointOverride: extractFrom: - header: "x-custom-host" -services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 1.2.3.4 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 8080 -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-2 - spec: - clusterIP: 5.6.7.8 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 8080 -endpointSlices: -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-1 - namespace: default - labels: - kubernetes.io/service-name: service-1 - addressType: IPv4 - endpoints: - - addresses: - - "10.0.0.1" - ports: - - name: http - port: 8080 - protocol: TCP -- apiVersion: discovery.k8s.io/v1 - kind: EndpointSlice - metadata: - name: endpointslice-service-2 - namespace: default - labels: - kubernetes.io/service-name: service-2 - addressType: IPv4 - endpoints: - - addresses: - - "10.0.0.2" - ports: - - name: http - port: 8080 - protocol: TCP diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.out.yaml index 97bd97f6ec..4d9df9ad6a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-endpointoverride-loadbalancer.out.yaml @@ -172,6 +172,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -183,6 +184,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -214,8 +216,6 @@ xdsIR: settings: - addressType: IP endpoints: - - host: 10.0.0.2 - port: 8080 - host: 7.7.7.7 port: 8080 metadata: @@ -246,8 +246,6 @@ xdsIR: settings: - addressType: IP endpoints: - - host: 10.0.0.1 - port: 8080 - host: 7.7.7.7 port: 8080 metadata: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml index 719bd0a04f..591894d74b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml @@ -744,6 +744,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -755,6 +756,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -789,6 +791,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -838,6 +841,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -872,6 +876,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -905,6 +910,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -916,6 +922,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -950,6 +957,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -999,6 +1007,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -1048,6 +1057,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -1092,6 +1102,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-4 namespace: default sectionName: "8080" @@ -1130,6 +1141,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml index 8dff33058f..3c86eb74b9 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml @@ -255,6 +255,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -266,6 +267,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -300,6 +302,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -331,6 +334,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -342,6 +346,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -376,6 +381,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml index 71f946ec16..5136eada28 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml @@ -209,6 +209,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -220,6 +221,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -254,6 +256,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -286,6 +289,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml index 40d72c5a15..180faf14fa 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml @@ -202,6 +202,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +214,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +249,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -278,6 +281,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index 11e5a05271..d0268979bb 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -495,6 +495,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -506,6 +507,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -540,6 +542,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -568,6 +571,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -579,6 +583,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -613,6 +618,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -647,6 +653,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -681,6 +688,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -715,6 +723,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml index 38a46ec586..3c59595339 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml @@ -153,6 +153,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -164,6 +165,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -198,6 +200,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml index ee2143ef27..a56194c326 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-distinct-match-type.out.yaml @@ -153,6 +153,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -164,6 +165,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -198,6 +200,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml index 02cfba5cc7..fead3ffd2f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml @@ -157,6 +157,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -168,6 +169,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -202,6 +204,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml index bd270649d1..e5d2dda64d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml @@ -160,6 +160,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -171,6 +172,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -205,6 +207,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml index ab6422e5c8..401ce84cee 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -156,6 +156,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -167,6 +168,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -201,6 +203,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml index 6bc5f44f9f..633969fc9e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-panic-threshold.out.yaml @@ -317,6 +317,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -328,6 +329,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -362,6 +364,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -394,6 +397,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -405,6 +409,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -439,6 +444,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -471,6 +477,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-preconnect.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-preconnect.out.yaml index 955e7bccc3..e5d721dc51 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-preconnect.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-preconnect.out.yaml @@ -253,6 +253,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -264,6 +265,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +300,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -328,6 +331,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -339,6 +343,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -373,6 +378,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml index 73f36d6528..28d6611215 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml @@ -249,6 +249,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -260,6 +261,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -294,6 +296,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -322,6 +325,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -333,6 +337,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -367,6 +372,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-both-type.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-both-type.out.yaml index 27d7f6f7cd..b50caeb955 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-both-type.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-both-type.out.yaml @@ -150,6 +150,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -161,6 +162,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -195,6 +197,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml index 67c2ef8482..073be0c9dc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml @@ -138,6 +138,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +150,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml index 9975ad7432..3578032790 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -184,6 +186,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index b261a0dfd9..f6da13e9a7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -420,6 +420,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -431,6 +432,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -465,6 +467,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -516,6 +519,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -527,6 +531,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -561,6 +566,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -617,6 +623,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -628,6 +635,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -662,6 +670,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml index e0e4345fc2..ecf43c7822 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml @@ -298,6 +298,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -309,6 +310,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -343,6 +345,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -370,6 +373,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -381,6 +385,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -415,6 +420,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml index 7de0e69d38..23ec0eca59 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml @@ -448,6 +448,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -459,6 +460,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -493,6 +495,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -548,6 +551,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -559,6 +563,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -593,6 +598,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -643,6 +649,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -682,6 +689,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml index efd8c5a5e9..1acab603b0 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml @@ -404,6 +404,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -415,6 +416,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -449,6 +451,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -485,6 +488,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -496,6 +500,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -530,6 +535,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -561,6 +567,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -592,6 +599,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml index f47e0ac414..4f1eb55805 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -171,6 +171,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -182,6 +183,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -216,6 +218,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -250,6 +253,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml index 786349e3d2..c12975cc43 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-shared-ratelimit.out.yaml @@ -286,6 +286,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -297,6 +298,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -331,6 +333,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -379,6 +382,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -390,6 +394,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -424,6 +429,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-stats.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-stats.out.yaml index 3c6d55786f..c648ce6a7a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-stats.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-stats.out.yaml @@ -317,6 +317,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -328,6 +329,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -362,6 +364,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -392,6 +395,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -422,6 +426,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -433,6 +438,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -467,6 +473,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml index 8f52dd299b..89c98bc993 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml @@ -235,6 +235,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-tcp-gateway-1ec60381 namespace: envoy-gateway-system sectionName: "8080" @@ -246,6 +247,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-tcp-gateway-1ec60381 namespace: envoy-gateway-system sectionName: "8080" @@ -285,6 +287,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -357,6 +360,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml index 55a421e4b9..9c98383285 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml @@ -307,6 +307,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-tcp-gateway-1ec60381 namespace: envoy-gateway-system sectionName: "8080" @@ -318,6 +319,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-tcp-gateway-1ec60381 namespace: envoy-gateway-system sectionName: "8080" @@ -357,6 +359,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -429,6 +432,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml index 08f460adb5..fa8dd36a3f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml @@ -253,6 +253,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -264,6 +265,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +300,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -328,6 +331,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -339,6 +343,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -373,6 +378,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml index 2469b30f88..cce565a00c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +177,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml index 3be78c79e2..bc14724509 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml @@ -242,6 +242,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -253,6 +254,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -320,6 +322,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -331,6 +334,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml index 18b124139f..fdc8d3bebc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml @@ -263,6 +263,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -274,6 +275,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -308,6 +310,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -342,6 +345,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -353,6 +357,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -387,6 +392,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml index 9f5696b82e..b8dfebb784 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml @@ -162,6 +162,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -173,6 +174,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml index e2c4aeceab..c072f5a608 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml @@ -163,6 +163,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -174,6 +175,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml index 6e9c3f43f2..443ed9a8f5 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml @@ -167,6 +167,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +179,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml index 1591792b7e..c01999b9ef 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml @@ -264,6 +264,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -275,6 +276,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml index b413c2e691..909e1415a6 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml @@ -164,6 +164,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +176,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml index f2563dc84c..9e21d71f59 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml @@ -202,6 +202,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +214,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-max-accept-per-socket-event.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-max-accept-per-socket-event.out.yaml index d122701b30..416a675777 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-max-accept-per-socket-event.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-max-accept-per-socket-event.out.yaml @@ -226,6 +226,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -237,6 +238,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml index 1a58c909c1..5aefbbd7b1 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml @@ -188,6 +188,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -199,6 +200,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -238,6 +240,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -319,6 +322,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml index d46377c170..17432fca4d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml @@ -147,6 +147,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -158,6 +159,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml index 961a570959..aea2f85261 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml @@ -163,6 +163,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -174,6 +175,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml index 9e8df4b3c6..761c0f46ca 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml @@ -93,6 +93,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -104,6 +105,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml index c5759697e9..82cd7d8704 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml @@ -452,6 +452,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -463,6 +464,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml index c89f9102c0..70b8eaa034 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml @@ -167,6 +167,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +179,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml index c5eab26d5a..43931b16a2 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -179,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml index 20ee991d17..23258513dc 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml @@ -94,6 +94,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -105,6 +106,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml index 3a1993806e..a7e7984d3f 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml index 0e45ef5ca2..0dc07bd644 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml @@ -813,6 +813,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -824,6 +825,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -862,6 +864,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -889,6 +892,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -944,6 +948,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -1002,6 +1007,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -1020,6 +1026,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -1031,6 +1038,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -1122,6 +1130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -1133,6 +1142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification-expired-crl.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification-expired-crl.out.yaml index a158e59366..cbcc91e69e 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification-expired-crl.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification-expired-crl.out.yaml @@ -488,6 +488,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -499,6 +500,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -559,6 +561,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -570,6 +573,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -614,6 +618,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -625,6 +630,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml index e15b3cd957..57cd0c8f06 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml @@ -481,6 +481,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -492,6 +493,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -552,6 +554,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -563,6 +566,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -607,6 +611,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -618,6 +623,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml index 2981331b70..c61390690d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-clustertrustbundle.out.yaml @@ -552,6 +552,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -563,6 +564,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -631,6 +633,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -642,6 +645,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -691,6 +695,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -702,6 +707,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -753,6 +759,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -764,6 +771,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -817,6 +825,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -828,6 +837,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml index d945ed3fe2..879059487f 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml @@ -556,6 +556,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -567,6 +568,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -635,6 +637,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -646,6 +649,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -695,6 +699,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -706,6 +711,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -757,6 +763,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -768,6 +775,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -821,6 +829,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -832,6 +841,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml index 67dc37f9a6..a3b004c662 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml @@ -543,6 +543,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -554,6 +555,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -622,6 +624,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -633,6 +636,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -682,6 +686,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -693,6 +698,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -742,6 +748,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -753,6 +760,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -802,6 +810,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -813,6 +822,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml index 34da8932e4..4b0b896cda 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml @@ -237,6 +237,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -248,6 +249,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -308,6 +310,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -319,6 +322,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml index 27afc591cf..a1dcac576c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml index 2351ba61d1..4a14667271 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml @@ -205,6 +205,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -216,6 +217,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -252,6 +254,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -263,6 +266,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml index e4cebd78ec..da3364ed10 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml index 48528439b1..1f665af45c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml @@ -288,6 +288,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-legacy-only-77ed7bb0 namespace: envoy-gateway-system sectionName: "8080" @@ -299,6 +300,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-legacy-only-77ed7bb0 namespace: envoy-gateway-system sectionName: "8080" @@ -339,6 +341,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-new-api-only-384278b9 namespace: envoy-gateway-system sectionName: "8080" @@ -350,6 +353,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-new-api-only-384278b9 namespace: envoy-gateway-system sectionName: "8080" @@ -384,6 +388,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-precedence-test-6c6824c3 namespace: envoy-gateway-system sectionName: "8080" @@ -395,6 +400,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-precedence-test-6c6824c3 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml index 9b34851584..323babb5d9 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml @@ -131,6 +131,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -142,6 +143,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml index 96f5419eb8..013b430ece 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml index 222a5ab56b..e026dbd799 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions-truncated.out.yaml @@ -1591,6 +1591,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -1602,6 +1603,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -1635,6 +1637,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -1646,6 +1649,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -1679,6 +1683,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -1690,6 +1695,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -1723,6 +1729,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -1734,6 +1741,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -1767,6 +1775,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -1778,6 +1787,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -1811,6 +1821,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -1822,6 +1833,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -1855,6 +1867,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -1866,6 +1879,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -1899,6 +1913,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -1910,6 +1925,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -1943,6 +1959,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -1954,6 +1971,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -1987,6 +2005,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -1998,6 +2017,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -2031,6 +2051,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -2042,6 +2063,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -2075,6 +2097,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -2086,6 +2109,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -2119,6 +2143,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -2130,6 +2155,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -2163,6 +2189,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -2174,6 +2201,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -2207,6 +2235,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -2218,6 +2247,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -2251,6 +2281,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -2262,6 +2293,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -2295,6 +2327,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -2306,6 +2339,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -2339,6 +2373,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" @@ -2350,6 +2385,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml index 44efce673a..e18b9acf85 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml @@ -507,6 +507,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -518,6 +519,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -551,6 +553,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -562,6 +565,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -605,6 +609,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -616,6 +621,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -649,6 +655,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-not-same-namespace-not-same-namespace-gateway-f21c7840 namespace: envoy-gateway-system sectionName: "8080" @@ -660,6 +667,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-not-same-namespace-not-same-namespace-gateway-f21c7840 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml index 600b0d9b9d..e34e9a7649 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-stream-idle-timeout.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml index c199263622..b5fb9a0eb1 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -164,6 +164,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +176,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml index 1059e4330a..32f399ed4c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml @@ -94,6 +94,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -105,6 +106,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml index c1a4bf5125..39af6d55b6 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-966d2c13 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml index bbf8432fe7..c7772555cc 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml @@ -330,6 +330,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +342,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -408,6 +410,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -419,6 +422,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -460,6 +464,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -471,6 +476,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml index b774fa533b..54c490436e 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml @@ -129,6 +129,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -140,6 +141,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/conflicting-policies.out.yaml b/internal/gatewayapi/testdata/conflicting-policies.out.yaml index 2ad980e641..64987653fb 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -264,6 +264,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -275,6 +276,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -309,6 +311,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -354,6 +357,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/custom-filter-order.out.yaml b/internal/gatewayapi/testdata/custom-filter-order.out.yaml index 7c3df25abb..9ea145accb 100644 --- a/internal/gatewayapi/testdata/custom-filter-order.out.yaml +++ b/internal/gatewayapi/testdata/custom-filter-order.out.yaml @@ -230,6 +230,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -241,6 +242,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index 6110294bd8..3a837a55d0 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -123,6 +123,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -134,6 +135,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml index 9d99fe4c73..d2e4e8203a 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml @@ -83,6 +83,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -94,6 +95,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-no-section.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-no-section.out.yaml index 66efa19530..dd4a70c6b4 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-no-section.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-no-section.out.yaml @@ -166,6 +166,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +178,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -211,6 +213,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml index b2cf1c8030..2d2026b031 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml @@ -267,6 +267,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -278,6 +279,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -312,6 +314,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -364,6 +367,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -416,6 +420,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-section-name-override.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-section-name-override.out.yaml index 4d05116636..e967f67c59 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-section-name-override.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-section-name-override.out.yaml @@ -320,6 +320,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -331,6 +332,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -366,6 +368,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -420,6 +423,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -474,6 +478,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -544,6 +549,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml index 6895238960..3040194523 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions-truncated.out.yaml @@ -2389,6 +2389,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2400,6 +2401,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2462,6 +2464,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2473,6 +2476,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2535,6 +2539,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2546,6 +2551,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2608,6 +2614,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2619,6 +2626,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2681,6 +2689,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2692,6 +2701,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2754,6 +2764,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2765,6 +2776,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2827,6 +2839,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2838,6 +2851,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2900,6 +2914,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2911,6 +2926,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2973,6 +2989,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -2984,6 +3001,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -3046,6 +3064,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3057,6 +3076,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3119,6 +3139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3130,6 +3151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3192,6 +3214,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3203,6 +3226,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3265,6 +3289,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3276,6 +3301,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3338,6 +3364,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3349,6 +3376,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3411,6 +3439,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3422,6 +3451,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3484,6 +3514,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3495,6 +3526,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3557,6 +3589,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3568,6 +3601,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3630,6 +3664,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" @@ -3641,6 +3676,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml index 1d82d35b3d..3a18fd4a6f 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml @@ -520,6 +520,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-another-namespace-not-same-namespace-gateway-8778384d namespace: envoy-gateway-system sectionName: "8080" @@ -531,6 +532,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-another-namespace-not-same-namespace-gateway-8778384d namespace: envoy-gateway-system sectionName: "8080" @@ -564,6 +566,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -575,6 +578,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -640,6 +644,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -651,6 +656,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml index 45a3e20103..f7ebfffdf1 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml index 57199d095e..f0fa078222 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml index ea93f70b61..6195cd0702 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +182,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml index 62acf61fd7..a1c5fb4468 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml @@ -353,6 +353,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -364,6 +365,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -398,6 +400,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -429,6 +432,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -458,6 +462,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -489,6 +494,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml index 72a7bbde2e..39a51dd728 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml @@ -300,6 +300,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -311,6 +312,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -345,6 +347,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -421,6 +424,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml index 88363330d0..9538a02554 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-mixed-backendrefs.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -220,6 +222,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml index e38f08cf5e..707304ab58 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml @@ -290,6 +290,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -301,6 +302,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -335,6 +337,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -433,6 +436,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-retries.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-retries.out.yaml index 49eb923bc4..5ad59aa304 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-retries.out.yaml @@ -330,6 +330,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -341,6 +342,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -375,6 +377,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -513,6 +516,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml index 313bb1b14b..a2711df8c7 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml @@ -317,6 +317,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -328,6 +329,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -362,6 +364,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -487,6 +490,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml index b0831512e2..1c4fb7d0d1 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-disabled.out.yaml @@ -149,6 +149,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -160,6 +161,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -194,6 +196,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml index 29c5c40b4a..dfdbd01b02 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua-validation-syntax.out.yaml @@ -234,6 +234,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -245,6 +246,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -279,6 +281,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -330,6 +333,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml index bc794176b2..9567b379a0 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-invalid-lua.out.yaml @@ -224,6 +224,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -235,6 +236,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -269,6 +271,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -305,6 +308,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml index 1c70b1bdd3..793d5c40e3 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua-configmap.out.yaml @@ -384,6 +384,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -395,6 +396,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -429,6 +431,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -467,6 +470,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -505,6 +509,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -543,6 +548,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -579,6 +585,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml index 442dbab563..e4b2c6b78b 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-lua.out.yaml @@ -210,6 +210,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -221,6 +222,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -255,6 +257,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -289,6 +292,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml index 36b1957de3..dd4bb6ff05 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml @@ -244,6 +244,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -255,6 +256,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -289,6 +291,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -331,6 +334,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml index 62fdb219e2..975f972215 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-invalid-configuration.out.yaml @@ -689,6 +689,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -700,6 +701,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -734,6 +736,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -765,6 +768,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -794,6 +798,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -825,6 +830,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -856,6 +862,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -867,6 +874,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -901,6 +909,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -930,6 +939,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -959,6 +969,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -970,6 +981,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -1004,6 +1016,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml index 563dbcb17f..b5eb5f4b02 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml @@ -213,6 +213,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -224,6 +225,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml index b6e0fe19ee..4b7a7ce7bd 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml @@ -246,6 +246,7 @@ xdsIR: privateKey: '[redacted]' proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -257,6 +258,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -291,6 +293,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -335,6 +338,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml index aab7f7fdf8..9a88aa4f50 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -66,6 +66,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -77,6 +78,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml index 0d073b478b..105d725ccb 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml @@ -91,6 +91,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -102,6 +103,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-merge-gateways.out.yaml index 9c3ac36aea..b7b4b0f47e 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-merge-gateways.out.yaml @@ -98,6 +98,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -109,6 +110,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml index 7659b3d117..b4b746b866 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml @@ -75,6 +75,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -86,6 +87,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml index f795d659be..73b9604334 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -85,6 +85,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -96,6 +97,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-name.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-name.out.yaml index 1458666a93..0052a00e9d 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-name.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-name.out.yaml @@ -91,6 +91,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -102,6 +103,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml index 5ca97aba5a..6f72c47662 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml @@ -120,6 +120,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -131,6 +132,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index 5eed26db44..e86aad7952 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml index af3be996c8..f662604f0b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml @@ -206,6 +206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -217,6 +218,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml index dabebad294..5344b88f9a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml @@ -146,6 +146,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -157,6 +158,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml index 37f9b8e369..bbd41e4e22 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml @@ -150,6 +150,7 @@ xdsIR: - host: 8.7.6.5 port: 4317 metadata: + kind: Service name: otel-collector namespace: monitoring sectionName: "4317" @@ -166,6 +167,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +179,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml index 194725b2b9..2ab17844af 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml @@ -147,6 +147,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -158,6 +159,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml index 9a9b120b2e..3e276a33e3 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml @@ -197,6 +197,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -208,6 +209,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml index 7a9d698870..46801d8ced 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml @@ -151,6 +151,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -162,6 +163,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml index b01bfa4c82..e212a2ff91 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -138,6 +138,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +150,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml index 1c3c7e4a49..8a7c8f7fa7 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml @@ -508,6 +508,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -519,6 +520,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml index 85dd671722..09a7cbf11a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml @@ -340,6 +340,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -351,6 +352,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml index 40db1df29c..6909bff2fd 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml @@ -224,6 +224,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -235,6 +236,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 1596b14d00..8883338abf 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -236,6 +236,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +248,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml index fe71412e46..ab95a3e1ae 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -160,6 +162,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml index 46d6899b20..8292273781 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -155,6 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml index 7adeb39917..8b43d7b7b2 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml index 9b28e8a4db..87fc4194da 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml index 5a7d007b08..c979c7053e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml b/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml index 038396e18a..e13c68278d 100644 --- a/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-preserve-route-order.out.yaml @@ -160,6 +160,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -171,6 +172,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -206,6 +208,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -235,6 +238,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -264,6 +268,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -293,6 +298,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -322,6 +328,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -351,6 +358,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -380,6 +388,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -409,6 +418,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml index 86faf7f1e6..2178c02f11 100644 --- a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml @@ -291,6 +291,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -302,6 +303,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -336,6 +338,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -437,6 +440,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml index 9c2846cc95..31c0c031b6 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -159,6 +161,7 @@ xdsIR: - host: 1.1.1.1 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml index 6a096d8554..a76ce2f9ff 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: - host: 6.7.8.9 port: 8080 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -152,6 +154,7 @@ xdsIR: - host: 1.1.1.1 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml index 214a30e219..427b210510 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml @@ -236,6 +236,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +248,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml index e615766d31..c3da99097e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml @@ -235,6 +235,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" @@ -246,6 +247,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml index 9e05786f2e..5fb088afdf 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml @@ -232,6 +232,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" @@ -243,6 +244,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-tls-e5408cf3 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml index 6eda4ffdd9..2c655dfe29 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml index a5f15e740b..61eeb4fbb6 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-uds.out.yaml @@ -179,6 +179,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -190,6 +191,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml index 415138f031..6c1156dce7 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml @@ -159,6 +159,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -170,6 +171,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -209,6 +211,7 @@ xdsIR: - host: 8.7.6.5 port: 4317 metadata: + kind: Service name: otel-collector namespace: monitoring sectionName: "4317" diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index 440a954e2e..b75c845ad2 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -123,6 +123,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -134,6 +135,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml b/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml index cec34f01f3..832976fc88 100644 --- a/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-with-statname.out.yaml @@ -167,6 +167,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +179,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +215,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -224,6 +227,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-4 namespace: default sectionName: "8080" @@ -256,6 +260,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -287,6 +292,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -298,6 +304,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -309,6 +316,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -320,6 +328,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-4 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml index 843f390a72..1ea77c7ab8 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml @@ -206,6 +206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -216,6 +217,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml index 1173b5c35f..8db592d4d1 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml @@ -206,6 +206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -216,6 +217,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml index 650b3e127f..f79d199327 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -112,6 +113,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml index dae15d4c7f..3b1c988357 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml @@ -207,6 +207,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -217,6 +218,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -333,6 +335,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 sectionName: "8080" name: envoy-gateway/gateway-2 @@ -343,6 +346,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 sectionName: "8080" name: envoy-gateway/gateway-2 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml index b93662a718..d15a78862b 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml @@ -210,6 +210,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -220,6 +221,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/grpcroute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/grpcroute-with-valid-extension-filter.out.yaml index fd5a6f5db0..25c5371d17 100644 --- a/internal/gatewayapi/testdata/extensions/grpcroute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/grpcroute-with-valid-extension-filter.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -152,6 +154,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml index 285d3aa419..bbab9328c4 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-apiversion.out.yaml @@ -117,6 +117,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml index 0212722fac..a8d9327a78 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid-group.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml index c18cc980c1..0f47db5517 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-invalid.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.in.yaml index 633b686197..a073344f46 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.in.yaml @@ -56,31 +56,6 @@ httpRoutes: port: 443 - name: service-2 port: 8080 -services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 10.11.12.13 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 3000 -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-2 - spec: - clusterIP: 10.11.12.14 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 3000 extensionRefFilters: - apiVersion: storage.example.io/v1alpha1 kind: S3Backend diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml index 45e610535f..d2726bd541 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed-multiple.out.yaml @@ -127,6 +127,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -137,6 +138,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.in.yaml index ba5684e1a2..3179774621 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.in.yaml @@ -48,31 +48,6 @@ httpRoutes: port: 443 - name: service-2 port: 8080 -services: -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 10.11.12.13 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 3000 -- apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-2 - spec: - clusterIP: 10.11.12.14 - ports: - - port: 8080 - name: http - protocol: TCP - targetPort: 3000 extensionRefFilters: - apiVersion: storage.example.io/v1alpha1 kind: S3Backend diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml index 73bc6e82ad..82ca04d84a 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-mixed.out.yaml @@ -119,6 +119,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -129,6 +130,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml index 109e8e32e9..8b6bf32b33 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-multiple.out.yaml @@ -123,6 +123,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -133,6 +134,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-not-found.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-not-found.out.yaml index 285d3aa419..bbab9328c4 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-not-found.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend-not-found.out.yaml @@ -117,6 +117,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml index 6ef3cecdbb..5f9f031d06 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-custom-backend.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -125,6 +126,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml index 2ab86253d7..4360228b90 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml index 8a44020bb3..82250eb35b 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml index eb1a1e553d..17e8559fe5 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 sectionName: "8080" name: envoy-gateway/gateway-1 @@ -154,6 +156,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml index 0c07534b1e..621bc934d0 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml index 3c83d5517c..92a87644ee 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml index cc4d63881e..81a6db4883 100644 --- a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml +++ b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml index 40a74f1912..b67c383719 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -118,6 +118,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -129,6 +130,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -163,6 +165,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.in.yaml b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.in.yaml index 5228280195..865126d0ee 100644 --- a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.in.yaml +++ b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.in.yaml @@ -94,30 +94,6 @@ httpRoutes: namespace: test-ns port: 8080 services: - - apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-1 - spec: - clusterIP: 1.1.1.1 - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - - apiVersion: v1 - kind: Service - metadata: - namespace: default - name: service-2 - spec: - clusterIP: 2.2.2.2 - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - apiVersion: v1 kind: Service metadata: diff --git a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml index 7352cc4043..59a047a300 100644 --- a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml @@ -285,6 +285,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: gateway-1 namespace: default sectionName: "8080" @@ -296,6 +297,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: gateway-1 namespace: default sectionName: "8080" @@ -360,6 +362,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: gateway-2 namespace: default sectionName: "8080" @@ -371,6 +374,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: gateway-2 namespace: default sectionName: "8080" @@ -435,6 +439,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: gateway-3 namespace: test-ns sectionName: "8080" @@ -446,6 +451,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: gateway-3 namespace: test-ns sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml index c5cf052aba..a2ac8cf2fb 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -71,6 +71,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -82,6 +83,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml index 13eded95e6..60c8536b76 100644 --- a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml @@ -126,6 +126,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -137,6 +138,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -171,6 +173,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml index 9ff0dc6c60..811939719f 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -155,6 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml index 1e6bb5f669..abd6445054 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml @@ -126,6 +126,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -137,6 +138,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -171,6 +173,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml index 62e4d59b5a..fb1bca1c0e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml index 44a2e8084f..d6eddedd1d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml @@ -86,6 +86,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -97,6 +98,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml index ec70fe4b3e..e3eee27117 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml @@ -88,6 +88,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -99,6 +100,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml index 408789f22c..891bdd8a8b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml @@ -86,6 +86,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -97,6 +98,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml index 62f2cacb5d..8a474483bb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml @@ -86,6 +86,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -97,6 +98,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml index 230a65a05f..d607a75d59 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml index 3199172bfa..e6aaa0af27 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml @@ -94,6 +94,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -105,6 +106,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml index 26d4ef11b1..08b2c9ae80 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml @@ -89,6 +89,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -100,6 +101,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml index 8a31bec480..0aef0e30a2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml @@ -93,6 +93,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -104,6 +105,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml index 551ccbaede..8236a44c0d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml index cf7cba9060..baa9f7506b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml @@ -93,6 +93,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -104,6 +105,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml index 143ed5cd4f..ed93a40205 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml @@ -88,6 +88,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -99,6 +100,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml index a1a00e6fd0..eee30d760d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml @@ -52,6 +52,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -63,6 +64,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml index 5ff656e57e..6666852b93 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml index c766ddd253..b6b593ab7c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +145,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -154,6 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml index 9dbc6ea29f..a79baa4fef 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-configuration-sni-san-mismatch-allowed.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-configuration-sni-san-mismatch-allowed.out.yaml index ec08fb8659..1329eab848 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-configuration-sni-san-mismatch-allowed.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-configuration-sni-san-mismatch-allowed.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -152,6 +154,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml index 12a5ea2c1f..229e3c2d38 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -152,6 +154,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml index 87b3b8f300..f7bd8fa7a4 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -220,6 +222,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -271,6 +274,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml index d283324c39..cdc8155dc4 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml @@ -52,6 +52,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -63,6 +64,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml index c98c02aee3..485e81f930 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml index f2f1378ffa..14abb301bb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +145,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" @@ -154,6 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-2 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml index 49c8981145..bf6888e383 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml @@ -95,6 +95,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -106,6 +107,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml index 29cfea10b0..c48d51a206 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml @@ -64,6 +64,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -75,6 +76,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml index 3cf2c58fdf..30b631f609 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml @@ -64,6 +64,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -75,6 +76,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml index 325d3fea14..1765434059 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml @@ -88,6 +88,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -99,6 +100,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml index f1b5d56824..cf927ef973 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -154,6 +156,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml index f95961b600..de41a28788 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -154,6 +156,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml index ce3a208a90..98eb201e00 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml index 0bab2ff702..4c5d001ef2 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-certs.out.yaml @@ -193,6 +193,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -204,6 +205,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml index 98fdb4c9f5..5f11b5ca74 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs-merged-gateways.out.yaml @@ -178,6 +178,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -189,6 +190,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml index 173e486448..ddb9408d0c 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-and-certs.out.yaml @@ -157,6 +157,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -168,6 +169,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml index 50162b39d6..cc5fa94d56 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames-merged-gateways.out.yaml @@ -214,6 +214,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -225,6 +226,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml index 9abf68a88b..70d2b757e5 100644 --- a/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-multiple-https-listeners-with-overlapping-hostnames.out.yaml @@ -193,6 +193,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -204,6 +205,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml index 345fd9d2c9..41d8464def 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -145,6 +147,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml index 5328580cf8..d9d81285a9 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml @@ -125,6 +125,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -136,6 +137,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -169,6 +171,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml index 8bfe6abf49..6053c26f9c 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml @@ -125,6 +125,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -136,6 +137,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -169,6 +171,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml index e3812b0f42..f6d3a802a4 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml index a7c87a8580..bea2014f41 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml @@ -119,6 +119,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -130,6 +131,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -163,6 +165,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml index 2a67530a89..192332e6c5 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml @@ -122,6 +122,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -133,6 +134,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -166,6 +168,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml index 25c63b014a..20c4241d1a 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml @@ -154,6 +154,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -165,6 +166,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml index 3749c4c798..aa36284f9c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml @@ -171,6 +171,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -182,6 +183,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -216,6 +218,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -245,6 +248,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -290,6 +294,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -319,6 +324,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml index 9c44cf8420..ecb8190327 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml @@ -123,6 +123,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -134,6 +135,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml index 6ee066f7cd..173f868a62 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml @@ -123,6 +123,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -134,6 +135,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml index 35d815b18e..05e4ef9876 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml @@ -166,6 +166,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +178,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -211,6 +213,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -256,6 +259,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml index aa5b4a5b75..bcc44f3541 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml @@ -166,6 +166,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -177,6 +178,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -211,6 +213,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -256,6 +259,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml index d7bb13d864..00b7d4c18f 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml @@ -163,6 +163,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -174,6 +175,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -207,6 +209,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -240,6 +243,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-2 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml index d096feae49..b7e2d95204 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml @@ -159,6 +159,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -170,6 +171,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -203,6 +205,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -236,6 +239,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml index 775369fb6e..d38c96403f 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml @@ -163,6 +163,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -174,6 +175,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -207,6 +209,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" @@ -236,6 +239,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-2 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml index 49cdcaf78f..f7defa87d0 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml @@ -159,6 +159,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -170,6 +171,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -203,6 +205,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" @@ -232,6 +235,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml index 3fcd34775f..e756e77495 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml @@ -126,6 +126,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -137,6 +138,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml index de808f625c..d961cb6e37 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index e1b543b061..ea29513e12 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml index 514c429c41..150dc17031 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -153,6 +155,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -182,6 +185,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 478ae759a7..42b2ffbee2 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -180,6 +183,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-mirror.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-mirror.out.yaml index f0ff824bc1..f529f37357 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-mirror.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-mirror.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -172,6 +175,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-mixed-invalid-and-valid-backend-refs.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-mixed-invalid-and-valid-backend-refs.out.yaml index 374daf4fda..2984ac05c6 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-mixed-invalid-and-valid-backend-refs.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-mixed-invalid-and-valid-backend-refs.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml index 3e052ef4ca..a7e76942ba 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -164,6 +166,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index 9c89be4497..f53145ef02 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -180,6 +183,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml index 540d3a9fe1..956b60abb3 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml @@ -137,6 +137,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -148,6 +149,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -182,6 +184,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml index 1c4a7be47e..2210e1c812 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml @@ -258,6 +258,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -269,6 +270,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -303,6 +305,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -335,6 +338,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -346,6 +350,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -380,6 +385,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml index b52f682686..fd48be29a9 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml @@ -360,6 +360,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -371,6 +372,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -405,6 +407,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -450,6 +453,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -495,6 +499,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -540,6 +545,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -585,6 +591,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -630,6 +637,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -675,6 +683,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -720,6 +729,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml index 6e4f773bff..aeec37e0c2 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml @@ -311,6 +311,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -322,6 +323,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -356,6 +358,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -401,6 +404,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -446,6 +450,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -491,6 +496,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -536,6 +542,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -581,6 +588,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -626,6 +634,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -671,6 +680,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml index 4fcb6cfb2c..28fea440f3 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml @@ -142,6 +142,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -153,6 +154,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -187,6 +189,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -232,6 +235,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml index 9c06ddf899..5dc3801cb9 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml @@ -131,6 +131,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -142,6 +143,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -176,6 +178,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -221,6 +224,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index be4bd26810..95d57dad12 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -100,6 +100,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -111,6 +112,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -145,6 +147,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml index 932e2a4f7e..ff7baa27f8 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml index a08f08a678..99ab9ba775 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -193,6 +195,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml index ad3d5ad6e7..46a6291015 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml @@ -202,6 +202,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +214,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-host-infra.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-host-infra.out.yaml index 458acc5049..4c3a685088 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-host-infra.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-host-infra.out.yaml @@ -333,6 +333,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -344,6 +345,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml index 131a20be30..ac0ff5878a 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml @@ -257,6 +257,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -268,6 +269,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml index 7d643e87ce..f985029347 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml @@ -337,6 +337,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -348,6 +349,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml index e92e385665..10e1950e8f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml @@ -280,6 +280,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -291,6 +292,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml index 0e2b3c3414..8dfacc339f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml @@ -287,6 +287,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +299,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml index aea5b0042d..d486515ef8 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml index 24defe2823..0b340e9c15 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml index 130d28b115..f0bdc5a32e 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml index 8a10bf782d..c2f0d69922 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml @@ -105,6 +105,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -116,6 +117,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml index 2101e850e6..05d5cf1f50 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 9f25055cc3..ac64485a66 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -113,6 +114,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -147,6 +149,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index 47eb603b72..bc88b6ea7b 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml b/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml index d9cce6d67d..1f24db0d32 100644 --- a/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml +++ b/internal/gatewayapi/testdata/httproute-default-order-by-creation-date-and-route-name.out.yaml @@ -337,6 +337,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -348,6 +349,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -382,6 +384,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -411,6 +414,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -440,6 +444,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -469,6 +474,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -558,6 +564,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -587,6 +594,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -676,6 +684,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml b/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml index 3d4e55de23..5338a35215 100644 --- a/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml +++ b/internal/gatewayapi/testdata/httproute-dynamic-resolver-with-mutliple-backends.out.yaml @@ -138,6 +138,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +150,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml b/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml index 6fefc18f3d..095cd71977 100644 --- a/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml +++ b/internal/gatewayapi/testdata/httproute-dynamic-resolver.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml index 4a6129a2c9..9eb1d8b96d 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml @@ -103,6 +103,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -114,6 +115,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml b/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml index 85cd52f3fb..63337dac85 100644 --- a/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml +++ b/internal/gatewayapi/testdata/httproute-order-by-creation-date.out.yaml @@ -231,6 +231,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -242,6 +243,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -276,6 +278,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -305,6 +308,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -334,6 +338,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index 0fa14ee7f1..72e3bbce84 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-retry.out.yaml b/internal/gatewayapi/testdata/httproute-retry.out.yaml index 64408de215..0f18669f90 100644 --- a/internal/gatewayapi/testdata/httproute-retry.out.yaml +++ b/internal/gatewayapi/testdata/httproute-retry.out.yaml @@ -243,6 +243,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -254,6 +255,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -287,6 +289,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -298,6 +301,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -332,6 +336,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml index 7241324c44..0e2bef314b 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml @@ -97,6 +97,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -108,6 +109,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml index efe112d0e6..a8111eded3 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -160,6 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -171,6 +175,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml index a8574fdc86..4370e1d9a5 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -155,6 +157,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -166,6 +169,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -177,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml index 3fb44fa25f..1a7f9f82c9 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml @@ -176,6 +176,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -187,6 +188,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -221,6 +223,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml index 86c881fe0f..8742713d1e 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml @@ -174,6 +174,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -185,6 +186,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -219,6 +221,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml b/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml index b4656c4cc4..54534a11b8 100644 --- a/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-api-key-auth-duplicated-api-key.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -184,6 +186,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml index 9e00dfc8b8..b15f976dea 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml @@ -133,6 +133,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +145,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -198,6 +201,7 @@ xdsIR: credential: '[redacted]' name: httproutefilter/default/credential-injection metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -237,6 +241,7 @@ xdsIR: value: - some-value metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -248,6 +253,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index 388bd3d9cb..e0df0661cd 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -113,6 +114,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-no-endpoints.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-no-endpoints.out.yaml index 921467169b..d93d04624b 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-no-endpoints.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-no-endpoints.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml index 5584bebdd0..0b1ef15bb0 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml index bda8e47b06..9805bc37e3 100644 --- a/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-cors-filter.out.yaml @@ -220,6 +220,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -231,6 +232,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -274,6 +276,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -326,6 +329,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -381,6 +385,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -421,6 +426,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml b/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml index 818f31477b..3b8902156f 100644 --- a/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-credential-injection.out.yaml @@ -167,6 +167,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +179,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -215,6 +217,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -249,6 +252,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml index 8c94e8c9cb..b25fb0faac 100644 --- a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml @@ -235,6 +235,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -246,6 +247,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 37df60bd5b..ee01066b32 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +146,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml b/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml index 54b0035476..3e541d79ee 100644 --- a/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-enable-zone-discovery.out.yaml @@ -121,6 +121,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -132,6 +133,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -170,6 +172,7 @@ xdsIR: port: 8080 zone: antarctica-east1b metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -210,6 +213,7 @@ xdsIR: port: 8080 zone: antarctica-east1b metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml index 1b531ef485..ff6304e4fa 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml @@ -120,6 +120,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -131,6 +132,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml index b280c9f66c..ba5515d9ee 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -196,6 +198,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml index b4d0d7878e..2fcd95f704 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -116,6 +116,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -161,6 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml index 50a94be3e4..fb13928f91 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +158,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml index 644e55f3b2..9e77a7d913 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml index 881f5152d3..19023ff029 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml @@ -118,6 +118,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -129,6 +130,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml index 5835199db9..3eb1cf4d3f 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-header-values.out.yaml @@ -116,6 +116,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml index 2b0912fbf6..327b7b0305 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml @@ -208,6 +208,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -219,6 +220,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml index ec98f06418..6097d08b81 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -153,6 +155,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml index 6b60f71741..026a1ba514 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml index 8538172264..793c03d09e 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -157,6 +159,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml index 50aed16359..505d27ead6 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-match-diff-number.out.yaml @@ -155,6 +155,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -166,6 +167,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -200,6 +202,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -236,6 +239,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml index 66c629b361..6d1ade0d1c 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-match-diff-type.out.yaml @@ -152,6 +152,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -163,6 +164,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -197,6 +199,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -230,6 +233,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml b/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml index 213c547e87..d5f586f8ac 100644 --- a/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-headless-service-endpoint-routing.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml b/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml index c9c73dd017..6380ad89a6 100644 --- a/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-headless-service-service-routing.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: - host: 6.7.8.9 port: 8080 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml index 05bfd9562b..e3f2e4810f 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -113,6 +114,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml index 549d1235ea..8682b8d9eb 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml index 6a291935cb..1e649a4586 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml @@ -103,6 +103,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -114,6 +115,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml index e68ad13650..c1cc590985 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-mixed-kind.out.yaml @@ -124,6 +124,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -135,6 +136,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -169,6 +171,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml index 13c41268bc..334bfaaf8b 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml @@ -101,6 +101,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -112,6 +113,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml index f6991f5f4c..4cbc16e101 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml index 339ba6c0cd..4b2592e2a7 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -113,6 +114,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml index 17c23914f2..ac769aca66 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml index e18a4679a3..2232100f34 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml @@ -103,6 +103,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -114,6 +115,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml index 19c127317d..236544ec35 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml @@ -160,6 +160,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -171,6 +172,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -204,6 +206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -215,6 +218,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml index 3504f447ad..9ee5e1bb45 100644 --- a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -160,6 +162,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -195,6 +198,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml index 6d5e29bfcd..46c9e4f600 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -118,6 +118,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -129,6 +130,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -163,6 +165,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -184,6 +187,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -198,6 +202,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml index a0de6c0b7f..e223b8bad5 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -188,6 +190,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -209,6 +212,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -223,6 +227,7 @@ xdsIR: - host: 7.6.5.4 port: 8080 metadata: + kind: Service name: mirror-service namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml index 25487695fc..c333c73079 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-percentage-mirroring.out.yaml @@ -122,6 +122,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -133,6 +134,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -167,6 +169,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -188,6 +191,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -203,6 +207,7 @@ xdsIR: - host: 7.6.5.4 port: 8080 metadata: + kind: Service name: mirror-service namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml index a70c035274..55ce607d69 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml index 2d8cf3344b..c2e43a950f 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml @@ -113,6 +113,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -124,6 +125,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index 0294523f55..970c6492bf 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -157,6 +159,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -178,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-missing-protocol-backends.out.yaml b/internal/gatewayapi/testdata/httproute-with-missing-protocol-backends.out.yaml index c7ef46dcb6..e13e285c03 100644 --- a/internal/gatewayapi/testdata/httproute-with-missing-protocol-backends.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-missing-protocol-backends.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-mixed-invalid-and-valid-backend-refs.out.yaml b/internal/gatewayapi/testdata/httproute-with-mixed-invalid-and-valid-backend-refs.out.yaml index 9b76cbe1c2..c2d8f6dbdc 100644 --- a/internal/gatewayapi/testdata/httproute-with-mixed-invalid-and-valid-backend-refs.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mixed-invalid-and-valid-backend-refs.out.yaml @@ -106,6 +106,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -117,6 +118,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +153,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml index 08205e3236..2a69fb569c 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml @@ -124,6 +124,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -135,6 +136,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -168,6 +170,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -179,6 +182,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml index f99ee95fad..95eb004f84 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml @@ -156,6 +156,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -167,6 +168,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -201,6 +203,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -230,6 +233,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -241,6 +245,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml index 5b3b1f255f..153e104a80 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml @@ -188,6 +188,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-a-573db404 namespace: envoy-gateway-system sectionName: "8080" @@ -199,6 +200,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-a-573db404 namespace: envoy-gateway-system sectionName: "8080" @@ -267,6 +269,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-b-3a004b3a namespace: envoy-gateway-system sectionName: "8080" @@ -278,6 +281,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-b-3a004b3a namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml index b59e1e05a1..fcf325a84d 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml @@ -183,6 +183,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-a-37c12ef1 namespace: envoy-gateway-system sectionName: "8080" @@ -194,6 +195,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-a-37c12ef1 namespace: envoy-gateway-system sectionName: "8080" @@ -245,6 +247,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-b-3a004b3a namespace: envoy-gateway-system sectionName: "8080" @@ -256,6 +259,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-b-3a004b3a namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml index 367d1cdbd9..6b2c1a9541 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-invalid-rules.out.yaml @@ -125,6 +125,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -136,6 +137,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 1b7a8760eb..839c43efa2 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml b/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml index cef0783817..bc518128b5 100644 --- a/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-query-match-diff-number.out.yaml @@ -155,6 +155,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -166,6 +167,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -200,6 +202,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -236,6 +239,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml index 9c737858d1..24a5134dda 100644 --- a/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-query-match-diff-type.out.yaml @@ -152,6 +152,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -163,6 +164,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -197,6 +199,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -230,6 +233,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml index 670805ea22..0b50e36674 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml index d9c676d344..ba77d82ea1 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml index ece0c54733..22edf73515 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml index fa0522b55b..0f7bef172c 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml index 4b983eeed9..ce95a471af 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml index 767a4d8b36..3f2538aede 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml index 64c99d1c68..fe9cea9926 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml @@ -126,6 +126,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -137,6 +138,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -192,6 +194,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml index 5c2d8813a2..5bb581b917 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml @@ -120,6 +120,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -131,6 +132,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -178,6 +180,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml index d8f2cae23c..58fd68c865 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml @@ -130,6 +130,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +142,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -196,6 +198,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml index e25da0d35f..1bf54be9b3 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -116,6 +116,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -161,6 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml index 81f490aa99..701d02fa1d 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +158,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml index 2719c2ef2f..90446bdd80 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml index c754e9f437..01cf7ff17f 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml @@ -118,6 +118,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -129,6 +130,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml index fffd28bbe8..3260afa751 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-header-values.out.yaml @@ -116,6 +116,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -127,6 +128,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml index a20f89895b..b2b0af928c 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml @@ -206,6 +206,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -217,6 +218,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml index da4286daea..ddf892e861 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml @@ -108,6 +108,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -119,6 +120,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -153,6 +155,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml index 0372b5d9d3..346753b06b 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml index 17f5d5683d..a1f45a3f5b 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -157,6 +159,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml index 1e2732d0ce..cd1f0464a1 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml @@ -101,6 +101,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -112,6 +113,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +148,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml index e211889bce..5a3ef0fc09 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -144,6 +146,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml index 0dfb2e690b..c3db486d75 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml @@ -132,6 +132,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +144,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml index 94d838ed7a..ff6a129c8a 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml @@ -105,6 +105,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -116,6 +117,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +152,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml index 1196a28cb8..216ef39c77 100644 --- a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml @@ -107,6 +107,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -118,6 +119,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +158,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 57721bc6d6..926b6d2156 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -103,6 +103,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -114,6 +115,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -148,6 +150,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml index 0c0dba5a32..60d714bf3f 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -104,6 +104,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -115,6 +116,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -178,6 +181,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml index 7a58f3d6d1..5e27ef66e5 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +158,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml index 0b219594e5..b1c36fff20 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -157,6 +159,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml index 5336812be6..3b2dd29d34 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -154,6 +156,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml index 717990b41c..9423a975d8 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml @@ -109,6 +109,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -120,6 +121,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -154,6 +156,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml index 62cab96a9e..bb3b585eeb 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml index a44826d999..bbc925201c 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml @@ -117,6 +117,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -128,6 +129,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml index abd7ad9689..0067f19fb5 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml @@ -113,6 +113,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -124,6 +125,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml index a8473f85e9..b47c4049c3 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml @@ -112,6 +112,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -123,6 +124,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml index 8c968d2e5f..07ca7315ac 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml @@ -110,6 +110,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -121,6 +122,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml index 761a139a6e..aa01ae73dc 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml @@ -111,6 +111,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -122,6 +123,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +158,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml index 423fafac25..f48268a55d 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml @@ -246,6 +246,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -257,6 +258,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -291,6 +293,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -327,6 +330,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -365,6 +369,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -403,6 +408,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml index 1a576ca2a4..d1fd2a7382 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml @@ -341,6 +341,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -352,6 +353,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml index 622a25aa3e..1f371d360c 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml @@ -347,6 +347,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -358,6 +359,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml index 15a9d9fdc9..5d4c76a9fa 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml @@ -250,6 +250,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -261,6 +262,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -295,6 +297,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -330,6 +333,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -365,6 +369,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -397,6 +402,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml index 180a872fcc..76d595cb82 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml @@ -102,6 +102,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -113,6 +114,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -147,6 +149,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index d1611cc890..95eb519702 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -282,6 +282,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -293,6 +294,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml index 00a1126bee..b7555dcfd3 100644 --- a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml index 67799b46df..a320a0f0e4 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml @@ -175,6 +175,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -186,6 +187,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml index 9b9d403ada..bc72b0d3ac 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml @@ -224,6 +224,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -235,6 +236,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -269,6 +271,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -329,6 +332,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml index 04aa405e76..8d9fc2a46e 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml @@ -148,6 +148,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -159,6 +160,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml index b59443a3e5..eecb3b1a52 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -495,6 +495,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -506,6 +507,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -540,6 +542,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -609,6 +612,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -678,6 +682,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -739,6 +744,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml index 34e07cfaf7..4aa33b1dc6 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -291,6 +291,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -302,6 +303,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -336,6 +338,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -402,6 +405,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml index 38cb7c2b05..75548615ad 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml @@ -94,6 +94,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -105,6 +106,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml index b333b766ef..eb49bd1c0c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-listener.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +182,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml index 02afd83785..7ee29664da 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-no-section-name-route-rule.out.yaml @@ -135,6 +135,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -146,6 +147,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +182,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml index 5440934f67..3ad1aafba7 100644 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -548,6 +548,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -559,6 +560,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -594,6 +596,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -629,6 +632,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -663,6 +667,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -725,6 +730,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -773,6 +779,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -852,6 +859,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -887,6 +895,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -921,6 +930,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -954,6 +964,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -987,6 +998,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml index 32ecc3958f..aa828179f8 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions-route-rule.out.yaml @@ -236,6 +236,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +248,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -282,6 +284,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -317,6 +320,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml index df206e9b04..f198314321 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions-truncated.out.yaml @@ -2389,6 +2389,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2400,6 +2401,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -2462,6 +2464,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2473,6 +2476,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -2535,6 +2539,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2546,6 +2551,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -2608,6 +2614,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2619,6 +2626,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-4-a293650b namespace: envoy-gateway-system sectionName: "8080" @@ -2681,6 +2689,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2692,6 +2701,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-5-e35ee57f namespace: envoy-gateway-system sectionName: "8080" @@ -2754,6 +2764,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2765,6 +2776,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-6-703894b8 namespace: envoy-gateway-system sectionName: "8080" @@ -2827,6 +2839,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2838,6 +2851,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-7-8f166bcc namespace: envoy-gateway-system sectionName: "8080" @@ -2900,6 +2914,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2911,6 +2926,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-8-18a274e2 namespace: envoy-gateway-system sectionName: "8080" @@ -2973,6 +2989,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -2984,6 +3001,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-9-3f4aa2eb namespace: envoy-gateway-system sectionName: "8080" @@ -3046,6 +3064,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3057,6 +3076,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-10-323a05f0 namespace: envoy-gateway-system sectionName: "8080" @@ -3119,6 +3139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3130,6 +3151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-11-7cd86d79 namespace: envoy-gateway-system sectionName: "8080" @@ -3192,6 +3214,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3203,6 +3226,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-12-b05135f7 namespace: envoy-gateway-system sectionName: "8080" @@ -3265,6 +3289,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3276,6 +3301,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-13-5ef9b255 namespace: envoy-gateway-system sectionName: "8080" @@ -3338,6 +3364,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3349,6 +3376,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-14-2b849e6e namespace: envoy-gateway-system sectionName: "8080" @@ -3411,6 +3439,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3422,6 +3451,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-15-473da5fd namespace: envoy-gateway-system sectionName: "8080" @@ -3484,6 +3514,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3495,6 +3526,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-16-bc2b5d3e namespace: envoy-gateway-system sectionName: "8080" @@ -3557,6 +3589,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3568,6 +3601,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-17-686d5dd1 namespace: envoy-gateway-system sectionName: "8080" @@ -3630,6 +3664,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" @@ -3641,6 +3676,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-18-80e55fa6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml index 7c3d0f6f17..6053908a37 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml @@ -415,6 +415,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -426,6 +427,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -480,6 +482,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -491,6 +494,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml index 54354b8d10..790c6c7040 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml @@ -284,6 +284,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -295,6 +296,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -329,6 +331,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -361,6 +364,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -422,6 +426,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml index b672fc16d8..07ea3b4444 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-headers-and-methods.out.yaml @@ -144,6 +144,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -155,6 +156,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -189,6 +191,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml index cdc1d944fd..7d17f347d2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml @@ -157,6 +157,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -168,6 +169,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -202,6 +204,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml index bfe846c78b..03156bb6c4 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -218,6 +218,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -229,6 +230,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -263,6 +265,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -296,6 +299,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -329,6 +333,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml index 119f23ebf7..d79e9da7d5 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml @@ -349,6 +349,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -360,6 +361,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -425,6 +427,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -436,6 +439,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -483,6 +487,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -494,6 +499,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index da37fddffc..d5cb616ad1 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -407,6 +407,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -418,6 +419,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -452,6 +454,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -499,6 +502,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -510,6 +514,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -544,6 +549,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -592,6 +598,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -603,6 +610,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-3-32e857a6 namespace: envoy-gateway-system sectionName: "8080" @@ -637,6 +645,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml index af73a33aee..303e220746 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml @@ -359,6 +359,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -370,6 +371,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -404,6 +406,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -460,6 +463,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -516,6 +520,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" @@ -545,6 +550,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-4 namespace: default sectionName: "8080" @@ -579,6 +585,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml index f78f78b7fd..7dd57c88b2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml @@ -229,6 +229,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -240,6 +241,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -274,6 +276,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -331,6 +334,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -388,6 +392,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml index 56ec00b85e..51d50b1858 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml @@ -234,6 +234,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -245,6 +246,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -279,6 +281,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -348,6 +351,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -417,6 +421,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml index ece1b9b25d..84c1e96d49 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-body.out.yaml @@ -204,6 +204,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -215,6 +216,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -249,6 +251,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -307,6 +310,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -365,6 +369,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml index 94128315a8..7e76f50061 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -184,6 +186,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml index fa95b6df76..8098df51fd 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml @@ -139,6 +139,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -150,6 +151,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -184,6 +186,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml index 4870837db5..a08e740687 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml @@ -140,6 +140,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -151,6 +152,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -185,6 +187,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml index f2785edd97..dff4d97811 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml @@ -556,6 +556,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -567,6 +568,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -601,6 +603,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -633,6 +636,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -663,6 +667,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -695,6 +700,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -706,6 +712,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -740,6 +747,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -770,6 +778,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -781,6 +790,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -815,6 +825,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml index 9451cc0db9..c8e189c985 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport-port.out.yaml @@ -185,6 +185,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -196,6 +197,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -230,6 +232,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -262,6 +265,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -294,6 +298,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml index 32ed513aad..94f22e6465 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-serviceimport.out.yaml @@ -185,6 +185,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -196,6 +197,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -230,6 +232,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -262,6 +265,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -294,6 +298,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml index b7bb6a78f6..9fcb9ff456 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml @@ -203,6 +203,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -214,6 +215,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -248,6 +250,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -305,6 +308,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -362,6 +366,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport-retry.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport-retry.out.yaml index 28f7162215..f3927358b1 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport-retry.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport-retry.out.yaml @@ -255,6 +255,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -266,6 +267,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -300,6 +302,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -371,6 +374,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -442,6 +446,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml index fb64f15404..901064175e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-serviceimport.out.yaml @@ -227,6 +227,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -238,6 +239,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -272,6 +274,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -329,6 +332,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -386,6 +390,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-weighted-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-weighted-backendrefs.out.yaml index 6f16cf3a19..ce34d7ad51 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-weighted-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-weighted-backendrefs.out.yaml @@ -297,6 +297,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -308,6 +309,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -342,6 +344,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-4 namespace: default sectionName: "8080" @@ -399,6 +402,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -470,6 +474,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -541,6 +546,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml index beddbe6e44..107f15dc85 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -292,6 +292,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -303,6 +304,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -337,6 +339,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -400,6 +403,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml index fdc55999f4..23b89d9165 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -223,6 +223,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -234,6 +235,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -268,6 +270,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -325,6 +328,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -382,6 +386,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml index 47bafce18b..8ea05d999f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml @@ -235,6 +235,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -246,6 +247,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -280,6 +282,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -323,6 +326,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml index ad87f2ead9..cd926afeee 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml @@ -212,6 +212,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -223,6 +224,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -257,6 +259,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml index 12c337f34c..453d68e7d2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-local-jwks.out.yaml @@ -363,6 +363,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -374,6 +375,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -408,6 +410,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -453,6 +456,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -498,6 +502,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -543,6 +548,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml index 9dfc0f50f5..2b529a5632 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml @@ -285,6 +285,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -296,6 +297,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -330,6 +332,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -376,6 +379,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -387,6 +391,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -421,6 +426,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml index 28eab19759..d21a07fe30 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml @@ -195,6 +195,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -206,6 +207,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -240,6 +242,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml index 9d505a285d..ba12ab0e71 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml @@ -284,6 +284,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -295,6 +296,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -329,6 +331,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -375,6 +378,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -386,6 +390,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -420,6 +425,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml index 54ce075cb2..98f9ffd66d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml @@ -276,6 +276,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -287,6 +288,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -321,6 +323,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -367,6 +370,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -378,6 +382,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -412,6 +417,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml index 70d2be4252..f97e1cbb2d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml @@ -148,6 +148,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -159,6 +160,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -193,6 +195,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml index 1278cc27a6..1aa65813f0 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml @@ -217,6 +217,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -228,6 +229,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -262,6 +264,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml index 464c14163e..3f800e8cff 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml @@ -202,6 +202,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +214,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -247,6 +249,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml index 036c5b6fa1..901ae6bf4e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies-samesite.out.yaml @@ -145,6 +145,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -156,6 +157,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -190,6 +192,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml index 346e1ca450..fb4acacb62 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml @@ -143,6 +143,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -154,6 +155,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -188,6 +190,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml index 1627e097df..d1515b0847 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-deny-redirect.out.yaml @@ -159,6 +159,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -170,6 +171,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -204,6 +206,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml index 95ddb1ef79..58f004b0bb 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml @@ -101,6 +101,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -112,6 +113,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml index 6575a879f2..d3e53e4552 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml @@ -289,6 +289,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -300,6 +301,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-1-bfd08ef4 namespace: envoy-gateway-system sectionName: "8080" @@ -333,6 +335,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -344,6 +347,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-2-5e70ed84 namespace: envoy-gateway-system sectionName: "8080" @@ -377,6 +381,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" @@ -388,6 +393,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-default-gateway-3-206418d2 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml index a5886bd2da..ac094d9aaa 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-serviceimport.out.yaml @@ -200,6 +200,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -211,6 +212,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -245,6 +247,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml index c3afcae246..f4c0186abd 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -319,6 +319,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -330,6 +331,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -364,6 +366,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -418,6 +421,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -467,6 +471,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml index 673ae28de1..7486b9cbc9 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml @@ -169,6 +169,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -180,6 +181,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -213,6 +215,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -259,6 +262,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml b/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml index 8cc3269631..2c9fcb3c07 100644 --- a/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-rule-with-multiple-backends-and-zero-weights.out.yaml @@ -105,6 +105,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -116,6 +117,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -160,6 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" @@ -171,6 +175,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-3 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tcproute-securitypolicy-with-authorization-client-cidr.out.yaml b/internal/gatewayapi/testdata/tcproute-securitypolicy-with-authorization-client-cidr.out.yaml index f13c4c29b6..736361cb88 100644 --- a/internal/gatewayapi/testdata/tcproute-securitypolicy-with-authorization-client-cidr.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-securitypolicy-with-authorization-client-cidr.out.yaml @@ -535,6 +535,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-mixed-94aaf8eb namespace: envoy-gateway-system sectionName: "8080" @@ -546,6 +547,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-mixed-94aaf8eb namespace: envoy-gateway-system sectionName: "8080" @@ -580,6 +582,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -658,6 +661,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -676,6 +680,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-tcp-093cb215 namespace: envoy-gateway-system sectionName: "8080" @@ -687,6 +692,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-tcp-093cb215 namespace: envoy-gateway-system sectionName: "8080" @@ -732,6 +738,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" @@ -777,6 +784,7 @@ xdsIR: - host: 7.7.7.7 port: 8163 metadata: + kind: Service name: service-1 namespace: default sectionName: "8163" diff --git a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml index 67fa72d926..fcfbc77805 100644 --- a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index 01bdeae294..e75f129d47 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -98,6 +98,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -109,6 +110,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -142,6 +144,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml b/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml index 1cc63618ff..ef5ec01c4a 100644 --- a/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-invalid-reference-grant.out.yaml @@ -101,6 +101,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-gateway-conformance-infra-gateway-tlsroute-refer-1a02781b namespace: envoy-gateway-system sectionName: "8080" @@ -112,6 +113,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-gateway-conformance-infra-gateway-tlsroute-refer-1a02781b namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index b33107517a..72254f18f1 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -131,6 +131,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -142,6 +143,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -175,6 +177,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -202,6 +205,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml index 5af2e3eab0..5a7b2c7289 100644 --- a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml @@ -84,6 +84,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -95,6 +96,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml index 72bf40abfd..de5e1611c6 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml @@ -117,6 +117,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -128,6 +129,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index e11ea1a209..51ca08163b 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index efe46b743c..b35037633b 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -97,6 +97,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -108,6 +109,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -141,6 +143,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml index 216140209d..8a5fc6d222 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -99,6 +99,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -110,6 +111,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -143,6 +145,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml index 0934488c40..95283df48a 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml @@ -89,6 +89,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -100,6 +101,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml index 1b112b4fc1..87a637bf8a 100644 --- a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml @@ -231,6 +231,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -242,6 +243,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -276,6 +278,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -336,6 +339,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml index 817088ea1c..196fa4be66 100644 --- a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml @@ -259,6 +259,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -270,6 +271,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -304,6 +306,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -355,6 +358,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -366,6 +370,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-2-4a0e4eb9 namespace: envoy-gateway-system sectionName: "8080" @@ -415,6 +420,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml b/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml index f5a9ec338b..9eb5ad2bef 100644 --- a/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml +++ b/internal/gatewayapi/testdata/tracing-sampling-fraction.out.yaml @@ -233,6 +233,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -244,6 +245,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-class-3b1df594 namespace: envoy-gateway-system sectionName: "8080" @@ -278,6 +280,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-1 namespace: default sectionName: "8080" @@ -338,6 +341,7 @@ xdsIR: - host: 7.7.7.7 port: 8080 metadata: + kind: Service name: service-2 namespace: default sectionName: "8080" diff --git a/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml b/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml index 9e3ac340b5..b72f033624 100644 --- a/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml +++ b/internal/gatewayapi/testdata/udproute-rule-with-multiple-backends-and-zero-weights.out.yaml @@ -105,6 +105,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -116,6 +117,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -149,6 +151,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-1 namespace: default sectionName: "8162" @@ -160,6 +163,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-2 namespace: default sectionName: "8162" @@ -171,6 +175,7 @@ xdsIR: - host: 7.7.7.7 port: 8162 metadata: + kind: Service name: service-3 namespace: default sectionName: "8162" diff --git a/internal/gatewayapi/testdata/udproute-with-backend.out.yaml b/internal/gatewayapi/testdata/udproute-with-backend.out.yaml index 26e439776b..c2c6637283 100644 --- a/internal/gatewayapi/testdata/udproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/udproute-with-backend.out.yaml @@ -115,6 +115,7 @@ xdsIR: globalResources: proxyServiceCluster: metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" @@ -126,6 +127,7 @@ xdsIR: port: 8080 zone: zone1 metadata: + kind: Service name: envoy-envoy-gateway-gateway-1-196ae069 namespace: envoy-gateway-system sectionName: "8080" diff --git a/internal/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go index 2a8432c278..a50f43f921 100644 --- a/internal/gatewayapi/translator_test.go +++ b/internal/gatewayapi/translator_test.go @@ -131,6 +131,10 @@ func TestTranslate(t *testing.T) { epSliceName := "endpointslice-" + strconv.Itoa(i) svc := &corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ Namespace: "default", Name: svcName, @@ -171,6 +175,10 @@ func TestTranslate(t *testing.T) { resources.Services = append(resources.Services, svc) endptSlice := &discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: epSliceName, Namespace: "default", @@ -224,6 +232,10 @@ func TestTranslate(t *testing.T) { } resources.Services = append(resources.Services, &corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ Namespace: "default", Name: "mirror-service", @@ -243,6 +255,10 @@ func TestTranslate(t *testing.T) { ) resources.EndpointSlices = append(resources.EndpointSlices, &discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: "mirror-service-endpointslice", Namespace: "default", @@ -274,6 +290,10 @@ func TestTranslate(t *testing.T) { // add otel-collector service resources.Services = append(resources.Services, &corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ Namespace: "monitoring", Name: "otel-collector", @@ -300,6 +320,10 @@ func TestTranslate(t *testing.T) { ) resources.EndpointSlices = append(resources.EndpointSlices, &discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: "otel-collector-endpointslice", Namespace: "monitoring", @@ -334,6 +358,10 @@ func TestTranslate(t *testing.T) { ) svc := corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ // Matches proxy.ExpectedResourceHashedName() Name: fmt.Sprintf("%s-%s", config.EnvoyPrefix, utils.GetHashedName(string(translator.GatewayClassName), 48)), @@ -354,6 +382,10 @@ func TestTranslate(t *testing.T) { } endPtSlice := discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: svc.Name, Namespace: svc.Namespace, @@ -412,10 +444,18 @@ func TestTranslate(t *testing.T) { } resources.Namespaces = append(resources.Namespaces, &corev1.Namespace{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Namespace", + }, ObjectMeta: metav1.ObjectMeta{ Name: "envoy-gateway", }, }, &corev1.Namespace{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Namespace", + }, ObjectMeta: metav1.ObjectMeta{ Name: "default", }, @@ -481,6 +521,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { epSliceName := "endpointslice-" + strconv.Itoa(i) resources.Services = append(resources.Services, &corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ Namespace: "default", Name: svcName, @@ -518,6 +562,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { ) resources.EndpointSlices = append(resources.EndpointSlices, &discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: epSliceName, Namespace: "default", @@ -564,6 +612,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { resources.Services = append(resources.Services, &corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ Namespace: "default", Name: "mirror-service", @@ -582,6 +634,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { ) resources.EndpointSlices = append(resources.EndpointSlices, &discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: "mirror-service-endpointslice", Namespace: "default", @@ -611,6 +667,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { ) svc := corev1.Service{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Service", + }, ObjectMeta: metav1.ObjectMeta{ // Matches proxy.ExpectedResourceHashedName() Name: fmt.Sprintf("%s-%s", config.EnvoyPrefix, utils.GetHashedName(string(translator.GatewayClassName), 48)), @@ -631,6 +691,10 @@ func TestTranslateWithExtensionKinds(t *testing.T) { } endPtSlice := discoveryv1.EndpointSlice{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "discovery.k8s.io/v1", + Kind: "EndpointSlice", + }, ObjectMeta: metav1.ObjectMeta{ Name: svc.Name, Namespace: svc.Namespace, @@ -687,10 +751,18 @@ func TestTranslateWithExtensionKinds(t *testing.T) { } resources.Namespaces = append(resources.Namespaces, &corev1.Namespace{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Namespace", + }, ObjectMeta: metav1.ObjectMeta{ Name: "envoy-gateway", }, }, &corev1.Namespace{ + TypeMeta: metav1.TypeMeta{ + APIVersion: "v1", + Kind: "Namespace", + }, ObjectMeta: metav1.ObjectMeta{ Name: "default", },