kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1561 from justinsb/resolve_by_ip_first 

Resolve nodes by IP before trying by name
This commit is contained in:
Kris Nova 2017-01-20 20:04:41 -07:00 committed by GitHub
parent 2731a354d5 35f878c620
commit ef5e2fdae8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/model/components/apiserver.go
View File

@ -18,9 +18,11 @@ package components
import ( import (
"fmt" "fmt"
"github.com/blang/semver"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/loader" "k8s.io/kops/upup/pkg/fi/loader"
"k8s.io/kubernetes/pkg/api"
) )
// KubeAPIServerOptionsBuilder adds options for the apiserver to the model // KubeAPIServerOptionsBuilder adds options for the apiserver to the model
@ -49,6 +51,30 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
options.KubeAPIServer.StorageBackend = fi.String("etcd2") options.KubeAPIServer.StorageBackend = fi.String("etcd2")
} }
k8sVersion, err := b.Context.KubernetesVersion()
if err != nil {
return err
}
if options.KubeAPIServer.KubeletPreferredAddressTypes == nil {
if k8sVersion.GTE(semver.MustParse("1.5.0")) {
// Default precedence
//options.KubeAPIServer.KubeletPreferredAddressTypes = []string {
// string(api.NodeHostName),
// string(api.NodeInternalIP),
// string(api.NodeExternalIP),
// string(api.NodeLegacyHostIP),
//}
// We prioritize the internal IP above the hostname
options.KubeAPIServer.KubeletPreferredAddressTypes = []string{
string(api.NodeInternalIP),
string(api.NodeHostName),
string(api.NodeExternalIP),
string(api.NodeLegacyHostIP),
}
}
}
return nil return nil
} }