fix: fix the testdata

Signed-off-by: Kensei Nakada <handbomusic@gmail.com>
envoyproxy · Aug 3, 2024 · d86df6a · d86df6a
1 parent e8c6ebf
commit d86df6a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/internal/infrastructure/kubernetes/proxy/resource_provider.go b/internal/infrastructure/kubernetes/proxy/resource_provider.go
@@ -195,7 +195,14 @@ func (r *ResourceRender) ConfigMap() (*corev1.ConfigMap, error) {
 // stableSelector returns a stable selector based on the owning gateway labels.
 // "stable" here means the selector doesn't change when the infra is updated.
 func (r *ResourceRender) stableSelector() *metav1.LabelSelector {
-	return resource.GetSelector(envoyLabels(r.infra.GetProxyMetadata().Labels))
+	labels := map[string]string{}
+	for k, v := range r.infra.GetProxyMetadata().Labels {
+		if k == gatewayapi.OwningGatewayNameLabel || k == gatewayapi.OwningGatewayNamespaceLabel || k == gatewayapi.OwningGatewayClassLabel {
+			labels[k] = v
+		}
+	}
+
+	return resource.GetSelector(envoyLabels(labels))
 }
 
 // Deployment returns the expected Deployment based on the provided infra.

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -16,7 +16,6 @@ spec:
       app.kubernetes.io/component: proxy
       app.kubernetes.io/managed-by: envoy-gateway
       app.kubernetes.io/name: envoy
-      foo.bar: custom-label
       gateway.envoyproxy.io/owning-gateway-name: default
       gateway.envoyproxy.io/owning-gateway-namespace: default
   template:

diff --git a/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
@@ -23,8 +23,6 @@ spec:
       app.kubernetes.io/name: envoy
       gateway.envoyproxy.io/owning-gateway-name: default
       gateway.envoyproxy.io/owning-gateway-namespace: default
-      label1: value1-override
-      label2: value2
   template:
     metadata:
       annotations:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
@@ -19,7 +19,6 @@ spec:
       app.kubernetes.io/component: proxy
       app.kubernetes.io/managed-by: envoy-gateway
       app.kubernetes.io/name: envoy
-      foo.bar: custom-label
       gateway.envoyproxy.io/owning-gateway-name: default
       gateway.envoyproxy.io/owning-gateway-namespace: default
   strategy:

diff --git a/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
@@ -19,7 +19,6 @@ spec:
       app.kubernetes.io/component: proxy
       app.kubernetes.io/managed-by: envoy-gateway
       app.kubernetes.io/name: envoy
-      foo.bar: custom-label
       gateway.envoyproxy.io/owning-gateway-name: default
       gateway.envoyproxy.io/owning-gateway-namespace: default
   strategy:

diff --git a/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
@@ -25,8 +25,6 @@ spec:
       app.kubernetes.io/name: envoy
       gateway.envoyproxy.io/owning-gateway-name: default
       gateway.envoyproxy.io/owning-gateway-namespace: default
-      label1: value1-override
-      label2: value2
   strategy:
     type: RollingUpdate
   template: