ci(k8s): remove in-cluster LocalStack; use host LocalStack via localhost:4566 for all; rely on k3d host mapping
parent
98963da430
commit
b8456b5d8f
|
@ -349,6 +349,8 @@ class BuildParameters {
|
||||||
awsKinesisEndpoint: cloud_runner_options_1.default.awsKinesisEndpoint,
|
awsKinesisEndpoint: cloud_runner_options_1.default.awsKinesisEndpoint,
|
||||||
awsCloudWatchLogsEndpoint: cloud_runner_options_1.default.awsCloudWatchLogsEndpoint,
|
awsCloudWatchLogsEndpoint: cloud_runner_options_1.default.awsCloudWatchLogsEndpoint,
|
||||||
awsS3Endpoint: cloud_runner_options_1.default.awsS3Endpoint,
|
awsS3Endpoint: cloud_runner_options_1.default.awsS3Endpoint,
|
||||||
|
storageProvider: cloud_runner_options_1.default.storageProvider,
|
||||||
|
rcloneRemote: cloud_runner_options_1.default.rcloneRemote,
|
||||||
gitSha: input_1.default.gitSha,
|
gitSha: input_1.default.gitSha,
|
||||||
logId: (0, nanoid_1.customAlphabet)(cloud_runner_constants_1.default.alphabet, 9)(),
|
logId: (0, nanoid_1.customAlphabet)(cloud_runner_constants_1.default.alphabet, 9)(),
|
||||||
buildGuid: cloud_runner_guid_1.default.generateGuid(input_1.default.runNumber, input_1.default.targetPlatform),
|
buildGuid: cloud_runner_guid_1.default.generateGuid(input_1.default.runNumber, input_1.default.targetPlatform),
|
||||||
|
@ -1319,6 +1321,15 @@ class CloudRunnerOptions {
|
||||||
return CloudRunnerOptions.getInput('awsS3Endpoint') || CloudRunnerOptions.awsEndpoint;
|
return CloudRunnerOptions.getInput('awsS3Endpoint') || CloudRunnerOptions.awsEndpoint;
|
||||||
}
|
}
|
||||||
// ### ### ###
|
// ### ### ###
|
||||||
|
// Storage
|
||||||
|
// ### ### ###
|
||||||
|
static get storageProvider() {
|
||||||
|
return CloudRunnerOptions.getInput('storageProvider') || 's3';
|
||||||
|
}
|
||||||
|
static get rcloneRemote() {
|
||||||
|
return CloudRunnerOptions.getInput('rcloneRemote') || '';
|
||||||
|
}
|
||||||
|
// ### ### ###
|
||||||
// K8s
|
// K8s
|
||||||
// ### ### ###
|
// ### ### ###
|
||||||
static get kubeConfig() {
|
static get kubeConfig() {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -62,6 +62,8 @@ class BuildParameters {
|
||||||
public awsKinesisEndpoint?: string;
|
public awsKinesisEndpoint?: string;
|
||||||
public awsCloudWatchLogsEndpoint?: string;
|
public awsCloudWatchLogsEndpoint?: string;
|
||||||
public awsS3Endpoint?: string;
|
public awsS3Endpoint?: string;
|
||||||
|
public storageProvider!: string;
|
||||||
|
public rcloneRemote!: string;
|
||||||
public kubeConfig!: string;
|
public kubeConfig!: string;
|
||||||
public containerMemory!: string;
|
public containerMemory!: string;
|
||||||
public containerCpu!: string;
|
public containerCpu!: string;
|
||||||
|
@ -211,6 +213,8 @@ class BuildParameters {
|
||||||
awsKinesisEndpoint: CloudRunnerOptions.awsKinesisEndpoint,
|
awsKinesisEndpoint: CloudRunnerOptions.awsKinesisEndpoint,
|
||||||
awsCloudWatchLogsEndpoint: CloudRunnerOptions.awsCloudWatchLogsEndpoint,
|
awsCloudWatchLogsEndpoint: CloudRunnerOptions.awsCloudWatchLogsEndpoint,
|
||||||
awsS3Endpoint: CloudRunnerOptions.awsS3Endpoint,
|
awsS3Endpoint: CloudRunnerOptions.awsS3Endpoint,
|
||||||
|
storageProvider: CloudRunnerOptions.storageProvider,
|
||||||
|
rcloneRemote: CloudRunnerOptions.rcloneRemote,
|
||||||
gitSha: Input.gitSha,
|
gitSha: Input.gitSha,
|
||||||
logId: customAlphabet(CloudRunnerConstants.alphabet, 9)(),
|
logId: customAlphabet(CloudRunnerConstants.alphabet, 9)(),
|
||||||
buildGuid: CloudRunnerBuildGuid.generateGuid(Input.runNumber, Input.targetPlatform),
|
buildGuid: CloudRunnerBuildGuid.generateGuid(Input.runNumber, Input.targetPlatform),
|
||||||
|
|
|
@ -219,6 +219,18 @@ class CloudRunnerOptions {
|
||||||
return CloudRunnerOptions.getInput('awsS3Endpoint') || CloudRunnerOptions.awsEndpoint;
|
return CloudRunnerOptions.getInput('awsS3Endpoint') || CloudRunnerOptions.awsEndpoint;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ### ### ###
|
||||||
|
// Storage
|
||||||
|
// ### ### ###
|
||||||
|
|
||||||
|
static get storageProvider(): string {
|
||||||
|
return CloudRunnerOptions.getInput('storageProvider') || 's3';
|
||||||
|
}
|
||||||
|
|
||||||
|
static get rcloneRemote(): string {
|
||||||
|
return CloudRunnerOptions.getInput('rcloneRemote') || '';
|
||||||
|
}
|
||||||
|
|
||||||
// ### ### ###
|
// ### ### ###
|
||||||
// K8s
|
// K8s
|
||||||
// ### ### ###
|
// ### ### ###
|
||||||
|
|
Loading…
Reference in New Issue