@ydkn/pulumi-components 0.7.11 → 0.7.12
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/runners/runner.d.ts +0 -2
- package/lib/gitlab/runners/runner.js +2 -6
- package/lib/gitlab/runners/runner.js.map +1 -1
- package/lib/grafana/agent.d.ts +2 -0
- package/lib/grafana/agent.js +7 -4
- package/lib/grafana/agent.js.map +1 -1
- package/lib/netbird/agent.d.ts +2 -1
- package/lib/netbird/agent.js +21 -16
- package/lib/netbird/agent.js.map +1 -1
- package/lib/netbird/assets/nftables.sh +33 -0
- package/lib/rook/blockPool.d.ts +5 -0
- package/lib/rook/blockPool.js +2 -1
- package/lib/rook/blockPool.js.map +1 -1
- package/lib/rook/filesystem.d.ts +2 -6
- package/lib/rook/filesystem.js +1 -0
- package/lib/rook/filesystem.js.map +1 -1
- package/lib/traefik/middleware.js +1 -1
- package/lib/traefik/middleware.js.map +1 -1
- package/lib/transmission/deployment.js +1 -1
- package/lib/ubuntu/deployment.d.ts +2 -0
- package/lib/ubuntu/deployment.js +7 -4
- package/lib/ubuntu/deployment.js.map +1 -1
- package/package.json +12 -12
- package/lib/netbird/assets/fix-nftables.sh +0 -20
|
@@ -9,8 +9,6 @@ export interface RunnerArgs {
|
|
|
9
9
|
token: pulumi.Input<string>;
|
|
10
10
|
concurrency?: pulumi.Input<number>;
|
|
11
11
|
checkInterval?: pulumi.Input<number>;
|
|
12
|
-
tags?: pulumi.Input<pulumi.Input<string>[]>;
|
|
13
|
-
runUntagged?: pulumi.Input<boolean>;
|
|
14
12
|
image?: pulumi.Input<string>;
|
|
15
13
|
memory?: pulumi.Input<RunnerArgs>;
|
|
16
14
|
helperMemory?: pulumi.Input<RunnerArgs>;
|
|
@@ -64,15 +64,11 @@ export class Runner extends ComponentResource {
|
|
|
64
64
|
values: {
|
|
65
65
|
fullnameOverride: name,
|
|
66
66
|
gitlabUrl: "https://gitlab.com/",
|
|
67
|
-
|
|
67
|
+
runnerToken: args.token,
|
|
68
68
|
concurrent: args.concurrency,
|
|
69
69
|
checkInterval: args.checkInterval ?? 30,
|
|
70
70
|
rbac: { create: true },
|
|
71
|
-
runners: {
|
|
72
|
-
config,
|
|
73
|
-
tags: pulumi.all([args.tags]).apply((tags) => (tags ?? []).join(",")),
|
|
74
|
-
runUntagged: args.runUntagged ?? false,
|
|
75
|
-
},
|
|
71
|
+
runners: { config },
|
|
76
72
|
resources: {
|
|
77
73
|
requests: { memory: "64Mi" },
|
|
78
74
|
limits: { memory: "96Mi" },
|
|
@@ -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":"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;AAmBxD,MAAM,OAAO,MAAO,SAAQ,iBAAiB;IACnC,MAAM,CAAU,YAAY,GAAG,eAAe,CAAC;IAEtC,WAAW,CAAsB;IACjC,UAAU,CAAwB;IACnC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAgB,EAAE,IAAsC;QAChF,KAAK,CAAC,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACvB,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,gBAAgB;gBAC1C,6BAA6B,EAAE,QAAQ;gBACvC,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM;aAClB,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aACxF,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,EAAE,CACpE;YACE,aAAa;YACb,yBAAyB;YACzB,wCAAwC;YACxC,sBAAsB;YACtB,YAAY,KAAK,IAAI,MAAM,CAAC,YAAY,GAAG;YAC3C,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS;YAC7E,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS;YACvE,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,4BAA4B,YAAY,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS;YACtG,YAAY,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS;YAChG,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B,aAAa,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS;YAC1G,aAAa,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,2BAA2B,aAAa,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS;YACpG,oCAAoC;YACpC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,QAAQ,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpG,uCAAuC;YACvC,gCAAgC;YAChC,0CAA0C;YAC1C,iBAAiB;YACjB,qCAAqC;YACrC,+BAA+B;SAChC;aACE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QAEJ,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC/C,IAAI,EACJ;YACE,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,cAAc,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;YACrD,KAAK,EAAE,eAAe;YACtB,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,SAAS,EAAE,qBAAqB;gBAChC,WAAW,EAAE,IAAI,CAAC,KAAK;gBACvB,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,EAAE;gBACvC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACtB,OAAO,EAAE,EAAE,MAAM,EAAE;gBACnB,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC3B;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,UAAU,CACzC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBACxC,mBAAmB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;aAC/D;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC"}
|
package/lib/grafana/agent.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
|
+
import * as k8s from "@pulumi/kubernetes";
|
|
2
3
|
import { ComponentResource } from "../common/index.js";
|
|
3
4
|
export interface MetricsArgs {
|
|
4
5
|
url: pulumi.Input<string>;
|
|
@@ -15,6 +16,7 @@ export interface AgentArgs {
|
|
|
15
16
|
clusterName: pulumi.Input<string>;
|
|
16
17
|
metrics?: pulumi.Input<MetricsArgs>;
|
|
17
18
|
logs?: pulumi.Input<LogsArgs>;
|
|
19
|
+
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
18
20
|
}
|
|
19
21
|
export declare class Agent extends ComponentResource {
|
|
20
22
|
private static readonly metricsLabels;
|
package/lib/grafana/agent.js
CHANGED
|
@@ -27,6 +27,12 @@ export class Agent extends ComponentResource {
|
|
|
27
27
|
*/
|
|
28
28
|
constructor(name, args, opts) {
|
|
29
29
|
super("grafana:agent", name, args, opts);
|
|
30
|
+
if (args.resources === undefined) {
|
|
31
|
+
args.resources = {
|
|
32
|
+
requests: { memory: "256Mi" },
|
|
33
|
+
limits: { memory: "512Mi" },
|
|
34
|
+
};
|
|
35
|
+
}
|
|
30
36
|
const k8sOpts = this.opts(k8s.Provider);
|
|
31
37
|
this.namespace = args.namespace
|
|
32
38
|
? pulumi.output(args.namespace)
|
|
@@ -42,10 +48,7 @@ export class Agent extends ComponentResource {
|
|
|
42
48
|
namespace: this.namespace,
|
|
43
49
|
serviceName: "kubelet",
|
|
44
50
|
},
|
|
45
|
-
resources:
|
|
46
|
-
requests: { memory: "384Mi" },
|
|
47
|
-
limits: { memory: "1024Mi" },
|
|
48
|
-
},
|
|
51
|
+
resources: args.resources,
|
|
49
52
|
},
|
|
50
53
|
}, k8sOpts);
|
|
51
54
|
const metadata = {
|
package/lib/grafana/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/grafana/agent.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;AACrD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/grafana/agent.ts"],"names":[],"mappings":"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"}
|
package/lib/netbird/agent.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export interface AgentArgs {
|
|
|
8
8
|
interfaceName?: pulumi.Input<string>;
|
|
9
9
|
interfacePort?: pulumi.Input<number>;
|
|
10
10
|
networkRange?: pulumi.Input<string>;
|
|
11
|
+
masqueradeAll?: pulumi.Input<boolean>;
|
|
11
12
|
nodeSelector?: pulumi.Input<{
|
|
12
13
|
[key: string]: pulumi.Input<string>;
|
|
13
14
|
}>;
|
|
@@ -19,7 +20,7 @@ export declare class Agent extends ComponentResource {
|
|
|
19
20
|
static readonly interfacePort = 51820;
|
|
20
21
|
private readonly extraBlacklistInterfaces;
|
|
21
22
|
private readonly secret;
|
|
22
|
-
private readonly
|
|
23
|
+
private readonly nftablesScript;
|
|
23
24
|
private readonly daemonSet;
|
|
24
25
|
private readonly podDisruptionBudget;
|
|
25
26
|
readonly namespace: pulumi.Output<string>;
|
package/lib/netbird/agent.js
CHANGED
|
@@ -11,7 +11,7 @@ export class Agent extends ComponentResource {
|
|
|
11
11
|
static interfacePort = 51820;
|
|
12
12
|
extraBlacklistInterfaces;
|
|
13
13
|
secret;
|
|
14
|
-
|
|
14
|
+
nftablesScript;
|
|
15
15
|
daemonSet;
|
|
16
16
|
podDisruptionBudget;
|
|
17
17
|
namespace;
|
|
@@ -53,7 +53,7 @@ export class Agent extends ComponentResource {
|
|
|
53
53
|
},
|
|
54
54
|
};
|
|
55
55
|
const secretName = name;
|
|
56
|
-
const
|
|
56
|
+
const nftablesScriptName = `${metadata.name}-nftables`;
|
|
57
57
|
this.secret = new kubernetes.v1.Secret(name, {
|
|
58
58
|
metadata: { ...metadata, name: secretName },
|
|
59
59
|
stringData: {
|
|
@@ -66,10 +66,10 @@ export class Agent extends ComponentResource {
|
|
|
66
66
|
DISABLE_CUSTOM_ROUTING: "true",
|
|
67
67
|
},
|
|
68
68
|
}, opts);
|
|
69
|
-
this.
|
|
70
|
-
metadata: { ...metadata, name:
|
|
69
|
+
this.nftablesScript = new k8s.core.v1.ConfigMap(name, {
|
|
70
|
+
metadata: { ...metadata, name: nftablesScriptName },
|
|
71
71
|
data: {
|
|
72
|
-
"
|
|
72
|
+
"nftables.sh": fs.readFileSync(path.join(path.dirname(url.fileURLToPath(import.meta.url)), "assets", "nftables.sh"), "utf-8"),
|
|
73
73
|
},
|
|
74
74
|
}, opts);
|
|
75
75
|
this.daemonSet = new k8s.apps.v1.DaemonSet(name, {
|
|
@@ -105,27 +105,32 @@ export class Agent extends ComponentResource {
|
|
|
105
105
|
limits: { memory: "64Mi" },
|
|
106
106
|
},
|
|
107
107
|
},
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
name: "fix-nftables",
|
|
108
|
+
{
|
|
109
|
+
name: "nftables",
|
|
111
110
|
image: "alpine:latest",
|
|
112
111
|
imagePullPolicy: "Always",
|
|
113
112
|
securityContext: { capabilities: { add: ["NET_ADMIN"] } },
|
|
114
|
-
command: [
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
args.networkRange,
|
|
113
|
+
command: ["/usr/local/bin/nftables.sh"],
|
|
114
|
+
envFrom: [{ secretRef: { name: secretName }, prefix: "NB_" }],
|
|
115
|
+
env: [
|
|
116
|
+
{ name: "NETWORK_RANGE", value: args.networkRange ?? "" },
|
|
117
|
+
{
|
|
118
|
+
name: "MASQUERADE_ALL",
|
|
119
|
+
value: pulumi
|
|
120
|
+
.all([args.masqueradeAll])
|
|
121
|
+
.apply(([masqueradeAll]) => (masqueradeAll ? "true" : "false")),
|
|
122
|
+
},
|
|
118
123
|
],
|
|
119
|
-
volumeMounts: [{ name: "
|
|
124
|
+
volumeMounts: [{ name: "nftables", mountPath: "/usr/local/bin" }],
|
|
120
125
|
resources: {
|
|
121
126
|
requests: { memory: "16Mi" },
|
|
122
127
|
limits: { memory: "96Mi" },
|
|
123
128
|
},
|
|
124
|
-
}
|
|
125
|
-
|
|
129
|
+
},
|
|
130
|
+
],
|
|
126
131
|
volumes: [
|
|
127
132
|
{ name: "config", hostPath: { path: `/var/lib/netbird/${name}`, type: "DirectoryOrCreate" } },
|
|
128
|
-
{ name: "
|
|
133
|
+
{ name: "nftables", configMap: { name: nftablesScriptName, defaultMode: 0o755 } },
|
|
129
134
|
],
|
|
130
135
|
terminationGracePeriodSeconds: 10,
|
|
131
136
|
},
|
package/lib/netbird/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/netbird/agent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../lib/netbird/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
|
|
3
|
+
INTERVAL="20"
|
|
4
|
+
INITAL_DELAY="10"
|
|
5
|
+
|
|
6
|
+
apk --quiet --no-cache add nftables
|
|
7
|
+
|
|
8
|
+
sleep "${INITAL_DELAY}" &
|
|
9
|
+
wait $!
|
|
10
|
+
|
|
11
|
+
while :; do
|
|
12
|
+
if [ -n "${NETWORK_RANGE}" ]; then
|
|
13
|
+
input_handle=$(nft -a -n list ruleset 2>/dev/null | grep "iifname \"${NB_INTERFACE_NAME}\" ip saddr ${NETWORK_RANGE} ip daddr ${NETWORK_RANGE} jump netbird-acl-input-rules" | awk '{print $NF}')
|
|
14
|
+
if [ -z "${input_handle}" ]; then
|
|
15
|
+
nft add rule netbird netbird-acl-input-filter position 8 iifname "${NB_INTERFACE_NAME}" ip saddr "${NETWORK_RANGE}" ip daddr "${NETWORK_RANGE}" jump netbird-acl-input-rules
|
|
16
|
+
fi
|
|
17
|
+
|
|
18
|
+
output_handle=$(nft -a -n list ruleset 2>/dev/null | grep "oifname \"${NB_INTERFACE_NAME}\" ip saddr ${NETWORK_RANGE} ip daddr ${NETWORK_RANGE} jump netbird-acl-output-rules" | awk '{print $NF}')
|
|
19
|
+
if [ -z "${output_handle}" ]; then
|
|
20
|
+
nft add rule netbird netbird-acl-output-filter position 13 oifname "${NB_INTERFACE_NAME}" ip saddr "${NETWORK_RANGE}" ip daddr "${NETWORK_RANGE}" jump netbird-acl-output-rules
|
|
21
|
+
fi
|
|
22
|
+
fi
|
|
23
|
+
|
|
24
|
+
if [ "${MASQUERADE_ALL}" = "true" ]; then
|
|
25
|
+
masquerade_handle=$(nft -a -n list ruleset 2>/dev/null | grep "oif \"${NB_INTERFACE_NAME}\" masquerade" | awk '{print $NF}')
|
|
26
|
+
if [ -z "${masquerade_handle}" ]; then
|
|
27
|
+
nft add rule netbird netbird-rt-nat oif "${NB_INTERFACE_NAME}" masquerade
|
|
28
|
+
fi
|
|
29
|
+
fi
|
|
30
|
+
|
|
31
|
+
sleep "${INTERVAL}" &
|
|
32
|
+
wait $!
|
|
33
|
+
done
|
package/lib/rook/blockPool.d.ts
CHANGED
|
@@ -4,9 +4,14 @@ import { ComponentResource } from "../common/index.js";
|
|
|
4
4
|
export interface BlockPoolSpecReplicatedArgs {
|
|
5
5
|
size?: pulumi.Input<number>;
|
|
6
6
|
}
|
|
7
|
+
export interface BlockPoolSpecErasureCodedArgs {
|
|
8
|
+
dataChunks: pulumi.Input<number>;
|
|
9
|
+
codingChunks: pulumi.Input<number>;
|
|
10
|
+
}
|
|
7
11
|
export interface BlockPoolSpecArgs {
|
|
8
12
|
failureDomain?: pulumi.Input<string>;
|
|
9
13
|
replicated?: pulumi.Input<BlockPoolSpecReplicatedArgs>;
|
|
14
|
+
erasureCoded?: pulumi.Input<BlockPoolSpecErasureCodedArgs>;
|
|
10
15
|
}
|
|
11
16
|
export interface BlockPoolArgs {
|
|
12
17
|
metadata: pulumi.Input<k8s.types.input.meta.v1.ObjectMeta>;
|
package/lib/rook/blockPool.js
CHANGED
|
@@ -19,8 +19,9 @@ export class BlockPool extends ComponentResource {
|
|
|
19
19
|
metadata: args.metadata,
|
|
20
20
|
spec: pulumi.all([args.spec]).apply(([spec]) => {
|
|
21
21
|
return {
|
|
22
|
-
failureDomain: spec.failureDomain,
|
|
22
|
+
failureDomain: spec.failureDomain ?? "host",
|
|
23
23
|
replicated: spec.replicated,
|
|
24
|
+
erasureCoded: spec.erasureCoded,
|
|
24
25
|
};
|
|
25
26
|
}),
|
|
26
27
|
}, opts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockPool.js","sourceRoot":"","sources":["../../../lib/rook/blockPool.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;
|
|
1
|
+
{"version":3,"file":"blockPool.js","sourceRoot":"","sources":["../../../lib/rook/blockPool.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;AAwBvD,MAAM,OAAO,SAAU,SAAQ,iBAAiB;IAC7B,aAAa,CAAmC;IAChD,YAAY,CAA8B;IAE3D;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAmB,EAAE,IAAsC;QACnF,KAAK,CAAC,sBAAsB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEhD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,cAAc,CACvD,IAAI,EACJ;YACE,UAAU,EAAE,iBAAiB;YAC7B,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC7C,OAAO;oBACL,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,MAAM;oBAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;iBAChC,CAAC;YACJ,CAAC,CAAC;SACH,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CACjD,IAAI,EACJ;YACE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,EAAE;gBACxG,OAAO;oBACL,GAAG,QAAQ;oBACX,WAAW,EAAE;wBACX,GAAG,QAAQ,CAAC,WAAW;wBACvB,6CAA6C,EAAE,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;qBACtF;iBACF,CAAC;YACJ,CAAC,CAAC;YACF,WAAW,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,CAAC,SAAS,mBAAmB;YACnE,UAAU,EAAE;gBACV,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI;gBACtC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,GAAG;gBAChB,aAAa,EAAE,UAAU;gBACzB,4CAA4C,EAAE,0BAA0B;gBACxE,iDAAiD,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS;gBACxF,kDAAkD,EAAE,0BAA0B;gBAC9E,uDAAuD,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS;gBAC9F,2CAA2C,EAAE,mBAAmB;gBAChE,gDAAgD,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS;gBACvF,2BAA2B,EAAE,MAAM;aACpC;YACD,aAAa,EAAE,QAAQ;YACvB,oBAAoB,EAAE,IAAI;YAC1B,YAAY,EAAE,EAAE;SACjB,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
|
package/lib/rook/filesystem.d.ts
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
2
|
import * as k8s from "@pulumi/kubernetes";
|
|
3
3
|
import { ComponentResource } from "../common/index.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
7
|
-
export interface FilesystemDataPoolArgs {
|
|
4
|
+
import { BlockPoolSpecArgs } from "./blockPool.js";
|
|
5
|
+
export interface FilesystemDataPoolArgs extends BlockPoolSpecArgs {
|
|
8
6
|
name: pulumi.Input<string>;
|
|
9
|
-
failureDomain?: pulumi.Input<string>;
|
|
10
|
-
replicated?: pulumi.Input<FilesystemReplicatedArgs>;
|
|
11
7
|
}
|
|
12
8
|
export interface FilesystemArgs {
|
|
13
9
|
metadata: pulumi.Input<k8s.types.input.meta.v1.ObjectMeta>;
|
package/lib/rook/filesystem.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filesystem.js","sourceRoot":"","sources":["../../../lib/rook/filesystem.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;
|
|
1
|
+
{"version":3,"file":"filesystem.js","sourceRoot":"","sources":["../../../lib/rook/filesystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export class Middleware extends k8s.apiextensions.CustomResource {
|
|
|
8
8
|
*/
|
|
9
9
|
constructor(name, args, opts) {
|
|
10
10
|
super(name, {
|
|
11
|
-
apiVersion: "traefik.
|
|
11
|
+
apiVersion: "traefik.io/v1alpha1",
|
|
12
12
|
kind: "Middleware",
|
|
13
13
|
metadata: args.metadata,
|
|
14
14
|
spec: args.spec,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../lib/traefik/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAgB1C,MAAM,OAAO,UAAW,SAAQ,GAAG,CAAC,aAAa,CAAC,cAAc;IAC9D;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAoB,EAAE,IAAmC;QACjF,KAAK,CACH,IAAI,EACJ;YACE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../lib/traefik/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAgB1C,MAAM,OAAO,UAAW,SAAQ,GAAG,CAAC,aAAa,CAAC,cAAc;IAC9D;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAoB,EAAE,IAAmC;QACjF,KAAK,CACH,IAAI,EACJ;YACE,UAAU,EAAE,qBAAqB;YACjC,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
|
+
import * as k8s from "@pulumi/kubernetes";
|
|
2
3
|
import { ComponentResource } from "../common/index.js";
|
|
3
4
|
import * as kubernetes from "../kubernetes/index.js";
|
|
4
5
|
import * as rook from "../rook/index.js";
|
|
@@ -34,6 +35,7 @@ export interface UbuntuArgs {
|
|
|
34
35
|
serviceType?: pulumi.Input<string>;
|
|
35
36
|
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
36
37
|
hostNetwork?: pulumi.Input<boolean>;
|
|
38
|
+
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
37
39
|
}
|
|
38
40
|
export declare class Ubuntu extends ComponentResource {
|
|
39
41
|
private static readonly sshContainerPort;
|
package/lib/ubuntu/deployment.js
CHANGED
|
@@ -36,6 +36,12 @@ export class Ubuntu extends ComponentResource {
|
|
|
36
36
|
if (args.replicas === undefined) {
|
|
37
37
|
args.replicas = 1;
|
|
38
38
|
}
|
|
39
|
+
if (args.resources === undefined) {
|
|
40
|
+
args.resources = {
|
|
41
|
+
requests: { memory: "256Mi" },
|
|
42
|
+
limits: { memory: "384Mi" },
|
|
43
|
+
};
|
|
44
|
+
}
|
|
39
45
|
this.sshPrivateKeysRSA = new tls.PrivateKey(`${name}-rsa`, { algorithm: "RSA", rsaBits: 8192 }, opts);
|
|
40
46
|
this.sshPrivateKeysECDSA = new tls.PrivateKey(`${name}-ecdsa`, { algorithm: "ECDSA", ecdsaCurve: "P521" }, opts);
|
|
41
47
|
this.sshPrivateKeysED25519 = new tls.PrivateKey(`${name}-ed25519`, { algorithm: "ED25519" }, opts);
|
|
@@ -184,10 +190,7 @@ export class Ubuntu extends ComponentResource {
|
|
|
184
190
|
{ name: "KUBERNETES_POD_IP", valueFrom: { fieldRef: { fieldPath: "status.podIP" } } },
|
|
185
191
|
],
|
|
186
192
|
ports: [{ name: "ssh", containerPort: Ubuntu.sshContainerPort, protocol: "TCP" }],
|
|
187
|
-
resources:
|
|
188
|
-
requests: { memory: "256Mi" },
|
|
189
|
-
limits: { memory: "384Mi" },
|
|
190
|
-
},
|
|
193
|
+
resources: args.resources,
|
|
191
194
|
readinessProbe: {
|
|
192
195
|
periodSeconds: 20,
|
|
193
196
|
timeoutSeconds: 3,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/ubuntu/deployment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/ubuntu/deployment.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.12",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"pulumi"
|
|
6
6
|
],
|
|
@@ -16,14 +16,14 @@
|
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@types/bcrypt": "^5.0.2",
|
|
18
18
|
"@types/js-yaml": "^4.0.9",
|
|
19
|
-
"@types/node": "^20.12.
|
|
19
|
+
"@types/node": "^20.12.10",
|
|
20
20
|
"@types/ssh2": "^1.15.0",
|
|
21
21
|
"@types/ssh2-sftp-client": "^9.0.3",
|
|
22
|
-
"@typescript-eslint/eslint-plugin": "^7.
|
|
23
|
-
"@typescript-eslint/parser": "^7.
|
|
22
|
+
"@typescript-eslint/eslint-plugin": "^7.8.0",
|
|
23
|
+
"@typescript-eslint/parser": "^7.8.0",
|
|
24
24
|
"bcrypt": "^5.1.1",
|
|
25
25
|
"copyfiles": "^2.4.1",
|
|
26
|
-
"eslint": "^9.
|
|
26
|
+
"eslint": "^9.2.0",
|
|
27
27
|
"eslint-config-prettier": "^9.1.0",
|
|
28
28
|
"eslint-plugin-functional": "^6.5.1",
|
|
29
29
|
"eslint-plugin-import": "^2.29.1",
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
"typescript": "^5.4.5"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@pulumi/aws": "^6.
|
|
38
|
-
"@pulumi/cloudflare": "^5.
|
|
37
|
+
"@pulumi/aws": "^6.33.1",
|
|
38
|
+
"@pulumi/cloudflare": "^5.27.0",
|
|
39
39
|
"@pulumi/command": "^0.10.0",
|
|
40
40
|
"@pulumi/gitlab": "^6.11.0",
|
|
41
|
-
"@pulumi/hcloud": "^1.
|
|
41
|
+
"@pulumi/hcloud": "^1.19.0",
|
|
42
42
|
"@pulumi/kubernetes": "^4.11.0",
|
|
43
|
-
"@pulumi/mailgun": "^3.5.
|
|
44
|
-
"@pulumi/pulumi": "^3.
|
|
43
|
+
"@pulumi/mailgun": "^3.5.3",
|
|
44
|
+
"@pulumi/pulumi": "^3.115.2",
|
|
45
45
|
"@pulumi/random": "^4.16.1",
|
|
46
|
-
"@pulumi/tls": "^5.0.
|
|
46
|
+
"@pulumi/tls": "^5.0.3",
|
|
47
47
|
"@ydkn/pulumi-k0s": "^0.2.1",
|
|
48
48
|
"glob": "^10.3.12",
|
|
49
49
|
"js-yaml": "^4.1.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"ssh2": "^1.15.0",
|
|
52
52
|
"ssh2-sftp-client": "^10.0.3",
|
|
53
53
|
"template-file": "^6.0.1",
|
|
54
|
-
"urllib": "^3.
|
|
54
|
+
"urllib": "^3.25.0"
|
|
55
55
|
},
|
|
56
56
|
"scripts": {
|
|
57
57
|
"clean": "rimraf dist",
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
#!/bin/sh
|
|
2
|
-
|
|
3
|
-
IFACE="${1}"
|
|
4
|
-
CIDR="${2}"
|
|
5
|
-
|
|
6
|
-
apk --quiet --no-cache add nftables
|
|
7
|
-
|
|
8
|
-
while true; do
|
|
9
|
-
input_handle=$(nft -a -n list ruleset 2>/dev/null | grep "iifname \"${IFACE}\" ip saddr ${CIDR} ip daddr ${CIDR} jump netbird-acl-input-rules" | awk '{print $NF}')
|
|
10
|
-
if [ -z "${input_handle}" ]; then
|
|
11
|
-
nft add rule netbird netbird-acl-input-filter position 8 iifname "${IFACE}" ip saddr "${CIDR}" ip daddr "${CIDR}" jump netbird-acl-input-rules
|
|
12
|
-
fi
|
|
13
|
-
|
|
14
|
-
output_handle=$(nft -a -n list ruleset 2>/dev/null | grep "oifname \"${IFACE}\" ip saddr ${CIDR} ip daddr ${CIDR} jump netbird-acl-output-rules" | awk '{print $NF}')
|
|
15
|
-
if [ -z "${output_handle}" ]; then
|
|
16
|
-
nft add rule netbird netbird-acl-output-filter position 13 oifname "${IFACE}" ip saddr "${CIDR}" ip daddr "${CIDR}" jump netbird-acl-output-rules
|
|
17
|
-
fi
|
|
18
|
-
|
|
19
|
-
sleep 10
|
|
20
|
-
done
|