Skip to content

Commit a4f20d6

Browse files
support dockerDaemonScheduler as param (#591)
* support dockerDaemonScheduler as param
1 parent 4a08b39 commit a4f20d6

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

lib/interface/cli/commands/hybrid/helper.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,12 @@ function mergeValuesFromValuesFile(argv, valuesFile, handleError) {
10701070
if (_.has(valuesObj, 'Runtime.resources')) {
10711071
_.set(_argv, 'reResources', valuesObj.Runtime.resources);
10721072
}
1073+
if (_.has(valuesObj, 'Runtime.userVolumeMounts')) {
1074+
_.set(_argv, 'userVolumeMounts', valuesObj.Runtime.userVolumeMounts);
1075+
}
1076+
if (_.has(valuesObj, 'Runtime.userVolumes')) {
1077+
_.set(_argv, 'userVolumes', valuesObj.Runtime.userVolumes);
1078+
}
10731079

10741080
return _argv;
10751081
}

lib/interface/cli/commands/hybrid/init.cmd.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ const initCmd = new Command({
249249
runtimeName,
250250
reEnvVars,
251251
reResources,
252+
userVolumeMounts,
253+
userVolumes,
252254
} = _argv;
253255
let {
254256
'kube-context-name': kubeContextName,
@@ -589,10 +591,22 @@ const initCmd = new Command({
589591
_.set(re, 'dockerDaemonScheduler.defaultDindResources', reResources);
590592
}
591593

594+
if (userVolumeMounts) {
595+
const currentdockerDaemonScheduler = _.get(re, 'dockerDaemonScheduler', {});
596+
const newDockerDaemonScheduler = _.merge(currentdockerDaemonScheduler, { userVolumeMounts });
597+
_.set(re, 'dockerDaemonScheduler', newDockerDaemonScheduler);
598+
}
599+
600+
if (userVolumes) {
601+
const currentdockerDaemonScheduler = _.get(re, 'dockerDaemonScheduler', {});
602+
const newDockerDaemonScheduler = _.merge(currentdockerDaemonScheduler, { userVolumes });
603+
_.set(re, 'dockerDaemonScheduler', newDockerDaemonScheduler);
604+
}
605+
592606
await sdk.runtimeEnvs.update({ name: reName }, re);
593607
console.log(`Runtime environment "${colors.cyan(reName)}" has been updated with env vars`);
594608
},
595-
condition: envVars.length || reResources,
609+
condition: envVars.length || reResources || userVolumeMounts || userVolumes,
596610
});
597611

598612
// set runtime as default

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codefresh",
3-
"version": "0.73.20",
3+
"version": "0.73.21",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,

0 commit comments

Comments
 (0)