Remove deprecated '--require-kubeconfig' for k8s (#2365)

* Remove deprecated --require-kubeconfig * adding —require-kubeconfig back to 1.7j * less than is what we want here
Azure · Mar 5, 2018 · 74f2ef1 · 74f2ef1
1 parent 06521d5
commit 74f2ef1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/parts/k8s/artifacts/kuberneteskubelet.service b/parts/k8s/artifacts/kuberneteskubelet.service
@@ -37,7 +37,6 @@ ExecStart=/usr/bin/docker run \
   --volume=/etc/kubernetes/volumeplugins:/etc/kubernetes/volumeplugins:rw \
     ${KUBELET_IMAGE} \
       /hyperkube kubelet \
-        --require-kubeconfig \
         --enable-server \
         --node-labels="${KUBELET_NODE_LABELS}" \
         --v=2 \

diff --git a/parts/k8s/kubernetesagentcustomdata.yml b/parts/k8s/kubernetesagentcustomdata.yml
@@ -103,10 +103,14 @@ write_files:
   permissions: "0644"
   owner: "root"
   content: |
+{{if IsKubernetesVersionLt "1.8.0"}}
+    KUBELET_OPTS=--require-kubeconfig
+{{else}}
+    KUBELET_OPTS=
+{{end}}
     KUBELET_CONFIG={{GetKubeletConfigKeyVals .KubernetesConfig }}
     KUBELET_IMAGE={{WrapAsVariable "kubernetesHyperkubeSpec"}}
     DOCKER_OPTS=
-    KUBELET_OPTS=
     KUBELET_REGISTER_SCHEDULABLE=true
     KUBELET_NODE_LABELS={{GetAgentKubernetesLabels . "',variables('labelResourceGroup'),'"}}
 {{if IsKubernetesVersionGe "1.6.0"}}

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -144,10 +144,14 @@ MASTER_ADDONS_CONFIG_PLACEHOLDER
   permissions: "0644"
   owner: "root"
   content: |
+{{if IsKubernetesVersionLt "1.8.0"}}
+    KUBELET_OPTS=--require-kubeconfig
+{{else}}
+    KUBELET_OPTS=
+{{end}}
     KUBELET_CONFIG={{GetKubeletConfigKeyVals .MasterProfile.KubernetesConfig}}
     KUBELET_IMAGE={{WrapAsVariable "kubernetesHyperkubeSpec"}}
     DOCKER_OPTS=
-    KUBELET_OPTS=
     KUBELET_NODE_LABELS={{GetMasterKubernetesLabels "',variables('labelResourceGroup'),'"}}
 {{if IsKubernetesVersionGe "1.6.0"}}
   {{if HasLinuxAgents}}

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -846,6 +846,11 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			constraint, _ := semver.NewConstraint(">=" + version)
 			return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes && constraint.Check(orchestratorVersion)
 		},
+		"IsKubernetesVersionLt": func(version string) bool {
+			orchestratorVersion, _ := semver.NewVersion(cs.Properties.OrchestratorProfile.OrchestratorVersion)
+			constraint, _ := semver.NewConstraint("<" + version)
+			return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes && constraint.Check(orchestratorVersion)
+		},
 		"IsKubernetesVersionTilde": func(version string) bool {
 			// examples include
 			// ~2.3 is equivalent to >= 2.3, < 2.4