From 4dccf6d56d6d7b1881e8bda6edc3f722775942d5 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 20 Jan 2018 17:57:58 -0500 Subject: [PATCH] Don't specify require-kubeconfig from 1.10 Should fix https://github.com/kubernetes/kubernetes/pull/58367 --- pkg/model/components/kubelet.go | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go index a210e3bf58..29323f5431 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -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