Do not default disk label

index.js

@@ -157,8 +157,7 @@ class K8sVMExecutor extends Executor {
         this.highMemory = hoek.reach(options, 'kubernetes.resources.memory.high', { default: 12 });
         this.lowMemory = hoek.reach(options, 'kubernetes.resources.memory.low', { default: 2 });
         this.microMemory = hoek.reach(options, 'kubernetes.resources.memory.micro', { default: 1 });
-        this.diskLabel = hoek.reach(options, 'kubernetes.labels.disk',
-            { default: 'screwdriver.cd/disk' });
+        this.diskLabel = hoek.reach(options, 'kubernetes.labels.disk', { default: '' });
         this.podRetryStrategy = (err, response, body) => {
             const status = hoek.reach(body, 'status.phase');
 
@@ -253,13 +252,18 @@ class K8sVMExecutor extends Executor {
 
         const podConfig = yaml.safeLoad(podTemplate);
 
-        const diskConfig = annotations[DISK_RESOURCE] || '';
-        const nodeSelectors = diskConfig.toUpperCase() === 'HIGH' ?
-            { [this.diskLabel]: 'high' } : {};
+        if (this.diskLabel) {
+            const diskConfig = annotations[DISK_RESOURCE] || '';
+            const nodeSelectors = diskConfig.toUpperCase() === 'HIGH' ?
+                { [this.diskLabel]: 'high' } : {};
 
-        hoek.merge(nodeSelectors, this.nodeSelectors);
+            hoek.merge(nodeSelectors, this.nodeSelectors);
+
+            setNodeSelector(podConfig, nodeSelectors);
+        } else {
+            setNodeSelector(podConfig, this.nodeSelectors);
+        }
 
-        setNodeSelector(podConfig, nodeSelectors);
         setPreferredNodeSelector(podConfig, this.preferredNodeSelectors);
 
         const options = {