actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for setting a namespace for containers in Cloud Runner

pull/763/head
harry8525 2025-11-29 08:53:18 +00:00
parent 4869fa28a0
commit f0234de209
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/index.js vendored
View File

@ -331,6 +331,7 @@ class BuildParameters {
kubeConfig: cloud_runner_options_1.default.kubeConfig,
containerMemory: cloud_runner_options_1.default.containerMemory,
containerCpu: cloud_runner_options_1.default.containerCpu,
containerNamespace: cloud_runner_options_1.default.containerNamespace,
kubeVolumeSize: cloud_runner_options_1.default.kubeVolumeSize,
kubeVolume: cloud_runner_options_1.default.kubeVolume,
postBuildContainerHooks: cloud_runner_options_1.default.postBuildContainerHooks,
@ -1220,6 +1221,9 @@ class CloudRunnerOptions {
static get containerMemory() {
return CloudRunnerOptions.getInput('containerMemory') || `3072`;
}
static get containerNamespace() {
return CloudRunnerOptions.getInput('containerNamespace') || `default`;
}
static get customJob() {
return CloudRunnerOptions.getInput('customJob') || '';
}
@ -3372,7 +3376,6 @@ const remote_client_logger_1 = __nccwpck_require__(59412);
const kubernetes_role_1 = __nccwpck_require__(88231);
const cloud_runner_system_1 = __nccwpck_require__(4197);
class Kubernetes {
// eslint-disable-next-line no-unused-vars
constructor(buildParameters) {
this.buildGuid = '';
this.pvcName = '';
@ -3390,7 +3393,7 @@ class Kubernetes {
this.kubeClientApps = this.kubeConfig.makeApiClient(k8s.AppsV1Api);
this.kubeClientBatch = this.kubeConfig.makeApiClient(k8s.BatchV1Api);
this.rbacAuthorizationV1Api = this.kubeConfig.makeApiClient(k8s.RbacAuthorizationV1Api);
this.namespace = 'default';
this.namespace = buildParameters.containerNamespace ? buildParameters.containerNamespace : 'default';
cloud_runner_logger_1.default.log('Loaded default Kubernetes configuration for this environment');
}
async PushLogUpdate(logs) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/build-parameters.ts
View File

@ -59,6 +59,7 @@ class BuildParameters {
public kubeConfig!: string;
public containerMemory!: string;
public containerCpu!: string;
public containerNamespace!: string;
public kubeVolumeSize!: string;
public kubeVolume!: string;
public kubeStorageClass!: string;
@ -187,6 +188,7 @@ class BuildParameters {
kubeConfig: CloudRunnerOptions.kubeConfig,
containerMemory: CloudRunnerOptions.containerMemory,
containerCpu: CloudRunnerOptions.containerCpu,
containerNamespace: CloudRunnerOptions.containerNamespace,
kubeVolumeSize: CloudRunnerOptions.kubeVolumeSize,
kubeVolume: CloudRunnerOptions.kubeVolume,
postBuildContainerHooks: CloudRunnerOptions.postBuildContainerHooks,

4
src/model/cloud-runner/options/cloud-runner-options.ts
View File

@ -135,6 +135,10 @@ class CloudRunnerOptions {
return CloudRunnerOptions.getInput('containerMemory') || `3072`;
}
static get containerNamespace(): string {
return CloudRunnerOptions.getInput('containerNamespace') || `default`;
}
static get customJob(): string {
return CloudRunnerOptions.getInput('customJob') || '';
}

3
src/model/cloud-runner/providers/k8s/index.ts
View File

@ -37,7 +37,6 @@ class Kubernetes implements ProviderInterface {
public serviceAccountName: string = '';
public ip: string = '';
// eslint-disable-next-line no-unused-vars
constructor(buildParameters: BuildParameters) {
Kubernetes.Instance = this;
this.kubeConfig = new k8s.KubeConfig();
@ -46,7 +45,7 @@ class Kubernetes implements ProviderInterface {
this.kubeClientApps = this.kubeConfig.makeApiClient(k8s.AppsV1Api);
this.kubeClientBatch = this.kubeConfig.makeApiClient(k8s.BatchV1Api);
this.rbacAuthorizationV1Api = this.kubeConfig.makeApiClient(k8s.RbacAuthorizationV1Api);
this.namespace = 'default';
this.namespace = buildParameters.containerNamespace ? buildParameters.containerNamespace : 'default';
CloudRunnerLogger.log('Loaded default Kubernetes configuration for this environment');
}