Skip to content

Commit bbbf396

Browse files
committed
make elasticsearch discovery supports IPv6
1 parent d87c921 commit bbbf396

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cluster/addons/fluentd-elasticsearch/es-image/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ go_library(
2323
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
2424
"//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library",
2525
"//vendor/k8s.io/klog:go_default_library",
26+
"//vendor/k8s.io/utils/net:go_default_library",
2627
],
2728
)
2829

cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/client-go/tools/clientcmd"
3232
clientapi "k8s.io/client-go/tools/clientcmd/api"
3333
"k8s.io/klog"
34+
utilnet "k8s.io/utils/net"
3435
)
3536

3637
func buildConfigFromEnvs(masterURL, kubeconfigPath string) (*restclient.Config, error) {
@@ -52,7 +53,11 @@ func flattenSubsets(subsets []corev1.EndpointSubset) []string {
5253
ips := []string{}
5354
for _, ss := range subsets {
5455
for _, addr := range ss.Addresses {
55-
ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP))
56+
if utilnet.IsIPv6String(addr.IP) {
57+
ips = append(ips, fmt.Sprintf(`"[%s]"`, addr.IP))
58+
} else {
59+
ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP))
60+
}
5661
}
5762
}
5863
return ips

0 commit comments

Comments
 (0)