fixed re env vars not set and storage class name not set using values… (

#610) * fixed re env vars not set and storage class name not set using values file
codefresh-io · Dec 17, 2020 · 512ccd5 · 512ccd5
1 parent cdbf0fd
commit 512ccd5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/interface/cli/commands/hybrid/helper.js b/lib/interface/cli/commands/hybrid/helper.js
@@ -1040,6 +1040,9 @@ function mergeValuesFromValuesFile(argv, valuesFile, handleError) {
     if (_.has(valuesObj, 'Runtime.userVolumes')) {
         _.set(_argv, 'userVolumes', valuesObj.Runtime.userVolumes);
     }
+    if (!_.has(_argv, 'storage-class-name') && _.has(valuesObj, 'StorageClass')) {
+        _.set(_argv, 'storage-class-name', valuesObj.StorageClass);
+    }
 
     return _argv;
 }

diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js
@@ -572,7 +572,7 @@ const initCmd = new Command({
                 const re = await sdk.runtimeEnvs.get({ name: reName });
 
                 // update re env vars
-                if (envVars.length) {
+                if (envVars.length || reEnvVars) {
                     const envVarsObj = _.merge(keyValueArrayToObject(envVars), reEnvVars);
 
                     const currentEngineEnvVars = _.get(re, 'runtimeScheduler.envVars', {});
@@ -604,7 +604,7 @@ const initCmd = new Command({
                 await sdk.runtimeEnvs.update({ name: reName }, re);
                 console.log(`Runtime environment "${colors.cyan(reName)}" has been updated with env vars`);
             },
-            condition: envVars.length || reResources || userVolumeMounts || userVolumes,
+            condition: envVars.length || reResources || userVolumeMounts || userVolumes || reEnvVars,
         });
 
         // set runtime as default

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.73.33",
+  "version": "0.73.34",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,