diff --git a/action.yml b/action.yml index 39144d27..aafb3a99 100644 --- a/action.yml +++ b/action.yml @@ -46,18 +46,18 @@ inputs: default: '' required: false description: 'Supply a Persistent Volume Claim name to use for the Unity build.' - kubeContainerMemory: + remoteBuildMemory: default: '800M' required: false - description: 'Amount of memory to assign the build container in Kubernetes (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes)' - kubeContainerCPU: + description: 'Amount of memory to assign the remote build container' + remoteBuildCpu: default: '0.25' required: false - description: 'Amount of CPU time to assign the build container in Kubernetes (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes)' + description: 'Amount of CPU time to assign the remote build container' kubeVolumeSize: default: '5Gi' required: false - description: 'Amount of disc space to assign the Kubernetes Persistent Volume (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes)' + description: 'Amount of disc space to assign the Kubernetes Persistent Volume' githubToken: default: '' required: false diff --git a/src/model/aws.ts b/src/model/aws.ts index 3e8397b6..46928ad2 100644 --- a/src/model/aws.ts +++ b/src/model/aws.ts @@ -113,6 +113,14 @@ class AWS { `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`, [ + { + name: 'ContainerMemory', + value: buildParameters.remoteBuildMemory, + }, + { + name: 'ContainerCpu', + value: buildParameters.remoteBuildCpu, + }, { name: 'GITHUB_WORKSPACE', value: `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`, diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts index f3fbdc4e..a1971ccc 100644 --- a/src/model/build-parameters.ts +++ b/src/model/build-parameters.ts @@ -37,8 +37,8 @@ class BuildParameters { awsStackName: Input.awsStackName, kubeConfig: Input.kubeConfig, githubToken: Input.githubToken, - kubeContainerMemory: Input.kubeContainerMemory, - kubeContainerCPU: Input.kubeContainerCPU, + remoteBuildMemory: Input.remoteBuildMemory, + remoteBuildCpu: Input.remoteBuilderCpu, kubeVolumeSize: Input.kubeVolumeSize, kubeVolume: Input.kubeVolume, }; diff --git a/src/model/input.ts b/src/model/input.ts index 5ce3e5bf..e9346ad3 100644 --- a/src/model/input.ts +++ b/src/model/input.ts @@ -101,12 +101,12 @@ class Input { return core.getInput('githubToken') || ''; } - static get kubeContainerMemory() { - return core.getInput('kubeContainerMemory') || '800M'; + static get remoteBuildMemory() { + return core.getInput('remoteBuildMemory') || '800M'; } - static get kubeContainerCPU() { - return core.getInput('kubeContainerCPU') || '0.25'; + static get remoteBuildCPU() { + return core.getInput('remoteBuildCpu') || '0.25'; } static get kubeVolumeSize() {