per provider container defaults

pull/387/head
Frostebite 2022-04-20 15:07:47 +01:00
parent ad94099026
commit 382b9c444a
5 changed files with 13 additions and 13 deletions

12
dist/index.js vendored
View File

@ -1120,11 +1120,11 @@ class AWSJobStack {
}, },
{ {
ParameterKey: 'ContainerMemory', ParameterKey: 'ContainerMemory',
ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerMemory, ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerMemory || '2048',
}, },
{ {
ParameterKey: 'ContainerCpu', ParameterKey: 'ContainerCpu',
ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerCpu, ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerCpu || '1024',
}, },
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];
@ -1954,8 +1954,8 @@ class KubernetesJobSpecFactory {
workingDir: `${workingDirectory}`, workingDir: `${workingDirectory}`,
resources: { resources: {
requests: { requests: {
memory: buildParameters.cloudRunnerMemory, memory: buildParameters.cloudRunnerMemory || '750M',
cpu: buildParameters.cloudRunnerCpu, cpu: buildParameters.cloudRunnerCpu || '1',
}, },
}, },
env: [ env: [
@ -4518,10 +4518,10 @@ class Input {
return Input.getInput('cloudRunnerCluster') || 'local'; return Input.getInput('cloudRunnerCluster') || 'local';
} }
static get cloudRunnerCpu() { static get cloudRunnerCpu() {
return Input.getInput('cloudRunnerCpu') || '1.0'; return Input.getInput('cloudRunnerCpu');
} }
static get cloudRunnerMemory() { static get cloudRunnerMemory() {
return Input.getInput('cloudRunnerMemory') || '750M'; return Input.getInput('cloudRunnerMemory');
} }
static get kubeConfig() { static get kubeConfig() {
return Input.getInput('kubeConfig') || ''; return Input.getInput('kubeConfig') || '';

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -86,11 +86,11 @@ export class AWSJobStack {
}, },
{ {
ParameterKey: 'ContainerMemory', ParameterKey: 'ContainerMemory',
ParameterValue: CloudRunner.buildParameters.cloudRunnerMemory, ParameterValue: CloudRunner.buildParameters.cloudRunnerMemory || '2048',
}, },
{ {
ParameterKey: 'ContainerCpu', ParameterKey: 'ContainerCpu',
ParameterValue: CloudRunner.buildParameters.cloudRunnerCpu, ParameterValue: CloudRunner.buildParameters.cloudRunnerCpu || '1024',
}, },
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];

View File

@ -108,8 +108,8 @@ class KubernetesJobSpecFactory {
workingDir: `${workingDirectory}`, workingDir: `${workingDirectory}`,
resources: { resources: {
requests: { requests: {
memory: buildParameters.cloudRunnerMemory, memory: buildParameters.cloudRunnerMemory || '750M',
cpu: buildParameters.cloudRunnerCpu, cpu: buildParameters.cloudRunnerCpu || '1',
}, },
}, },
env: [ env: [

View File

@ -234,11 +234,11 @@ class Input {
} }
static get cloudRunnerCpu() { static get cloudRunnerCpu() {
return Input.getInput('cloudRunnerCpu') || '1.0'; return Input.getInput('cloudRunnerCpu');
} }
static get cloudRunnerMemory() { static get cloudRunnerMemory() {
return Input.getInput('cloudRunnerMemory') || '750M'; return Input.getInput('cloudRunnerMemory');
} }
static get kubeConfig() { static get kubeConfig() {