@geode/opengeodeweb-front 10.28.0-rc.2 → 10.28.0-rc.4
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.
|
@@ -12,7 +12,7 @@ import { microservicesMetadatasPath, projectMicroservices } from "./cleanup.js";
|
|
|
12
12
|
import { executablePath } from "./path.js";
|
|
13
13
|
|
|
14
14
|
const MILLISECONDS_PER_SECOND = 1000;
|
|
15
|
-
const DEFAULT_TIMEOUT_SECONDS =
|
|
15
|
+
const DEFAULT_TIMEOUT_SECONDS = 45;
|
|
16
16
|
|
|
17
17
|
async function runScript(
|
|
18
18
|
execPath,
|
package/package.json
CHANGED
|
@@ -23,7 +23,7 @@ export default defineEventHandler(async (event) => {
|
|
|
23
23
|
});
|
|
24
24
|
const authClient = await auth.getClient();
|
|
25
25
|
const [routerImage, backImage, viewerImage] = await artifactImages(parent, authClient);
|
|
26
|
-
const request = requestConfig(parent, routerImage, backImage, viewerImage);
|
|
26
|
+
const request = requestConfig(parent, routerImage, backImage, viewerImage, email);
|
|
27
27
|
console.log({ request });
|
|
28
28
|
const runClient = new ServicesClient({ authClient });
|
|
29
29
|
const [operation] = await runClient.createService(request);
|
package/server/utils/cloud.js
CHANGED
|
@@ -35,8 +35,16 @@ function artifactImages(parent, authClient) {
|
|
|
35
35
|
]);
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
function sanitizeLabelValue(label) {
|
|
39
|
+
const maxLabelLength = 63;
|
|
40
|
+
return label
|
|
41
|
+
.toLowerCase()
|
|
42
|
+
.replaceAll(/[^a-z0-9_-]/gu, "_")
|
|
43
|
+
.slice(0, maxLabelLength);
|
|
44
|
+
}
|
|
45
|
+
|
|
38
46
|
// oxlint-disable-next-line max-lines-per-function
|
|
39
|
-
function requestConfig(parent, routerImage, backImage, viewerImage) {
|
|
47
|
+
function requestConfig(parent, routerImage, backImage, viewerImage, email, projectId) {
|
|
40
48
|
const resources = {
|
|
41
49
|
limits: {
|
|
42
50
|
cpu: "1000m",
|
|
@@ -52,11 +60,19 @@ function requestConfig(parent, routerImage, backImage, viewerImage) {
|
|
|
52
60
|
service: {
|
|
53
61
|
ingress: "INGRESS_TRAFFIC_ALL",
|
|
54
62
|
invokerIamDisabled: true,
|
|
63
|
+
labels: {
|
|
64
|
+
user: sanitizeLabelValue(email),
|
|
65
|
+
project: sanitizeLabelValue(projectId),
|
|
66
|
+
},
|
|
55
67
|
scaling: {
|
|
56
68
|
scalingMode: "MANUAL",
|
|
57
69
|
manualInstanceCount: 1,
|
|
58
70
|
},
|
|
59
71
|
template: {
|
|
72
|
+
labels: {
|
|
73
|
+
user: sanitizeLabelValue(email),
|
|
74
|
+
project: sanitizeLabelValue(projectId),
|
|
75
|
+
},
|
|
60
76
|
volumes: [
|
|
61
77
|
{
|
|
62
78
|
name: "project",
|