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

Merge pull request #4357 from zhangxiaoyu-zidif/fix-check-kube-version 

modify check require-kubeconfig kube version
This commit is contained in:
k8s-ci-robot 2018-02-02 07:30:07 -08:00 committed by GitHub
parent 9d9646d0ce 30b10cb1c8
commit 4e284e9966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
}