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

Merge pull request #4308 from justinsb/stop_specifying_require_kubeconfig 

Don't specify require-kubeconfig from 1.10
This commit is contained in:
k8s-ci-robot 2018-01-23 15:44:01 -08:00 committed by GitHub
parent 64882790e7 4dccf6d56d
commit b68ff3893f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/model/components/kubelet.go
View File

@ -114,16 +114,21 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
}
}
if kubernetesVersion.Major == 1 && kubernetesVersion.Minor <= 5 {
clusterSpec.Kubelet.APIServers = "https://" + clusterSpec.MasterInternalName
clusterSpec.MasterKubelet.APIServers = "http://127.0.0.1:8080"
} else if kubernetesVersion.Major == 1 { // for 1.6+ use kubeconfig instead of api-servers
if b.Context.IsKubernetesGTE("1.6") {
// for 1.6+ use kubeconfig instead of api-servers
const kubeconfigPath = "/var/lib/kubelet/kubeconfig"
clusterSpec.Kubelet.KubeconfigPath = kubeconfigPath
clusterSpec.Kubelet.RequireKubeconfig = fi.Bool(true)
clusterSpec.MasterKubelet.KubeconfigPath = kubeconfigPath
clusterSpec.MasterKubelet.RequireKubeconfig = fi.Bool(true)
// Only pass require-kubeconfig to versions prior to 1.10; deprecated & being removed
if b.Context.IsKubernetesLT("1.10") {
clusterSpec.Kubelet.RequireKubeconfig = fi.Bool(true)
clusterSpec.MasterKubelet.RequireKubeconfig = fi.Bool(true)
}
} else {
// Legacy behaviour for <= 1.5
clusterSpec.Kubelet.APIServers = "https://" + clusterSpec.MasterInternalName
clusterSpec.MasterKubelet.APIServers = "http://127.0.0.1:8080"
}
// IsolateMasters enables the legacy behaviour, where master pods on a separate network