Merge pull request #3 from wbuchwalter/enable-k8v1.6-multiplegpu

Parametrize kubernetes version checking function
tanmaykm · May 25, 2017 · a34ecfa · a34ecfa
2 parents 78ad83b + 49278b9
commit a34ecfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/parts/kubernetesagentcustomdata.yml b/parts/kubernetesagentcustomdata.yml
@@ -115,7 +115,7 @@ write_files:
     KUBELET_REGISTER_SCHEDULABLE=true
     KUBELET_NODE_LABELS=role=agent
     KUBELET_POD_INFRA_CONTAINER_IMAGE={{WrapAsVariable "kubernetesPodInfraContainerSpec"}}
-{{if IsKubernetesGte16}}
+{{if IsKubernetesVersionGe "1.6.0"}}
      KUBELET_FEATURE_GATES=--feature-gates=Accelerators=true
 {{end}}
 

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -530,11 +530,12 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) map[str
 			return cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS &&
 				cs.Properties.OrchestratorProfile.OrchestratorVersion == api.DCOS190
 		},
-		"IsKubernetesGte16": func() bool {
+		"IsKubernetesVersionGe": func(version string) bool {
+			targetVersion := api.OrchestratorVersion(version)
+			targetVersionOrdinal := VersionOrdinal(targetVersion)
 			orchestratorVersionOrdinal := VersionOrdinal(cs.Properties.OrchestratorProfile.OrchestratorVersion)
-			kubernetes16VersionOrdinal := VersionOrdinal(api.Kubernetes160)
 			return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes &&
-				orchestratorVersionOrdinal >= kubernetes16VersionOrdinal
+				orchestratorVersionOrdinal >= targetVersionOrdinal
 		},
 		"RequiresFakeAgentOutput": func() bool {
 			return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes

diff --git a/pkg/acsengine/templates.go b/pkg/acsengine/templates.go