Update conditionals to match both N series and device plugin

BUGFIX - Update docker runtime on NON GPU enabled machines Add accelerator label to GPU enabled nodes Add nodeselector label match where accelerator=nvidia for nvidia-device-plugin
lachie83 · Jun 6, 2018 · 2511e6f · 2511e6f
1 parent e9f061e
commit 2511e6f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/parts/k8s/addons/kubernetesmasteraddons-nvidia-device-plugin-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-nvidia-device-plugin-daemonset.yaml
@@ -41,3 +41,4 @@ spec:
             path: /var/lib/kubelet/device-plugins
       nodeSelector:
         beta.kubernetes.io/os: linux
+        accelerator: nvidia
diff --git a/parts/k8s/kubernetesagentcustomdata.yml b/parts/k8s/kubernetesagentcustomdata.yml
@@ -34,14 +34,14 @@ write_files:
       "log-opts":  {
          "max-size": "50m",
          "max-file": "5"
-      }{{if IsNVIDIADevicePluginEnabled}}
+      }{{if IsNSeriesSKU .}}{{if IsNVIDIADevicePluginEnabled}}
       ,"default-runtime": "nvidia",
       "runtimes": {
          "nvidia": {
              "path": "/usr/bin/nvidia-container-runtime",
              "runtimeArgs": []
         }
-      }{{end}}
+      }{{end}}{{end}}
     }
 
 - path: "/etc/kubernetes/certs/ca.crt"
@@ -138,8 +138,10 @@ write_files:
     KUBELET_REGISTER_SCHEDULABLE=true
     KUBELET_NODE_LABELS={{GetAgentKubernetesLabels . "',variables('labelResourceGroup'),'"}}
 {{if IsNSeriesSKU .}}
+  {{if IsNVIDIADevicePluginEnabled}}
     KUBELET_REGISTER_WITH_TAINTS=--register-with-taints={{WrapAsVariable "registerWithGpuTaints"}}
   {{end}}
+{{end}}
 
 AGENT_ARTIFACTS_CONFIG_PLACEHOLDER
 

diff --git a/parts/k8s/kubernetesbase.t b/parts/k8s/kubernetesbase.t
@@ -42,7 +42,9 @@
         "{{.Name}}Index": {{$index}},
         {{template "k8s/kubernetesagentvars.t" .}}
         {{if IsNSeriesSKU .}}
+          {{if IsNVIDIADevicePluginEnabled}}
           "registerWithGpuTaints": "nvidia.com/gpu=true:NoSchedule",
+          {{end}}
         {{end}}
         {{if .IsStorageAccount}}
           {{if .HasDisks}}

diff --git a/pkg/acsengine/template_generator.go b/pkg/acsengine/template_generator.go
@@ -198,6 +198,10 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 				storagetier, _ := getStorageAccountType(profile.VMSize)
 				buf.WriteString(fmt.Sprintf(",storageprofile=managed,storagetier=%s", storagetier))
 			}
+			if isNSeriesSKU(profile) {
+				accelerator := "nvidia"
+				buf.WriteString(fmt.Sprintf(",accelerator=%s", accelerator))
+			}
 			buf.WriteString(fmt.Sprintf(",kubernetes.azure.com/cluster=%s", rg))
 			for k, v := range profile.CustomNodeLabels {
 				buf.WriteString(fmt.Sprintf(",%s=%s", k, v))