@ydkn/pulumi-components 0.7.3 → 0.7.5
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/lib/gitlab/project.js +15 -12
- package/lib/gitlab/project.js.map +1 -1
- package/lib/gitlab/renovate.js +1 -0
- package/lib/gitlab/renovate.js.map +1 -1
- package/lib/gitlab/runners/runner.d.ts +4 -0
- package/lib/gitlab/runners/runner.js +14 -8
- package/lib/gitlab/runners/runner.js.map +1 -1
- package/lib/grafana/agent.js +5 -0
- package/lib/grafana/agent.js.map +1 -1
- package/package.json +7 -7
package/lib/gitlab/project.js
CHANGED
|
@@ -28,20 +28,23 @@ export class Project extends ComponentResource {
|
|
|
28
28
|
if (args.containerRegistryAccessLevel === undefined) {
|
|
29
29
|
args.containerRegistryAccessLevel = "private";
|
|
30
30
|
}
|
|
31
|
-
args.containerExpirationPolicy = pulumi
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
cadence: "1d",
|
|
36
|
-
olderThan: "14d",
|
|
37
|
-
keepN: 10,
|
|
38
|
-
nameRegexDelete: ".*",
|
|
39
|
-
nameRegexKeep: "^(v\\d(\\.\\d)+|latest)$",
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
31
|
+
args.containerExpirationPolicy = pulumi
|
|
32
|
+
.all([args.containerRegistryAccessLevel, args.containerExpirationPolicy])
|
|
33
|
+
.apply(([accessLevel, policy]) => {
|
|
34
|
+
if (accessLevel === "disabled") {
|
|
43
35
|
return {};
|
|
44
36
|
}
|
|
37
|
+
if (policy !== undefined) {
|
|
38
|
+
return policy;
|
|
39
|
+
}
|
|
40
|
+
return {
|
|
41
|
+
enabled: true,
|
|
42
|
+
cadence: "1d",
|
|
43
|
+
olderThan: "14d",
|
|
44
|
+
keepN: 10,
|
|
45
|
+
nameRegexDelete: ".*",
|
|
46
|
+
nameRegexKeep: "^(v\\d(\\.\\d)+|latest)$",
|
|
47
|
+
};
|
|
45
48
|
});
|
|
46
49
|
if (args.defaultBranch === undefined) {
|
|
47
50
|
args.defaultBranch = "main";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAMvD,MAAM,OAAO,OAAQ,SAAQ,iBAAiB;IAC3B,OAAO,CAAiB;IACxB,aAAa,CAAsB;IAEpD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAiB,EAAE,IAAsC;QACjF,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAElC,IAAI,IAAI,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;YAClD,IAAI,CAAC,0BAA0B,GAAG,SAAS,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,yBAAyB,KAAK,SAAS,EAAE,CAAC;YACjD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;QACxC,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACrC,CAAC;QAED,IAAI,IAAI,CAAC,4BAA4B,KAAK,SAAS,EAAE,CAAC;YACpD,IAAI,CAAC,4BAA4B,GAAG,SAAS,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,yBAAyB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"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"}
|
package/lib/gitlab/renovate.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../lib/gitlab/renovate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../lib/gitlab/renovate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAUrD,MAAM,OAAO,QAAS,SAAQ,iBAAiB;IAC5B,MAAM,CAAuB;IAC7B,OAAO,CAAuB;IAC/B,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAkB,EAAE,IAAsC;QAClF,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE3C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC9B,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC;QACpF,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEhF,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,QAAQ;gBAClC,6BAA6B,EAAE,UAAU;gBACzC,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CACpC,IAAI,EACJ;YACE,QAAQ;YACR,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,EAAE;gBAC5G,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;YAC9E,CAAC,CAAC;SACH,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CACrC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,iBAAiB,EAAE,QAAQ;gBAC3B,0BAA0B,EAAE,CAAC;gBAC7B,sBAAsB,EAAE,CAAC;gBACzB,WAAW,EAAE;oBACX,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE;oBACrC,IAAI,EAAE;wBACJ,QAAQ,EAAE;4BACR,IAAI,EAAE;gCACJ,aAAa,EAAE,WAAW;gCAC1B,UAAU,EAAE;oCACV;wCACE,IAAI,EAAE,UAAU;wCAChB,KAAK,EAAE,0BAA0B;wCACjC,eAAe,EAAE,QAAQ;wCACzB,IAAI,EAAE,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;wCAC7C,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;wCAC7D,SAAS,EAAE,IAAI,CAAC,SAAS;qCAC1B;iCACF;gCACD,WAAW,EAAE,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;6BACrG;yBACF;wBACD,YAAY,EAAE,EAAE;qBACjB;iBACF;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
|
|
@@ -15,8 +15,12 @@ export interface RunnerArgs {
|
|
|
15
15
|
memory?: pulumi.Input<RunnerArgs>;
|
|
16
16
|
helperMemory?: pulumi.Input<RunnerArgs>;
|
|
17
17
|
serviceMemory?: pulumi.Input<RunnerArgs>;
|
|
18
|
+
nodeSelector?: pulumi.Input<{
|
|
19
|
+
[key: string]: pulumi.Input<string>;
|
|
20
|
+
}>;
|
|
18
21
|
}
|
|
19
22
|
export declare class Runner extends ComponentResource {
|
|
23
|
+
private static readonly defaultImage;
|
|
20
24
|
private readonly helmRelease;
|
|
21
25
|
private readonly podMonitor;
|
|
22
26
|
readonly namespace: pulumi.Output<string>;
|
|
@@ -4,6 +4,7 @@ import { ComponentResource } from "../../common/index.js";
|
|
|
4
4
|
import * as kubernetes from "../../kubernetes/index.js";
|
|
5
5
|
import * as prometheus from "../../prometheus/index.js";
|
|
6
6
|
export class Runner extends ComponentResource {
|
|
7
|
+
static defaultImage = "ubuntu:latest";
|
|
7
8
|
helmRelease;
|
|
8
9
|
podMonitor;
|
|
9
10
|
namespace;
|
|
@@ -19,9 +20,6 @@ export class Runner extends ComponentResource {
|
|
|
19
20
|
if (args.concurrency === undefined) {
|
|
20
21
|
args.concurrency = 2;
|
|
21
22
|
}
|
|
22
|
-
if (args.image === undefined) {
|
|
23
|
-
args.image = "ubuntu:latest";
|
|
24
|
-
}
|
|
25
23
|
this.namespace = args.namespace
|
|
26
24
|
? pulumi.output(args.namespace)
|
|
27
25
|
: new k8s.core.v1.Namespace(name, { metadata: { name } }, opts).metadata.name;
|
|
@@ -35,19 +33,27 @@ export class Runner extends ComponentResource {
|
|
|
35
33
|
},
|
|
36
34
|
};
|
|
37
35
|
const config = pulumi
|
|
38
|
-
.all([args.image, args.memory, args.helperMemory, args.serviceMemory])
|
|
39
|
-
.apply(([image, memory, helperMemory, serviceMemory]) => [
|
|
36
|
+
.all([args.image, args.memory, args.helperMemory, args.serviceMemory, args.nodeSelector])
|
|
37
|
+
.apply(([image, memory, helperMemory, serviceMemory, nodeSelector]) => [
|
|
40
38
|
"[[runners]]",
|
|
39
|
+
"[runners.feature_flags]",
|
|
40
|
+
"FF_GITLAB_REGISTRY_HELPER_IMAGE = true",
|
|
41
41
|
"[runners.kubernetes]",
|
|
42
|
-
`image = "${image}"`,
|
|
42
|
+
`image = "${image ?? Runner.defaultImage}"`,
|
|
43
43
|
memory && memory.request ? `memory_request = "${memory.request}"` : undefined,
|
|
44
44
|
memory && memory.limit ? `memory_limit = "${memory.limit}"` : undefined,
|
|
45
45
|
helperMemory && helperMemory.request ? `helper_memory_request = "${helperMemory.request}"` : undefined,
|
|
46
46
|
helperMemory && helperMemory.limit ? `helper_memory_limit = "${helperMemory.limit}"` : undefined,
|
|
47
47
|
serviceMemory && serviceMemory.request ? `service_memory_request = "${serviceMemory.request}"` : undefined,
|
|
48
48
|
serviceMemory && serviceMemory.limit ? `service_memory_limit = "${serviceMemory.limit}"` : undefined,
|
|
49
|
-
"[runners.
|
|
50
|
-
"
|
|
49
|
+
"[runners.kubernetes.node_selector]",
|
|
50
|
+
...(nodeSelector ? Object.keys(nodeSelector).map((key) => `"${key}" = "${nodeSelector[key]}"`) : []),
|
|
51
|
+
"[runners.kubernetes.node_tolerations]",
|
|
52
|
+
`"ydkn.network/role=build" = ""`,
|
|
53
|
+
"[[runners.kubernetes.volumes.host_path]]",
|
|
54
|
+
`name = "docker"`,
|
|
55
|
+
`mount_path = "/var/run/docker.sock"`,
|
|
56
|
+
`path = "/var/run/docker.sock"`,
|
|
51
57
|
]
|
|
52
58
|
.filter((l) => l)
|
|
53
59
|
.join("\n"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/gitlab/runners/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,UAAU,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,UAAU,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/gitlab/runners/runner.ts"],"names":[],"mappings":"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"}
|
package/lib/grafana/agent.js
CHANGED
|
@@ -99,6 +99,11 @@ export class Agent extends ComponentResource {
|
|
|
99
99
|
matchLabels: { agent: "grafana-agent-logs" },
|
|
100
100
|
},
|
|
101
101
|
},
|
|
102
|
+
resources: {
|
|
103
|
+
requests: { memory: "128Mi" },
|
|
104
|
+
limits: { memory: "512Mi" },
|
|
105
|
+
},
|
|
106
|
+
tolerations: [{ operator: "Exists" }],
|
|
102
107
|
},
|
|
103
108
|
}, { ...k8sOpts, dependsOn: [this.helmRelease] });
|
|
104
109
|
if (args.metrics !== undefined) {
|
package/lib/grafana/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/grafana/agent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/grafana/agent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ydkn/pulumi-components",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.5",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"pulumi"
|
|
6
6
|
],
|
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@types/bcrypt": "^5.0.2",
|
|
18
18
|
"@types/js-yaml": "^4.0.9",
|
|
19
|
-
"@types/node": "^20.11.
|
|
19
|
+
"@types/node": "^20.11.19",
|
|
20
20
|
"@types/ssh2": "^1.11.19",
|
|
21
21
|
"@types/ssh2-sftp-client": "^9.0.3",
|
|
22
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
23
|
-
"@typescript-eslint/parser": "^
|
|
22
|
+
"@typescript-eslint/eslint-plugin": "^7.0.1",
|
|
23
|
+
"@typescript-eslint/parser": "^7.0.1",
|
|
24
24
|
"bcrypt": "^5.1.1",
|
|
25
25
|
"copyfiles": "^2.4.1",
|
|
26
26
|
"eslint": "^8.56.0",
|
|
@@ -28,19 +28,19 @@
|
|
|
28
28
|
"eslint-plugin-functional": "^6.0.0",
|
|
29
29
|
"eslint-plugin-import": "^2.29.1",
|
|
30
30
|
"eslint-plugin-promise": "^6.1.1",
|
|
31
|
-
"eslint-plugin-security": "^2.1.
|
|
31
|
+
"eslint-plugin-security": "^2.1.1",
|
|
32
32
|
"prettier": "^3.2.5",
|
|
33
33
|
"rimraf": "^5.0.5",
|
|
34
34
|
"typescript": "^5.3.3"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@pulumi/aws": "^6.
|
|
37
|
+
"@pulumi/aws": "^6.22.2",
|
|
38
38
|
"@pulumi/cloudflare": "^5.20.0",
|
|
39
39
|
"@pulumi/gitlab": "^6.8.1",
|
|
40
40
|
"@pulumi/hcloud": "^1.17.0",
|
|
41
41
|
"@pulumi/kubernetes": "^4.7.1",
|
|
42
42
|
"@pulumi/mailgun": "^3.5.1",
|
|
43
|
-
"@pulumi/pulumi": "^3.
|
|
43
|
+
"@pulumi/pulumi": "^3.106.0",
|
|
44
44
|
"@pulumi/random": "^4.15.1",
|
|
45
45
|
"@pulumi/tls": "^5.0.1",
|
|
46
46
|
"@ydkn/pulumi-k0s": "^0.1.11",
|