github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85543 from SataQiu/fix-elasticsearch-20191122

Browse Source 
Make elasticsearch discovery supports IPv6
This commit is contained in:
Kubernetes Prow Robot 2019-11-30 18:31:03 -08:00 committed by GitHub
commit 650c797d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/fluentd-elasticsearch/es-image/BUILD
View File

@ -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:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd/api: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/klog:go_default_library",
"//vendor/k8s.io/utils/net:go_default_library",
], ],
) )

5
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View File

@ -31,6 +31,7 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
clientapi "k8s.io/client-go/tools/clientcmd/api" clientapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/klog" "k8s.io/klog"
utilnet "k8s.io/utils/net"
) )
func buildConfigFromEnvs(masterURL, kubeconfigPath string) (*restclient.Config, error) { func buildConfigFromEnvs(masterURL, kubeconfigPath string) (*restclient.Config, error) {
@ -52,9 +53,13 @@ func flattenSubsets(subsets []corev1.EndpointSubset) []string {
ips := []string{} ips := []string{}
for _, ss := range subsets { for _, ss := range subsets {
for _, addr := range ss.Addresses { for _, addr := range ss.Addresses {
if utilnet.IsIPv6String(addr.IP) {
ips = append(ips, fmt.Sprintf(`"[%s]"`, addr.IP))
} else {
ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP)) ips = append(ips, fmt.Sprintf(`"%s"`, addr.IP))
} }
} }
}
return ips return ips
} }