Skip to content

Commit

Permalink
Merge pull request #4357 from zhangxiaoyu-zidif/fix-check-kube-version
Browse files Browse the repository at this point in the history
modify check require-kubeconfig kube version
  • Loading branch information
k8s-ci-robot authored Feb 2, 2018
2 parents 9d9646d + 30b10cb commit 4e284e9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/model/components/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.Kubelet.KubeconfigPath = kubeconfigPath
clusterSpec.MasterKubelet.KubeconfigPath = kubeconfigPath

// Only pass require-kubeconfig to versions prior to 1.10; deprecated & being removed
if b.Context.IsKubernetesLT("1.10") {
// Only pass require-kubeconfig to versions prior to 1.9; deprecated & being removed
if b.Context.IsKubernetesLT("1.9") {
clusterSpec.Kubelet.RequireKubeconfig = fi.Bool(true)
clusterSpec.MasterKubelet.RequireKubeconfig = fi.Bool(true)
}
Expand Down

0 comments on commit 4e284e9

Please sign in to comment.