Skip to content

Commit

Permalink
fix GatewayInfrastructure comformance test
Browse files Browse the repository at this point in the history
Signed-off-by: Huabing Zhao <[email protected]>
  • Loading branch information
zhaohuabing committed Sep 25, 2024
1 parent ae3c01c commit 1b20f32
Show file tree
Hide file tree
Showing 327 changed files with 401 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: eg
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway-system
gateway.networking.k8s.io/gateway-name: eg
name: envoy-gateway-system/eg
xdsIR:
envoy-gateway-system/eg:
Expand Down
19 changes: 19 additions & 0 deletions internal/gatewayapi/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,25 @@ func OwnerLabels(gateway *gwapiv1.Gateway, mergeGateways bool) map[string]string
return GatewayOwnerLabels(gateway.Namespace, gateway.Name)
}

func GatewayNameLabel(name string) map[string]string {
return map[string]string{
GatewayAPIGatewayNameLabel: name,
}
}

// All gateway names are concatenated and stored in a single label if mergeGateways is enabled.
// Probably not the best way to do this, should revisit this and come up with a better solution upstream.
func GatewayNameLabelForMergeGateways(gateways []*GatewayContext) map[string]string {
var owningGatewayNames string
for _, gateway := range gateways {
owningGatewayNames = owningGatewayNames + gateway.Name + ","
}
owningGatewayNames = strings.TrimSuffix(owningGatewayNames, ",")
return map[string]string{
GatewayAPIGatewayNameLabel: owningGatewayNames,
}
}

// servicePortToContainerPort translates a service port into an ephemeral
// container port.
func servicePortToContainerPort(servicePort int32, envoyProxy *egv1a1.EnvoyProxy) int32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
envoy-gateway/gateway-btls2:
proxy:
Expand All @@ -259,6 +260,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls2
name: envoy-gateway/gateway-btls2
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-btls
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-btls
name: envoy-gateway/gateway-btls
xdsIR:
envoy-gateway/gateway-btls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -242,6 +243,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -242,6 +243,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -242,6 +243,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: not-same-namespace-gateway
gateway.envoyproxy.io/owning-gateway-namespace: another-namespace
gateway.networking.k8s.io/gateway-name: not-same-namespace-gateway
name: another-namespace/not-same-namespace-gateway
envoy-gateway/gateway-1:
proxy:
Expand All @@ -492,6 +493,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -514,6 +516,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
another-namespace/not-same-namespace-gateway:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -322,6 +323,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -304,6 +305,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -246,6 +247,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -311,6 +312,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -671,6 +672,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -244,6 +245,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -414,6 +415,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
envoy-gateway/gateway-2:
proxy:
Expand All @@ -238,6 +239,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-2
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-2
name: envoy-gateway/gateway-2
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ infraIR:
labels:
gateway.envoyproxy.io/owning-gateway-name: gateway-1
gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
gateway.networking.k8s.io/gateway-name: gateway-1
name: envoy-gateway/gateway-1
xdsIR:
envoy-gateway/gateway-1:
Expand Down
Loading

0 comments on commit 1b20f32

Please sign in to comment.