@catladder/cli 0.0.0-main-ee41ef85 → 0.0.0-main-0bbd1f11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +80 -0
- package/dist/bundles/cli/index.js +80 -0
- package/dist/cli/src/utils/gitlab.js +1 -0
- package/dist/cli/src/utils/gitlab.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +5 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.d.ts +5 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.js +51 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.js.map +1 -0
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +70 -0
- package/dist/pipeline/src/deploy/types/googleCloudRun.js +16 -0
- package/dist/pipeline/src/deploy/types/googleCloudRun.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/utils/gitlab.ts +1 -0
|
@@ -528,6 +528,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
528
528
|
vorpal.log("");
|
|
529
529
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
530
530
|
vorpal.log("Its best to create one specifically for catladder");
|
|
531
|
+
vorpal.log("Scopes needed: api");
|
|
531
532
|
vorpal.log("");
|
|
532
533
|
vorpal.log("☝ we open up the settings page for you!");
|
|
533
534
|
vorpal.log("");
|
|
@@ -3980,6 +3981,7 @@ const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
|
|
|
3980
3981
|
const getServiceName_1 = __nccwpck_require__(8128);
|
|
3981
3982
|
const common_1 = __nccwpck_require__(3325);
|
|
3982
3983
|
const constants_1 = __nccwpck_require__(8865);
|
|
3984
|
+
const healthCheck_1 = __nccwpck_require__(193);
|
|
3983
3985
|
const volumes_1 = __nccwpck_require__(847);
|
|
3984
3986
|
const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
3985
3987
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -4025,6 +4027,7 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
4025
4027
|
"execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
|
|
4026
4028
|
gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
|
|
4027
4029
|
"gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType,
|
|
4030
|
+
...(0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck),
|
|
4028
4031
|
}, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
|
|
4029
4032
|
const version = requiresBeta(customConfig) ? "beta" : undefined;
|
|
4030
4033
|
return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
|
|
@@ -4052,6 +4055,9 @@ const requiresBeta = (config) => {
|
|
|
4052
4055
|
if (config.gpu && config.gpu > 0) {
|
|
4053
4056
|
return true;
|
|
4054
4057
|
}
|
|
4058
|
+
if (config.healthCheck !== undefined) {
|
|
4059
|
+
return true;
|
|
4060
|
+
}
|
|
4055
4061
|
return false;
|
|
4056
4062
|
};
|
|
4057
4063
|
//# sourceMappingURL=cloudRunServices.js.map
|
|
@@ -4454,6 +4460,64 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
|
|
|
4454
4460
|
|
|
4455
4461
|
/***/ }),
|
|
4456
4462
|
|
|
4463
|
+
/***/ 193:
|
|
4464
|
+
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
4465
|
+
|
|
4466
|
+
"use strict";
|
|
4467
|
+
|
|
4468
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
4469
|
+
exports.healthCheckCliArgs = void 0;
|
|
4470
|
+
const types_1 = __nccwpck_require__(5781);
|
|
4471
|
+
const PORT = 8080;
|
|
4472
|
+
function healthCheckCliArgs(healthCheck) {
|
|
4473
|
+
const shouldNotSetHealthCheck = healthCheck === undefined;
|
|
4474
|
+
if (shouldNotSetHealthCheck) {
|
|
4475
|
+
return undefined;
|
|
4476
|
+
}
|
|
4477
|
+
const shouldUseDefaultProbe = healthCheck === true;
|
|
4478
|
+
if (shouldUseDefaultProbe) {
|
|
4479
|
+
return {
|
|
4480
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
|
|
4481
|
+
"liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe)),
|
|
4482
|
+
};
|
|
4483
|
+
}
|
|
4484
|
+
return {
|
|
4485
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
|
|
4486
|
+
"liveness-probe": healthCheck.livenessProbe
|
|
4487
|
+
? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
|
|
4488
|
+
: "", // NOTE: empty string ("") removes liveness probe
|
|
4489
|
+
};
|
|
4490
|
+
}
|
|
4491
|
+
exports.healthCheckCliArgs = healthCheckCliArgs;
|
|
4492
|
+
function probeToKeyValuePairs(probe) {
|
|
4493
|
+
const sharedArgs = Object.entries({
|
|
4494
|
+
initialDelaySeconds: probe.initialDelaySeconds,
|
|
4495
|
+
timeoutSeconds: probe.timeoutSeconds,
|
|
4496
|
+
periodSeconds: probe.periodSeconds,
|
|
4497
|
+
failureThreshold: probe.failureThreshold,
|
|
4498
|
+
});
|
|
4499
|
+
switch (probe.type) {
|
|
4500
|
+
case "tcp":
|
|
4501
|
+
return [...sharedArgs, ["tcpSocket.port", PORT]];
|
|
4502
|
+
case "http1":
|
|
4503
|
+
return [
|
|
4504
|
+
...sharedArgs,
|
|
4505
|
+
["httpGet.port", PORT],
|
|
4506
|
+
["httpGet.path", probe.path],
|
|
4507
|
+
// NOTE: headers are not supported by "gcloud beta" at the moment
|
|
4508
|
+
];
|
|
4509
|
+
default:
|
|
4510
|
+
probe;
|
|
4511
|
+
return [];
|
|
4512
|
+
}
|
|
4513
|
+
}
|
|
4514
|
+
function toArgValue(keyValues) {
|
|
4515
|
+
return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
|
|
4516
|
+
}
|
|
4517
|
+
//# sourceMappingURL=healthCheck.js.map
|
|
4518
|
+
|
|
4519
|
+
/***/ }),
|
|
4520
|
+
|
|
4457
4521
|
/***/ 4069:
|
|
4458
4522
|
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
4459
4523
|
|
|
@@ -5555,6 +5619,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
5555
5619
|
"use strict";
|
|
5556
5620
|
|
|
5557
5621
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
5622
|
+
exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
|
|
5623
|
+
exports.defaultStartupProbe = {
|
|
5624
|
+
type: "http1",
|
|
5625
|
+
path: "/__health",
|
|
5626
|
+
initialDelaySeconds: 5,
|
|
5627
|
+
timeoutSeconds: 1,
|
|
5628
|
+
periodSeconds: 30,
|
|
5629
|
+
failureThreshold: 3,
|
|
5630
|
+
};
|
|
5631
|
+
exports.defaultLivenessProbe = {
|
|
5632
|
+
...exports.defaultStartupProbe,
|
|
5633
|
+
initialDelaySeconds: 0,
|
|
5634
|
+
timeoutSeconds: 10,
|
|
5635
|
+
periodSeconds: 30,
|
|
5636
|
+
failureThreshold: 3,
|
|
5637
|
+
};
|
|
5558
5638
|
//# sourceMappingURL=googleCloudRun.js.map
|
|
5559
5639
|
|
|
5560
5640
|
/***/ }),
|
|
@@ -3366,6 +3366,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
3366
3366
|
vorpal.log("");
|
|
3367
3367
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
3368
3368
|
vorpal.log("Its best to create one specifically for catladder");
|
|
3369
|
+
vorpal.log("Scopes needed: api");
|
|
3369
3370
|
vorpal.log("");
|
|
3370
3371
|
vorpal.log("☝ we open up the settings page for you!");
|
|
3371
3372
|
vorpal.log("");
|
|
@@ -6998,6 +6999,7 @@ const getJobOrServiceArgs_1 = __nccwpck_require__(61741);
|
|
|
6998
6999
|
const getServiceName_1 = __nccwpck_require__(38128);
|
|
6999
7000
|
const common_1 = __nccwpck_require__(73325);
|
|
7000
7001
|
const constants_1 = __nccwpck_require__(38865);
|
|
7002
|
+
const healthCheck_1 = __nccwpck_require__(30193);
|
|
7001
7003
|
const volumes_1 = __nccwpck_require__(60847);
|
|
7002
7004
|
const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
7003
7005
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -7043,6 +7045,7 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
7043
7045
|
"execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
|
|
7044
7046
|
gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
|
|
7045
7047
|
"gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType,
|
|
7048
|
+
...(0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck),
|
|
7046
7049
|
}, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
|
|
7047
7050
|
const version = requiresBeta(customConfig) ? "beta" : undefined;
|
|
7048
7051
|
return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
|
|
@@ -7070,6 +7073,9 @@ const requiresBeta = (config) => {
|
|
|
7070
7073
|
if (config.gpu && config.gpu > 0) {
|
|
7071
7074
|
return true;
|
|
7072
7075
|
}
|
|
7076
|
+
if (config.healthCheck !== undefined) {
|
|
7077
|
+
return true;
|
|
7078
|
+
}
|
|
7073
7079
|
return false;
|
|
7074
7080
|
};
|
|
7075
7081
|
//# sourceMappingURL=cloudRunServices.js.map
|
|
@@ -7472,6 +7478,64 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
|
|
|
7472
7478
|
|
|
7473
7479
|
/***/ }),
|
|
7474
7480
|
|
|
7481
|
+
/***/ 30193:
|
|
7482
|
+
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
7483
|
+
|
|
7484
|
+
"use strict";
|
|
7485
|
+
|
|
7486
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
7487
|
+
exports.healthCheckCliArgs = void 0;
|
|
7488
|
+
const types_1 = __nccwpck_require__(75781);
|
|
7489
|
+
const PORT = 8080;
|
|
7490
|
+
function healthCheckCliArgs(healthCheck) {
|
|
7491
|
+
const shouldNotSetHealthCheck = healthCheck === undefined;
|
|
7492
|
+
if (shouldNotSetHealthCheck) {
|
|
7493
|
+
return undefined;
|
|
7494
|
+
}
|
|
7495
|
+
const shouldUseDefaultProbe = healthCheck === true;
|
|
7496
|
+
if (shouldUseDefaultProbe) {
|
|
7497
|
+
return {
|
|
7498
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
|
|
7499
|
+
"liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe)),
|
|
7500
|
+
};
|
|
7501
|
+
}
|
|
7502
|
+
return {
|
|
7503
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
|
|
7504
|
+
"liveness-probe": healthCheck.livenessProbe
|
|
7505
|
+
? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
|
|
7506
|
+
: "", // NOTE: empty string ("") removes liveness probe
|
|
7507
|
+
};
|
|
7508
|
+
}
|
|
7509
|
+
exports.healthCheckCliArgs = healthCheckCliArgs;
|
|
7510
|
+
function probeToKeyValuePairs(probe) {
|
|
7511
|
+
const sharedArgs = Object.entries({
|
|
7512
|
+
initialDelaySeconds: probe.initialDelaySeconds,
|
|
7513
|
+
timeoutSeconds: probe.timeoutSeconds,
|
|
7514
|
+
periodSeconds: probe.periodSeconds,
|
|
7515
|
+
failureThreshold: probe.failureThreshold,
|
|
7516
|
+
});
|
|
7517
|
+
switch (probe.type) {
|
|
7518
|
+
case "tcp":
|
|
7519
|
+
return [...sharedArgs, ["tcpSocket.port", PORT]];
|
|
7520
|
+
case "http1":
|
|
7521
|
+
return [
|
|
7522
|
+
...sharedArgs,
|
|
7523
|
+
["httpGet.port", PORT],
|
|
7524
|
+
["httpGet.path", probe.path],
|
|
7525
|
+
// NOTE: headers are not supported by "gcloud beta" at the moment
|
|
7526
|
+
];
|
|
7527
|
+
default:
|
|
7528
|
+
probe;
|
|
7529
|
+
return [];
|
|
7530
|
+
}
|
|
7531
|
+
}
|
|
7532
|
+
function toArgValue(keyValues) {
|
|
7533
|
+
return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
|
|
7534
|
+
}
|
|
7535
|
+
//# sourceMappingURL=healthCheck.js.map
|
|
7536
|
+
|
|
7537
|
+
/***/ }),
|
|
7538
|
+
|
|
7475
7539
|
/***/ 34069:
|
|
7476
7540
|
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
7477
7541
|
|
|
@@ -8573,6 +8637,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
8573
8637
|
"use strict";
|
|
8574
8638
|
|
|
8575
8639
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
8640
|
+
exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
|
|
8641
|
+
exports.defaultStartupProbe = {
|
|
8642
|
+
type: "http1",
|
|
8643
|
+
path: "/__health",
|
|
8644
|
+
initialDelaySeconds: 5,
|
|
8645
|
+
timeoutSeconds: 1,
|
|
8646
|
+
periodSeconds: 30,
|
|
8647
|
+
failureThreshold: 3,
|
|
8648
|
+
};
|
|
8649
|
+
exports.defaultLivenessProbe = {
|
|
8650
|
+
...exports.defaultStartupProbe,
|
|
8651
|
+
initialDelaySeconds: 0,
|
|
8652
|
+
timeoutSeconds: 10,
|
|
8653
|
+
periodSeconds: 30,
|
|
8654
|
+
failureThreshold: 3,
|
|
8655
|
+
};
|
|
8576
8656
|
//# sourceMappingURL=googleCloudRun.js.map
|
|
8577
8657
|
|
|
8578
8658
|
/***/ }),
|
|
@@ -18,6 +18,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
18
18
|
vorpal.log("");
|
|
19
19
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
20
20
|
vorpal.log("Its best to create one specifically for catladder");
|
|
21
|
+
vorpal.log("Scopes needed: api");
|
|
21
22
|
vorpal.log("");
|
|
22
23
|
vorpal.log("☝ we open up the settings page for you!");
|
|
23
24
|
vorpal.log("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuD;AACvD,mCAAuC;AACvC,wDAAgC;AAChC,4DAA+B;AAC/B,gDAAwB;AAExB,+CAA4E;AAC5E,wEAAuE;AAEvE,MAAM,SAAS,GAAG,8BAA8B,CAAC;AAE1C,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,MAAM,IAAA,2BAAa,EAAC,SAAS,CAAC,CAAC;AAA5D,QAAA,cAAc,kBAA8C;AAClE,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAuB,EAAE,EAAE;IAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC;YACZ,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ;SACf,CAAC;QACF,IAAA,+CAAuB,GAAE;KAC1B,CAAC,CAAC;IAEH,IAAA,cAAI,EAAC,WAAW,aAAa,yCAAyC,CAAC,CAAC;IAExE,MAAM,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAE5D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QAC5C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,6BAA6B;KACvC,CAAC,CAAC;IACH,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAA,2BAAa,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
|
|
|
7
7
|
const getServiceName_1 = require("../utils/getServiceName");
|
|
8
8
|
const common_1 = require("./common");
|
|
9
9
|
const constants_1 = require("./constants");
|
|
10
|
+
const healthCheck_1 = require("./healthCheck");
|
|
10
11
|
const volumes_1 = require("./volumes");
|
|
11
12
|
const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
12
13
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -52,6 +53,7 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
52
53
|
"execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
|
|
53
54
|
gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
|
|
54
55
|
"gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType,
|
|
56
|
+
...(0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck),
|
|
55
57
|
}, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
|
|
56
58
|
const version = requiresBeta(customConfig) ? "beta" : undefined;
|
|
57
59
|
return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
|
|
@@ -79,6 +81,9 @@ const requiresBeta = (config) => {
|
|
|
79
81
|
if (config.gpu && config.gpu > 0) {
|
|
80
82
|
return true;
|
|
81
83
|
}
|
|
84
|
+
if (config.healthCheck !== undefined) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
82
87
|
return false;
|
|
83
88
|
};
|
|
84
89
|
//# sourceMappingURL=cloudRunServices.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AAIvD,gEAA6D;AAC7D,sEAA8E;AAC9E,4DAAyD;AACzD,qCAKkB;AAClB,2CAAgD;AAChD,uCAA+C;AAExC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACzB,OAAuD,EACvD,UAAmB,EACnB,EAAE;;IACF,MAAM,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,YAAY,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,MAAM,OAAO,GACX,OAAO,KAAK,IAAI;QACd,CAAC,CAAC,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCACjB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;YAChC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY;YACnC,CAAC,CAAC,SAAS,CAAC,CAAC;QACjB,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;QACtB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.healthCheckCliArgs = void 0;
|
|
4
|
+
const types_1 = require("../../types");
|
|
5
|
+
const PORT = 8080;
|
|
6
|
+
function healthCheckCliArgs(healthCheck) {
|
|
7
|
+
const shouldNotSetHealthCheck = healthCheck === undefined;
|
|
8
|
+
if (shouldNotSetHealthCheck) {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
const shouldUseDefaultProbe = healthCheck === true;
|
|
12
|
+
if (shouldUseDefaultProbe) {
|
|
13
|
+
return {
|
|
14
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
|
|
15
|
+
"liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe)),
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
return {
|
|
19
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
|
|
20
|
+
"liveness-probe": healthCheck.livenessProbe
|
|
21
|
+
? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
|
|
22
|
+
: "", // NOTE: empty string ("") removes liveness probe
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
exports.healthCheckCliArgs = healthCheckCliArgs;
|
|
26
|
+
function probeToKeyValuePairs(probe) {
|
|
27
|
+
const sharedArgs = Object.entries({
|
|
28
|
+
initialDelaySeconds: probe.initialDelaySeconds,
|
|
29
|
+
timeoutSeconds: probe.timeoutSeconds,
|
|
30
|
+
periodSeconds: probe.periodSeconds,
|
|
31
|
+
failureThreshold: probe.failureThreshold,
|
|
32
|
+
});
|
|
33
|
+
switch (probe.type) {
|
|
34
|
+
case "tcp":
|
|
35
|
+
return [...sharedArgs, ["tcpSocket.port", PORT]];
|
|
36
|
+
case "http1":
|
|
37
|
+
return [
|
|
38
|
+
...sharedArgs,
|
|
39
|
+
["httpGet.port", PORT],
|
|
40
|
+
["httpGet.path", probe.path],
|
|
41
|
+
// NOTE: headers are not supported by "gcloud beta" at the moment
|
|
42
|
+
];
|
|
43
|
+
default:
|
|
44
|
+
probe;
|
|
45
|
+
return [];
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
function toArgValue(keyValues) {
|
|
49
|
+
return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=healthCheck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"healthCheck.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/healthCheck.ts"],"names":[],"mappings":";;;AACA,uCAKqB;AAErB,MAAM,IAAI,GAAG,IAAI,CAAC;AAElB,SAAgB,kBAAkB,CAChC,WAAuD;IAEvD,MAAM,uBAAuB,GAAG,WAAW,KAAK,SAAS,CAAC;IAC1D,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,qBAAqB,GAAG,WAAW,KAAK,IAAI,CAAC;IAEnD,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,2BAAmB,CAAC,CAAC;YACtE,gBAAgB,EAAE,UAAU,CAAC,oBAAoB,CAAC,4BAAoB,CAAC,CAAC;SACzE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3E,gBAAgB,EAAE,WAAW,CAAC,aAAa;YACzC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC7D,CAAC,CAAC,EAAE,EAAE,iDAAiD;KAC1D,CAAC;AACJ,CAAC;AAvBD,gDAuBC;AAED,SAAS,oBAAoB,CAC3B,KAAgC;IAEhC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACC,CAAC,CAAC;IAE7C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,KAAK;YACR,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACnD,KAAK,OAAO;YACV,OAAO;gBACL,GAAG,UAAU;gBACb,CAAC,cAAc,EAAE,IAAI,CAAC;gBACtB,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC;gBAC5B,iEAAiE;aAClE,CAAC;QACJ;YACE,KAAqB,CAAC;YACtB,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,SAA8B;IAChD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -136,7 +136,77 @@ export type DeployConfigCloudRunService = {
|
|
|
136
136
|
* args to pass to the command
|
|
137
137
|
*/
|
|
138
138
|
args?: string[];
|
|
139
|
+
/**
|
|
140
|
+
* Configuration of the health check.
|
|
141
|
+
*
|
|
142
|
+
* When set to `true`, startup and liveness probes will be
|
|
143
|
+
* configured to `defaultStartupProbe` and `defaultLivenessProbe`.
|
|
144
|
+
*
|
|
145
|
+
* When not set, default Cloud Run's health check
|
|
146
|
+
* configuration is used (startup TCP probe and no liveness probe).
|
|
147
|
+
*/
|
|
148
|
+
healthCheck?: true | {
|
|
149
|
+
/**
|
|
150
|
+
* Startup probe configuration.
|
|
151
|
+
*/
|
|
152
|
+
startupProbe: DeployConfigCloudRunProbe;
|
|
153
|
+
/**
|
|
154
|
+
* Liveness probe configuration.
|
|
155
|
+
* `false` disables the liveness probe.
|
|
156
|
+
*/
|
|
157
|
+
livenessProbe: false | DeployConfigCloudRunProbe;
|
|
158
|
+
};
|
|
139
159
|
} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
|
|
160
|
+
export declare const defaultStartupProbe: DeployConfigCloudRunProbe;
|
|
161
|
+
export declare const defaultLivenessProbe: DeployConfigCloudRunProbe;
|
|
162
|
+
export type DeployConfigCloudRunProbe = DeployConfigCloudRunHttp1Probe | DeployConfigCloudRunTcpProbe;
|
|
163
|
+
export type DeployConfigCloudRunProbeShared = {
|
|
164
|
+
/**
|
|
165
|
+
* The period in seconds at which to perform the probe.
|
|
166
|
+
* For example 2 to perform the probe every 2 seconds.
|
|
167
|
+
* Specify a value **from 1 second to 240** seconds.
|
|
168
|
+
*/
|
|
169
|
+
periodSeconds: number;
|
|
170
|
+
/**
|
|
171
|
+
* The number of seconds to wait after the container has started before performing the first probe.
|
|
172
|
+
* Specify a value **from 0 seconds to 240** seconds.
|
|
173
|
+
*/
|
|
174
|
+
initialDelaySeconds: number;
|
|
175
|
+
/**
|
|
176
|
+
* The number of seconds to wait until the probe times out.
|
|
177
|
+
* This value cannot exceed the value specified for `period`.
|
|
178
|
+
* Specify a value **from 1 to 240**.
|
|
179
|
+
*/
|
|
180
|
+
timeoutSeconds: number;
|
|
181
|
+
/**
|
|
182
|
+
* The number of times to retry the probe before shutting down the container.
|
|
183
|
+
*/
|
|
184
|
+
failureThreshold: number;
|
|
185
|
+
};
|
|
186
|
+
export type DeployConfigCloudRunTcpProbe = DeployConfigCloudRunProbeShared & {
|
|
187
|
+
/**
|
|
188
|
+
* Cloud Run makes a TCP connection to open the TCP Socket on the specified port.
|
|
189
|
+
* If Cloud Run is unable to establish a connection, it indicates a failure.
|
|
190
|
+
*/
|
|
191
|
+
type: "tcp";
|
|
192
|
+
};
|
|
193
|
+
export type DeployConfigCloudRunHttp1Probe = DeployConfigCloudRunProbeShared & {
|
|
194
|
+
/**
|
|
195
|
+
* **This will NOT work with http2 enabled services**
|
|
196
|
+
*
|
|
197
|
+
* Cloud Run makes an HTTP GET request to the service health check endpoint (for example, /ready).
|
|
198
|
+
* Any response between 200 and 400 is a success, everything else indicates failure.
|
|
199
|
+
*
|
|
200
|
+
* If a startup probe does not succeed within the specified time (failureThreshold * period), which cannot exceed 240 seconds, the container is shut down.
|
|
201
|
+
*
|
|
202
|
+
* If the HTTP startup probe succeeds within the specified time, and you have enabled liveness probe, the HTTP liveness probe is started.
|
|
203
|
+
*/
|
|
204
|
+
type: "http1";
|
|
205
|
+
/**
|
|
206
|
+
* the route path to check for health status of the service starting with a `/`.
|
|
207
|
+
*/
|
|
208
|
+
path: string;
|
|
209
|
+
};
|
|
140
210
|
export type DeployConfigCloudRunNetworkConfig = {
|
|
141
211
|
network?: string;
|
|
142
212
|
/**
|
|
@@ -1,3 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
|
|
4
|
+
exports.defaultStartupProbe = {
|
|
5
|
+
type: "http1",
|
|
6
|
+
path: "/__health",
|
|
7
|
+
initialDelaySeconds: 5,
|
|
8
|
+
timeoutSeconds: 1,
|
|
9
|
+
periodSeconds: 30,
|
|
10
|
+
failureThreshold: 3,
|
|
11
|
+
};
|
|
12
|
+
exports.defaultLivenessProbe = {
|
|
13
|
+
...exports.defaultStartupProbe,
|
|
14
|
+
initialDelaySeconds: 0,
|
|
15
|
+
timeoutSeconds: 10,
|
|
16
|
+
periodSeconds: 30,
|
|
17
|
+
failureThreshold: 3,
|
|
18
|
+
};
|
|
3
19
|
//# sourceMappingURL=googleCloudRun.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AA4Na,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
|