fix: Do not set disk toleration when annotation is not set

screwdriver-cd · Jun 20, 2019 · 46688a6 · 46688a6
1 parent abaaf8d
commit 46688a6
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -307,14 +307,15 @@ class K8sVMExecutor extends Executor {
 
         if (this.diskLabel) {
             const diskConfig = (annotations[DISK_RESOURCE] || '').toLowerCase();
-            const diskSelectors = { [this.diskLabel]: diskConfig };
+            const diskSelectors = diskConfig ? { [this.diskLabel]: diskConfig } : {};
 
             hoek.merge(nodeSelectors, diskSelectors);
         }
 
         if (this.diskSpeedLabel) {
             const diskSpeedConfig = (annotations[DISK_SPEED_RESOURCE] || '').toLowerCase();
-            const diskSpeedSelectors = { [this.diskSpeedLabel]: diskSpeedConfig };
+            const diskSpeedSelectors = diskSpeedConfig ?
+                { [this.diskSpeedLabel]: diskSpeedConfig } : {};
 
             hoek.merge(nodeSelectors, diskSpeedSelectors);
         }

diff --git a/test/index.test.js b/test/index.test.js
@@ -674,6 +674,33 @@ describe('index', () => {
             });
         });
 
+        it('does not set disk toleration and node affinity when disk is not set', () => {
+            fakeStartConfig.annotations = {};
+            const spec = _.merge({}, testSpec, testPodSpec);
+            const options = _.assign({}, executorOptions, {
+                kubernetes: {
+                    nodeSelectors: { key: 'value' },
+                    token: 'api_key',
+                    host: 'kubernetes.default',
+                    baseImage: 'hyperctl',
+                    resources: {
+                        disk: {
+                            space: 'screwdriver.cd/disk'
+                        }
+                    }
+                }
+            });
+
+            executor = new Executor(options);
+            postConfig.body.spec = spec;
+            getConfig.retryStrategy = executor.podRetryStrategy;
+
+            return executor.start(fakeStartConfig).then(() => {
+                assert.calledWith(requestRetryMock.firstCall, postConfig);
+                assert.calledWith(requestRetryMock.secondCall, sinon.match(getConfig));
+            });
+        });
+
         it('sets disk speed toleration and node affinity when diskSpeed is HIGH', () => {
             const spec = _.merge({}, testSpecWithDiskSpeed, testPodSpec);
             const options = _.assign({}, executorOptions, {
@@ -701,6 +728,33 @@ describe('index', () => {
             });
         });
 
+        it('does not set disk speed toleration when disk speed is not set', () => {
+            fakeStartConfig.annotations = {};
+            const spec = _.merge({}, testSpec, testPodSpec);
+            const options = _.assign({}, executorOptions, {
+                kubernetes: {
+                    nodeSelectors: { key: 'value' },
+                    token: 'api_key',
+                    host: 'kubernetes.default',
+                    baseImage: 'hyperctl',
+                    resources: {
+                        disk: {
+                            speed: 'screwdriver.cd/diskspeed'
+                        }
+                    }
+                }
+            });
+
+            executor = new Executor(options);
+            postConfig.body.spec = spec;
+            getConfig.retryStrategy = executor.podRetryStrategy;
+
+            return executor.start(fakeStartConfig).then(() => {
+                assert.calledWith(requestRetryMock.firstCall, postConfig);
+                assert.calledWith(requestRetryMock.secondCall, sinon.match(getConfig));
+            });
+        });
+
         it('sets preferred node affinity with appropriate node config', () => {
             const spec = _.merge({}, testPreferredSpec, testPodSpec);
             const options = _.assign({}, executorOptions, {