Repository: envoyproxy/gateway

Issue:
DNS errors from gateway
*Description*:
>What issue is being seen? Describe what should be happening instead of
the bug, for example: The expected value isn't returned, etc.

A lot of failed DNS requests are sent by the gateway. Seemingly DNS suffixes like cluster.local seems to be appended by envoy, in addition to the search domain.

*Repro steps*:
> Include sample requests, environment, etc. All data and inputs
required to reproduce the bug.

>**Note**: If there are privacy concerns, sanitize the data prior to
sharing.

Set up envoy gateway in gatewaynamespace mode (unsure if this is needed or not), with the control plane in on namespace and the gateway in another namespace.

```yaml
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
  name: envoy-gw-controller
  namespace: envoy-gw-controller
spec:
  interval: 5m
  chart:
    spec:
      chart: gateway-helm
      version: "1.4.2"
      sourceRef:
        kind: HelmRepository
        name: envoy-repo
        namespace: envoy-gw-controller
      interval: 5m
  values:
    createNamespace: false
    deployment:
      replicas: 3
      priorityClassName: system-cluster-critical
    config:
      envoyGateway:
        provider:
          type: Kubernetes
          kubernetes:
            deploy:
              type: GatewayNamespace

---
apiVersion: gateway.networking.k8s.io/v1
kind: Gateway
metadata:
  name: envoy-internal
  namespace: envoy-gw-internal
  annotations:
    cert-manager.io/private-key-algorithm: ECDSA
    cert-manager.io/cluster-issuer: "issuer"
spec:
  gatewayClassName: eg
  infrastructure:
    parametersRef:
      group: gateway.envoyproxy.io
      kind: EnvoyProxy
      name: custom-proxy-config
  listeners:
    - name: http
      protocol: HTTP
      port: 80
      allowedRoutes:
        namespaces:
          from: Same
    - name: https
      protocol: HTTPS
      port: 443
      hostname: "*.example.com"
      tls:
        mode: Terminate
        certificateRefs:
          - kind: Secret
            group: ""
            name: example-cert
      allowedRoutes:
        namespaces:
          from: All

---
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: EnvoyProxy
metadata:
  name: custom-proxy-config
  namespace: envoy-gw-internal
spec:
  telemetry:
    accessLog:
      disable: false
  logging:
    level:
      default: info
      upstream: info
      http: info
      connection: info
      admin: info
      client: info
      filter: info
      main: info
      router: info
      runtime: info
  ipFamily: IPv4
  provider:
    type: Kubernetes
    kubernetes:
      envoyDaemonSet:
        pod:
          labels:
            example.com/gateway: envoy-internal
      envoyPDB:
        minAvailable: 1

```

*Environment*:
>Include the environment like gateway version, envoy version and so on.

gateway version: 1.4.2
Running on talos 1.10.5
Kubernetes version: 1.33.2

*Logs*:

>Include the access logs and the Envoy logs.

Envoy gateway logs:
```
[2025-07-24 18:17:39.709][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:198] dns resolution without records for envoy-gateway.envoy-gw-controller.svc.cluster.local c-ares status 0x0001: "DNS server returned answer with no data"
[2025-07-24 18:17:39.709][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.710][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.710][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.710][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.711][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:327] dns resolution for envoy-gateway.envoy-gw-controller.svc.cluster.local completed with status 0x0000: "cares_success:Successful completion"
[2025-07-24 18:17:39.711][1][trace][upstream] [source/extensions/clusters/strict_dns/strict_dns_cluster.cc:136] async DNS resolution complete for envoy-gateway.envoy-gw-controller.svc.cluster.local details cares_success:Successful completion
[2025-07-24 18:17:39.711][1][debug][upstream] [source/extensions/clusters/strict_dns/strict_dns_cluster.cc:218] DNS refresh rate reset for envoy-gateway.envoy-gw-controller.svc.cluster.local, refresh rate 5000 ms
[2025-07-24 18:17:39.731][1][trace][upstream] [source/extensions/clusters/strict_dns/strict_dns_cluster.cc:128] starting async DNS resolution for envoy-gateway
[2025-07-24 18:17:39.731][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:442] dns resolution for envoy-gateway started
[2025-07-24 18:17:39.732][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.732][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.733][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.733][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.735][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:198] dns resolution without records for envoy-gateway c-ares status 0x0004: "Domain name not found"
[2025-07-24 18:17:39.735][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.735][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.735][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.736][1][trace][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:369] Setting DNS resolution timer for 249 milliseconds
[2025-07-24 18:17:39.737][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:198] dns resolution without records for envoy-gateway c-ares status 0x0004: "Domain name not found"
[2025-07-24 18:17:39.737][1][debug][dns] [source/extensions/network/dns_resolver/cares/dns_impl.cc:327] dns resolution for envoy-gateway completed with status 0x0000: "cares_norecords:Domain name not found"
[2025-07-24 18:17:39.737][1][trace][upstream] [source/extensions/clusters/strict_dns/strict_dns_cluster.cc:136] async DNS resolution complete for envoy-gateway details cares_norecords:Domain name not found
```
CoreDNS logs:
```
[INFO] 10.244.1.102:58732 - 34725 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.002040529s
[INFO] 10.244.1.102:58732 - 3828 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.000765691s
[INFO] 10.244.1.102:58732 - 58547 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.001872525s
[INFO] 10.244.1.102:58732 - 60901 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.001831374s
[INFO] 10.244.1.102:58732 - 18043 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.003827614s
[INFO] 10.244.1.102:58732 - 25089 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.001820874s
[INFO] 10.244.1.102:37838 - 33128 "AAAA IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.001562381s
[INFO] 10.244.1.102:37838 - 36137 "AAAA IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000782551s
[INFO] 10.244.1.102:37838 - 26430 "AAAA IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.000937965s
[INFO] 10.244.1.102:37838 - 61923 "AAAA IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.004885308s
[INFO] 10.244.1.102:37838 - 37450 "A IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000476925s
[INFO] 10.244.1.102:37838 - 19246 "A IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.001248999s
[INFO] 10.244.1.102:37838 - 62253 "A IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.001670018s
[INFO] 10.244.1.102:37838 - 15005 "A IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.002954977s
[INFO] 10.244.1.128:46574 - 48751 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.001329997s
[INFO] 10.244.1.128:46574 - 40042 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.00026195s
[INFO] 10.244.1.128:46574 - 50563 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.001909229s
[INFO] 10.244.1.128:46574 - 19344 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.000871454s
[INFO] 10.244.1.128:46574 - 64051 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.001349888s
[INFO] 10.244.1.128:46574 - 47486 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.002453649s
[INFO] 10.244.1.128:46779 - 11805 "AAAA IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000301923s
[INFO] 10.244.1.128:46779 - 23890 "AAAA IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000316226s
[INFO] 10.244.1.128:46779 - 43851 "AAAA IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.000319296s
[INFO] 10.244.1.128:46779 - 3422 "AAAA IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.000735963s
[INFO] 10.244.1.128:46779 - 14479 "A IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000180952s
[INFO] 10.244.1.128:46779 - 33811 "A IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000885357s
[INFO] 10.244.1.128:46779 - 48772 "A IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.000329477s
[INFO] 10.244.1.128:46779 - 53177 "A IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.000924314s
[INFO] 10.244.1.102:34243 - 8355 "AAAA IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000898254s
[INFO] 10.244.1.102:34243 - 54405 "AAAA IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000634827s
[INFO] 10.244.1.102:34243 - 63534 "AAAA IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.000394208s
[INFO] 10.244.1.102:34243 - 35028 "AAAA IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.001901437s
[INFO] 10.244.1.102:34243 - 55952 "A IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000827729s
[INFO] 10.244.1.102:34243 - 45344 "A IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000158947s
[INFO] 10.244.1.102:34243 - 14728 "A IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.003071823s
[INFO] 10.244.1.102:34243 - 14053 "A IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.002720067s
[INFO] 10.244.1.240:53743 - 28427 "AAAA IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.000431466s
[INFO] 10.244.1.240:53743 - 43014 "AAAA IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.001666632s
[INFO] 10.244.1.240:53743 - 47739 "AAAA IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.003569857s
[INFO] 10.244.1.240:53743 - 27369 "AAAA IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.002421474s
[INFO] 10.244.1.240:53743 - 43506 "A IN envoy-gateway.envoy-gw-internal.svc.cluster.local. udp 78 false 1232" NXDOMAIN qr,aa,rd 160 0.003720997s
[INFO] 10.244.1.240:53743 - 30442 "A IN envoy-gateway.svc.cluster.local. udp 60 false 1232" NXDOMAIN qr,aa,rd 142 0.000480444s
[INFO] 10.244.1.240:53743 - 44032 "A IN envoy-gateway.cluster.local. udp 56 false 1232" NXDOMAIN qr,aa,rd 138 0.002697351s
[INFO] 10.244.1.240:53743 - 49096 "A IN envoy-gateway. udp 42 false 1232" NXDOMAIN qr,rd,ra 31 0.001877121s
[INFO] 10.244.1.102:50892 - 51216 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.000349883s
[INFO] 10.244.1.102:50892 - 35576 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.001060047s
[INFO] 10.244.1.102:50892 - 3840 "AAAA IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.002569729s
[INFO] 10.244.1.102:50892 - 10745 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.envoy-gw-internal.svc.cluster.local. udp 116 false 1232" NXDOMAIN qr,aa,rd 198 0.002709348s
[INFO] 10.244.1.102:50892 - 50192 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.svc.cluster.local. udp 98 false 1232" NXDOMAIN qr,aa,rd 180 0.001459804s
[INFO] 10.244.1.102:50892 - 49561 "A IN envoy-gateway.envoy-gw-controller.svc.cluster.local.cluster.local. udp 94 false 1232" NXDOMAIN qr,aa,rd 176 0.000952039s
```

Discussion:

Solution patch:
diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go
index 19e906404..a33238774 100644
--- a/internal/infrastructure/kubernetes/proxy/resource.go
+++ b/internal/infrastructure/kubernetes/proxy/resource.go
@@ -108,7 +108,7 @@ func expectedProxyContainers(infra *ir.ProxyInfra,
 			TrustedCA:   filepath.Join("/sds", common.SdsCAFilename),
 		},
 		MaxHeapSizeBytes: maxHeapSizeBytes,
-		XdsServerHost:    ptr.To(fmt.Sprintf("%s.%s.svc.%s", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)),
+		XdsServerHost:    ptr.To(fmt.Sprintf("%s.%s.svc.%s.", config.EnvoyGatewayServiceName, controllerNamespace, dnsDomain)),
 	}
 
 	args, err := common.BuildProxyArgs(infra, shutdownConfig, bootstrapConfigOptions, fmt.Sprintf("$(%s)", envoyPodEnvVar), gatewayNamespaceMode)



Test patch:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
index 5a5681090..5d74e81b9 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -156,7 +156,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
index eb3cb2d11..31c8b27a6 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
index 85493cc19..a04aec279 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
index 5798d2886..9cfdd71cb 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
@@ -104,7 +104,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
index 8da12ec97..258a02550 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml
index 188674644..ebcc1b260 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/gateway-namespace-mode.yaml
@@ -158,7 +158,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
index 692f9b5b5..63e9dad95 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
@@ -164,7 +164,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml
index 099d5a225..0479f16f8 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-prometheus-annotations.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
index 405926768..68e7da215 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
index 78cc0b6b2..9c5436b1c 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
index 78da341b7..fc05f9e29 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
index f13e24005..798cf1d05 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
index 639532931..d47529754 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
index d3bfde68a..ec113b1bc 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
index 72939b575..11d5eb379 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
index 277bee2f3..cac89239f 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml
index 0a174dcbc..188b00c9d 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml
@@ -155,7 +155,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml
index ecae105bc..a2794cc18 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom-sa.yaml
@@ -162,7 +162,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
index e96b837aa..004ea40cf 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
@@ -161,7 +161,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
index 0088db13c..c07b52b20 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
@@ -161,7 +161,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
index 251f7fecf..d85c8e4e3 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
index 2d104ca9d..92372f5f1 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
index 0d988425b..8dcf1a0f3 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
@@ -108,7 +108,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml
index fa3d0304a..c31810e5b 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
index 2ba927e8f..7a0a07363 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml
index abaa6eaa3..1db514af8 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/gateway-namespace-mode.yaml
@@ -162,7 +162,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml
index 0b5f26b8a..fdcd25395 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
index fd8320a49..d95171bdf 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
@@ -168,7 +168,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml
index 7a7fe26c7..1ee6a497a 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-prometheus-annotations.yaml
@@ -161,7 +161,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
index 75b5c0466..cdaa6d5ec 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
index 61098fcd5..342728328 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
index 57a77172e..630174839 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
@@ -160,7 +160,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
index 1e46ab65a..2bb36b2e7 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
@@ -164,7 +164,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml
index 8fddca291..df691645c 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
index b9f6849ae..4fd9b0bf9 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
index d40f50a44..f9616507d 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml
index 5dcc3df82..ba964d2a2 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
index ef27a5ff9..905f3d706 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
index 6d81fc846..a1fee33ef 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
@@ -159,7 +159,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
diff --git a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml
index 8d1198c7e..643cb90d4 100644
--- a/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml
+++ b/internal/infrastructure/kubernetes/proxy/testdata/gateway-namespace-mode/deployment.yaml
@@ -162,7 +162,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
@@ -576,7 +576,7 @@ spec:
                     endpoint:
                       address:
                         socket_address:
-                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local
+                          address: envoy-gateway.envoy-gateway-system.svc.cluster.local.
                           port_value: 18000
               typed_extension_protocol_options:
                 envoy.extensions.upstreams.http.v3.HttpProtocolOptions: