diff --git a/cluster/addons/fluentd-elasticsearch/es-image/BUILD b/cluster/addons/fluentd-elasticsearch/es-image/BUILD
index b878eb61d94..12d3db79d10 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/BUILD
+++ b/cluster/addons/fluentd-elasticsearch/es-image/BUILD
@@ -23,6 +23,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/net:go_default_library",
     ],
 )
 
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
index d4b137b83e2..8ac27dcfb75 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
+++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/klog"
+	utilnet "k8s.io/utils/net"
 )
 
 func buildConfigFromEnvs(masterURL, kubeconfigPath string) (*restclient.Config, error) {
@@ -52,7 +53,11 @@ func flattenSubsets(subsets []corev1.EndpointSubset) []string {
 	ips := []string{}
 	for _, ss := range subsets {
 		for _, addr := range ss.Addresses {
-			ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP))
+			if utilnet.IsIPv6String(addr.IP) {
+				ips = append(ips, fmt.Sprintf(`"[%s]"`, addr.IP))
+			} else {
+				ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP))
+			}
 		}
 	}
 	return ips