@ydkn/pulumi-components 0.6.0 → 0.6.2
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/avahi/service.d.ts +1 -1
- package/lib/avahi/service.d.ts.map +1 -1
- package/lib/avahi/service.js +4 -2
- package/lib/avahi/service.js.map +1 -1
- package/lib/cups/avahiService.d.ts +20 -0
- package/lib/cups/avahiService.d.ts.map +1 -0
- package/lib/cups/avahiService.js +80 -0
- package/lib/cups/avahiService.js.map +1 -0
- package/lib/cups/deployment.d.ts.map +1 -1
- package/lib/cups/deployment.js +5 -38
- package/lib/cups/deployment.js.map +1 -1
- package/lib/cups/index.d.ts +2 -1
- package/lib/cups/index.d.ts.map +1 -1
- package/lib/cups/index.js +3 -1
- package/lib/cups/index.js.map +1 -1
- package/lib/hcloud/netbirdAgent.d.ts +2 -3
- package/lib/hcloud/netbirdAgent.d.ts.map +1 -1
- package/lib/hcloud/netbirdAgent.js +2 -13
- package/lib/hcloud/netbirdAgent.js.map +1 -1
- package/lib/hcloud/netbirdManagement.d.ts +2 -3
- package/lib/hcloud/netbirdManagement.d.ts.map +1 -1
- package/lib/hcloud/netbirdManagement.js +2 -13
- package/lib/hcloud/netbirdManagement.js.map +1 -1
- package/lib/hcloud/wireguard.d.ts +2 -3
- package/lib/hcloud/wireguard.d.ts.map +1 -1
- package/lib/hcloud/wireguard.js +2 -12
- package/lib/hcloud/wireguard.js.map +1 -1
- package/lib/netbird/agent.d.ts +1 -0
- package/lib/netbird/agent.d.ts.map +1 -1
- package/lib/netbird/agent.js +1 -1
- package/lib/netbird/agent.js.map +1 -1
- package/lib/netbird/management.d.ts +12 -0
- package/lib/netbird/management.d.ts.map +1 -1
- package/lib/netbird/management.js +37 -31
- package/lib/netbird/management.js.map +1 -1
- package/lib/node/gateway.d.ts +9 -0
- package/lib/node/gateway.d.ts.map +1 -0
- package/lib/node/gateway.js +12 -0
- package/lib/node/gateway.js.map +1 -0
- package/lib/node/index.d.ts +3 -2
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +8 -1
- package/lib/node/index.js.map +1 -1
- package/lib/node/node.d.ts +3 -0
- package/lib/node/node.d.ts.map +1 -1
- package/lib/node/node.js +44 -0
- package/lib/node/node.js.map +1 -1
- package/lib/samba/avahiService.d.ts +22 -0
- package/lib/samba/avahiService.d.ts.map +1 -0
- package/lib/samba/avahiService.js +71 -0
- package/lib/samba/avahiService.js.map +1 -0
- package/lib/samba/dc.d.ts +7 -1
- package/lib/samba/dc.d.ts.map +1 -1
- package/lib/samba/dc.js +13 -3
- package/lib/samba/dc.js.map +1 -1
- package/lib/samba/deployment.d.ts +9 -6
- package/lib/samba/deployment.d.ts.map +1 -1
- package/lib/samba/deployment.js +79 -43
- package/lib/samba/deployment.js.map +1 -1
- package/lib/samba/index.d.ts +3 -2
- package/lib/samba/index.d.ts.map +1 -1
- package/lib/samba/index.js +3 -1
- package/lib/samba/index.js.map +1 -1
- package/lib/ubuntu/assets/init.sh +19 -13
- package/lib/wireguard/deployment.d.ts +0 -2
- package/lib/wireguard/deployment.d.ts.map +1 -1
- package/lib/wireguard/deployment.js +2 -5
- package/lib/wireguard/deployment.js.map +1 -1
- package/package.json +14 -14
|
@@ -6,6 +6,7 @@ export interface ShareArgs {
|
|
|
6
6
|
id: pulumi.Input<string>;
|
|
7
7
|
name: pulumi.Input<string>;
|
|
8
8
|
comment?: pulumi.Input<string>;
|
|
9
|
+
timeMachine?: pulumi.Input<boolean>;
|
|
9
10
|
}
|
|
10
11
|
export interface PVCVolumeArgs extends ShareArgs {
|
|
11
12
|
accessModes?: pulumi.Input<pulumi.Input<string>[]>;
|
|
@@ -20,22 +21,22 @@ export interface NFSVolumeArgs extends ShareArgs, kubernetes.v1.NfsVolumeConfig
|
|
|
20
21
|
export interface SharedFilesystemVolumeArgs extends ShareArgs {
|
|
21
22
|
filesystemName: pulumi.Input<string>;
|
|
22
23
|
}
|
|
23
|
-
export interface User {
|
|
24
|
-
name: pulumi.Input<string>;
|
|
25
|
-
uid: pulumi.Input<number>;
|
|
26
|
-
}
|
|
27
24
|
export interface SambaArgs {
|
|
28
25
|
namespace?: pulumi.Input<string>;
|
|
29
26
|
serverName: pulumi.Input<string>;
|
|
30
27
|
workgroup: pulumi.Input<string>;
|
|
31
|
-
|
|
28
|
+
domain?: pulumi.Input<string>;
|
|
29
|
+
domainNameservers?: pulumi.Input<pulumi.Input<string>[]>;
|
|
30
|
+
domainJoinUsername?: pulumi.Input<string>;
|
|
31
|
+
domainJoinPassword?: pulumi.Input<string>;
|
|
32
|
+
deviceModel?: pulumi.Input<string>;
|
|
32
33
|
hostname: pulumi.Input<string>;
|
|
33
|
-
users: pulumi.Input<pulumi.Input<User>[]>;
|
|
34
34
|
pvcVolumes?: pulumi.Input<pulumi.Input<PVCVolumeArgs>[]>;
|
|
35
35
|
nfsVolumes?: pulumi.Input<pulumi.Input<NFSVolumeArgs>[]>;
|
|
36
36
|
sharedFilesystemVolumes?: pulumi.Input<pulumi.Input<SharedFilesystemVolumeArgs>[]>;
|
|
37
37
|
serviceType?: pulumi.Input<string>;
|
|
38
38
|
avahiLabelName?: pulumi.Input<string>;
|
|
39
|
+
avahiServiceName?: pulumi.Input<string>;
|
|
39
40
|
storageClassName?: pulumi.Input<string>;
|
|
40
41
|
nodeSelector?: pulumi.Input<{
|
|
41
42
|
[key: string]: pulumi.Input<string>;
|
|
@@ -49,11 +50,13 @@ export declare class Samba extends ComponentResource {
|
|
|
49
50
|
}>;
|
|
50
51
|
private static readonly vetoFiles;
|
|
51
52
|
private readonly settings;
|
|
53
|
+
private readonly domainJoinCredentials;
|
|
52
54
|
private readonly calicoIpReservations?;
|
|
53
55
|
private readonly dataVolumeClaim;
|
|
54
56
|
private readonly deployment;
|
|
55
57
|
private readonly podDisruptionBudget;
|
|
56
58
|
private readonly service;
|
|
59
|
+
private readonly timeMachineUuid?;
|
|
57
60
|
private readonly avahiService?;
|
|
58
61
|
readonly namespace: pulumi.Output<string>;
|
|
59
62
|
readonly hostname: pulumi.Output<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/samba/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAGzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/samba/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/samba/deployment.js
CHANGED
|
@@ -30,7 +30,7 @@ const crypto = __importStar(require("crypto"));
|
|
|
30
30
|
const common_1 = require("../common");
|
|
31
31
|
const kubernetes = __importStar(require("../kubernetes"));
|
|
32
32
|
const rook = __importStar(require("../rook"));
|
|
33
|
-
const
|
|
33
|
+
const avahiService_1 = require("./avahiService");
|
|
34
34
|
class Samba extends common_1.ComponentResource {
|
|
35
35
|
static sharedFilesystemsConfigs;
|
|
36
36
|
static vetoFiles = [
|
|
@@ -47,11 +47,13 @@ class Samba extends common_1.ComponentResource {
|
|
|
47
47
|
"Thumbs.db",
|
|
48
48
|
];
|
|
49
49
|
settings;
|
|
50
|
+
domainJoinCredentials;
|
|
50
51
|
calicoIpReservations;
|
|
51
52
|
dataVolumeClaim;
|
|
52
53
|
deployment;
|
|
53
54
|
podDisruptionBudget;
|
|
54
55
|
service;
|
|
56
|
+
timeMachineUuid;
|
|
55
57
|
avahiService;
|
|
56
58
|
namespace;
|
|
57
59
|
hostname;
|
|
@@ -95,11 +97,12 @@ class Samba extends common_1.ComponentResource {
|
|
|
95
97
|
accessModes: pvcVolume.accessModes ?? ["ReadWriteOnce"],
|
|
96
98
|
resources: { requests: { storage: pvcVolume.size ?? "10Gi" } },
|
|
97
99
|
},
|
|
98
|
-
}, opts);
|
|
100
|
+
}, { ...opts, protect: args.protect });
|
|
99
101
|
volumes.push({
|
|
100
102
|
name: pulumi.output(pvcVolume.name),
|
|
101
103
|
comment: pvcVolume.comment ? pulumi.output(pvcVolume.comment) : undefined,
|
|
102
104
|
persistentVolumeClaimName: pvc.metadata.name,
|
|
105
|
+
timeMachine: pvcVolume.timeMachine,
|
|
103
106
|
});
|
|
104
107
|
}
|
|
105
108
|
for (const nfsVolume of nfsVolumes) {
|
|
@@ -108,6 +111,7 @@ class Samba extends common_1.ComponentResource {
|
|
|
108
111
|
name: pulumi.output(nfsVolume.name),
|
|
109
112
|
comment: nfsVolume.comment ? pulumi.output(nfsVolume.comment) : undefined,
|
|
110
113
|
persistentVolumeClaimName: volume.persistentVolumeClaim.metadata.name,
|
|
114
|
+
timeMachine: nfsVolume.timeMachine,
|
|
111
115
|
});
|
|
112
116
|
}
|
|
113
117
|
for (const sharedFilesystemVolume of sharedFilesystemVolumes) {
|
|
@@ -127,6 +131,7 @@ class Samba extends common_1.ComponentResource {
|
|
|
127
131
|
name: pulumi.output(sharedFilesystemVolume.name),
|
|
128
132
|
comment: sharedFilesystemVolume.comment ? pulumi.output(sharedFilesystemVolume.comment) : undefined,
|
|
129
133
|
persistentVolumeClaimName: sharedFilesystem.persistentVolumeClaim.metadata.name,
|
|
134
|
+
timeMachine: sharedFilesystemVolume.timeMachine,
|
|
130
135
|
});
|
|
131
136
|
}
|
|
132
137
|
return volumes;
|
|
@@ -135,19 +140,23 @@ class Samba extends common_1.ComponentResource {
|
|
|
135
140
|
});
|
|
136
141
|
});
|
|
137
142
|
const config = pulumi
|
|
138
|
-
.all([args.workgroup, args.serverName, args.deviceModel, volumes])
|
|
139
|
-
.apply(([workgroup, serverName, deviceModel, volumes]) => {
|
|
143
|
+
.all([args.workgroup, args.domain, args.serverName, args.deviceModel, volumes])
|
|
144
|
+
.apply(([workgroup, domain, serverName, deviceModel, volumes]) => {
|
|
140
145
|
const sambaConfig = [
|
|
141
146
|
"[global]",
|
|
142
147
|
`workgroup = ${workgroup}`,
|
|
143
148
|
`server string = ${serverName}`,
|
|
144
149
|
`netbios name = ${serverName}`,
|
|
145
|
-
"server role = standalone server",
|
|
146
150
|
"log file = /dev/stdout",
|
|
147
151
|
"max log size = 50",
|
|
148
152
|
"dns proxy = no",
|
|
149
153
|
"map to guest = bad user",
|
|
150
154
|
"usershare allow guests = no",
|
|
155
|
+
"obey pam restrictions = yes",
|
|
156
|
+
"pam password change = no",
|
|
157
|
+
"unix password sync = yes",
|
|
158
|
+
"passwd program = /usr/bin/passwd %u",
|
|
159
|
+
"panic action = /usr/share/samba/panic-action %d",
|
|
151
160
|
"client ipc min protocol = SMB2",
|
|
152
161
|
"client ipc max protocol = SMB3",
|
|
153
162
|
"client min protocol = SMB2",
|
|
@@ -159,7 +168,7 @@ class Samba extends common_1.ComponentResource {
|
|
|
159
168
|
"printing = bsd",
|
|
160
169
|
"printcap name = /dev/null",
|
|
161
170
|
"disable spoolss = yes",
|
|
162
|
-
"socket options = SO_RCVBUF=
|
|
171
|
+
"socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=524288 SO_SNDBUF=524288",
|
|
163
172
|
"min receivefile size = 16384",
|
|
164
173
|
"use sendfile = true",
|
|
165
174
|
"aio max threads = 128",
|
|
@@ -168,25 +177,46 @@ class Samba extends common_1.ComponentResource {
|
|
|
168
177
|
"aio write behind = true",
|
|
169
178
|
"posix locking = no",
|
|
170
179
|
"strict locking = no",
|
|
171
|
-
"follow symlinks = yes",
|
|
172
180
|
"unix extensions = yes",
|
|
173
181
|
"wide links = no",
|
|
174
182
|
"mangled names = no",
|
|
175
183
|
"unix charset = UTF-8",
|
|
176
184
|
"acl allow execute always = yes",
|
|
177
|
-
"vfs objects = catia fruit",
|
|
185
|
+
"vfs objects = catia fruit streams_xattr acl_xattr",
|
|
186
|
+
"map acl inherit = yes",
|
|
187
|
+
"store dos attributes = yes",
|
|
188
|
+
"inherit acls = yes",
|
|
178
189
|
"fruit:aapl = yes",
|
|
179
|
-
"fruit:delete_empty_adfiles = yes",
|
|
180
|
-
"fruit:time machine = yes",
|
|
181
190
|
"fruit:veto_appledouble = yes",
|
|
191
|
+
"fruit:delete_empty_adfiles = yes",
|
|
192
|
+
"fruit:advertise_fullsync = true",
|
|
182
193
|
"fruit:wipe_intentionally_left_blank_rfork = yes",
|
|
183
194
|
`fruit:model = ${deviceModel}`,
|
|
184
|
-
"fruit:locking =
|
|
185
|
-
"
|
|
195
|
+
"fruit:locking = netatalk",
|
|
196
|
+
"fruit:metadata = stream",
|
|
197
|
+
"fruit:posix_rename = yes",
|
|
198
|
+
"fruit:zero_file_id = yes",
|
|
199
|
+
"fruit:resource = xattr",
|
|
200
|
+
"fruit:nfs_aces = no",
|
|
201
|
+
"ea support = yes",
|
|
202
|
+
"durable handles = yes",
|
|
203
|
+
"kernel share modes = no",
|
|
186
204
|
"kernel oplocks = no",
|
|
187
|
-
"
|
|
188
|
-
"
|
|
205
|
+
"getwd cache = yes",
|
|
206
|
+
"winbind nss info = rfc2307",
|
|
207
|
+
"winbind use default domain = yes",
|
|
208
|
+
"winbind enum users = yes",
|
|
209
|
+
"winbind enum groups = yes",
|
|
210
|
+
"winbind nested groups = yes",
|
|
211
|
+
"winbind refresh tickets = yes",
|
|
212
|
+
"winbind offline logon = true",
|
|
189
213
|
];
|
|
214
|
+
if (args.domainJoinUsername !== undefined && (args.domainJoinPassword !== undefined && domain) !== undefined) {
|
|
215
|
+
sambaConfig.push(`realm = ${domain}`, "server role = member server", "security = ADS", `idmap config ${workgroup} : backend = ad`, `idmap config ${workgroup} : schema_mode = rfc2307`, `idmap config ${workgroup} : range = 2000-999999`, `idmap config ${workgroup} : unix_primary_group = yes`, `idmap config ${workgroup} : unix_nss_info = yes`, "idmap config *: range = 1000000-1999999", "idmap config * : backend = tdb");
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
sambaConfig.push("server role = standalone server", "security = USER");
|
|
219
|
+
}
|
|
190
220
|
const deploymentVolumes = [];
|
|
191
221
|
const deploymentVolumeMounts = [];
|
|
192
222
|
for (const volume of volumes) {
|
|
@@ -197,7 +227,10 @@ class Samba extends common_1.ComponentResource {
|
|
|
197
227
|
});
|
|
198
228
|
const mountPath = `/shares/${volumeName}`;
|
|
199
229
|
deploymentVolumeMounts.push({ name: volumeName, mountPath });
|
|
200
|
-
sambaConfig.push(`[${volume.name}]`, `comment = ${volume.comment ?? volume.name}`, `path = ${mountPath}`, "browseable = yes", "read only = no", "guest ok = no", `veto files = /${Samba.vetoFiles.join("/")}/`, "delete veto files = yes");
|
|
230
|
+
sambaConfig.push(`[${volume.name}]`, `comment = ${volume.comment ?? volume.name}`, `path = ${mountPath}`, "browseable = yes", "read only = no", "writable = yes", "guest ok = no", `veto files = /${Samba.vetoFiles.join("/")}/`, "delete veto files = yes");
|
|
231
|
+
if (volume.timeMachine) {
|
|
232
|
+
sambaConfig.push("fruit:time machine = yes");
|
|
233
|
+
}
|
|
201
234
|
}
|
|
202
235
|
return { smbConf: sambaConfig.join("\n"), volumes: deploymentVolumes, volumeMounts: deploymentVolumeMounts };
|
|
203
236
|
});
|
|
@@ -207,6 +240,13 @@ class Samba extends common_1.ComponentResource {
|
|
|
207
240
|
"smb.conf": config.smbConf,
|
|
208
241
|
},
|
|
209
242
|
}, opts);
|
|
243
|
+
this.domainJoinCredentials = new k8s.core.v1.Secret(`${name}-domain-join-credentials`, {
|
|
244
|
+
metadata: { ...metadata, name: pulumi.interpolate `${name}-domain-join-credentials` },
|
|
245
|
+
stringData: {
|
|
246
|
+
username: args.domainJoinUsername ?? "",
|
|
247
|
+
password: args.domainJoinPassword ?? "",
|
|
248
|
+
},
|
|
249
|
+
}, opts);
|
|
210
250
|
if (args.calicoIpReservations !== undefined) {
|
|
211
251
|
this.calicoIpReservations = new k8s.apiextensions.CustomResource(name, {
|
|
212
252
|
apiVersion: "crd.projectcalico.org/v1",
|
|
@@ -249,20 +289,21 @@ class Samba extends common_1.ComponentResource {
|
|
|
249
289
|
},
|
|
250
290
|
spec: {
|
|
251
291
|
nodeSelector: args.nodeSelector,
|
|
292
|
+
hostname: pulumi.all([args.serverName]).apply(([serverName]) => serverName.toLowerCase()),
|
|
293
|
+
dnsPolicy: args.domainNameservers ? "None" : undefined,
|
|
294
|
+
dnsConfig: {
|
|
295
|
+
nameservers: args.domainNameservers,
|
|
296
|
+
searches: args.domain ? [args.domain] : undefined,
|
|
297
|
+
},
|
|
252
298
|
containers: [
|
|
253
299
|
{
|
|
254
300
|
name: "samba",
|
|
255
|
-
image: "
|
|
301
|
+
image: "ydkn/samba:latest",
|
|
256
302
|
imagePullPolicy: "Always",
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
cmds.push(`adduser -s /bin/false -D -u ${user.uid} "${user.name}"`);
|
|
262
|
-
}
|
|
263
|
-
cmds.push("/usr/bin/samba.sh");
|
|
264
|
-
return ["-c", cmds.join(" && ")];
|
|
265
|
-
}),
|
|
303
|
+
env: [
|
|
304
|
+
{ name: "WORKGROUP", value: args.workgroup },
|
|
305
|
+
{ name: "REALM", value: args.domain ?? "" },
|
|
306
|
+
],
|
|
266
307
|
ports: [
|
|
267
308
|
{ containerPort: 137, protocol: "UDP", name: "netbios-ns" },
|
|
268
309
|
{ containerPort: 138, protocol: "UDP", name: "netbios-dgm" },
|
|
@@ -284,12 +325,13 @@ class Samba extends common_1.ComponentResource {
|
|
|
284
325
|
timeoutSeconds: 10,
|
|
285
326
|
},
|
|
286
327
|
resources: {
|
|
287
|
-
requests: { memory: "
|
|
288
|
-
limits: { memory: "
|
|
328
|
+
requests: { memory: "512Mi" },
|
|
329
|
+
limits: { memory: "768Mi" },
|
|
289
330
|
},
|
|
290
331
|
volumeMounts: pulumi.all([config]).apply(([config]) => {
|
|
291
332
|
return config.volumeMounts.concat([
|
|
292
|
-
{ name: "config", mountPath: "/
|
|
333
|
+
{ name: "config", mountPath: "/config" },
|
|
334
|
+
{ name: "domain-join-credentials", mountPath: "/run/secrets/samba-dc-join-credentials" },
|
|
293
335
|
{ name: "data", mountPath: "/var/lib/samba" },
|
|
294
336
|
]);
|
|
295
337
|
}),
|
|
@@ -298,6 +340,7 @@ class Samba extends common_1.ComponentResource {
|
|
|
298
340
|
volumes: pulumi.all([config]).apply(([config]) => {
|
|
299
341
|
return config.volumes.concat([
|
|
300
342
|
{ name: "config", configMap: { name: this.settings.metadata.name } },
|
|
343
|
+
{ name: "domain-join-credentials", secret: { secretName: this.domainJoinCredentials.metadata.name } },
|
|
301
344
|
{ name: "data", persistentVolumeClaim: { claimName: dataVolumeClaimName } },
|
|
302
345
|
]);
|
|
303
346
|
}),
|
|
@@ -322,23 +365,16 @@ class Samba extends common_1.ComponentResource {
|
|
|
322
365
|
hostnames: [args.hostname],
|
|
323
366
|
}, { ...opts, dependsOn: [this.deployment] });
|
|
324
367
|
if (args.avahiLabelName !== undefined) {
|
|
325
|
-
this.avahiService = new
|
|
368
|
+
this.avahiService = new avahiService_1.AvahiService(name, {
|
|
326
369
|
labelName: args.avahiLabelName,
|
|
327
370
|
metadata,
|
|
328
|
-
name: args.serverName,
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
{
|
|
336
|
-
type: "_device-info._tcp",
|
|
337
|
-
port: 9,
|
|
338
|
-
txtRecords: [pulumi.interpolate `model=${args.deviceModel}`],
|
|
339
|
-
hostname: args.hostname,
|
|
340
|
-
},
|
|
341
|
-
],
|
|
371
|
+
name: args.avahiServiceName ?? args.serverName,
|
|
372
|
+
hostname: args.hostname,
|
|
373
|
+
deviceModel: args.deviceModel,
|
|
374
|
+
timeMachineShareName: pulumi.all([volumes]).apply(([volumes]) => {
|
|
375
|
+
const share = volumes.filter((volume) => volume.timeMachine)[0];
|
|
376
|
+
return share ? share.name : undefined;
|
|
377
|
+
}),
|
|
342
378
|
}, opts);
|
|
343
379
|
}
|
|
344
380
|
this.registerOutputs();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/samba/deployment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/samba/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/samba/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { AvahiServiceArgs, AvahiService } from "./avahiService";
|
|
1
2
|
import { SambaDcArgs, SambaDc } from "./dc";
|
|
2
|
-
import { PVCVolumeArgs, NFSVolumeArgs, SharedFilesystemVolumeArgs,
|
|
3
|
-
export { SambaDcArgs, SambaDc, PVCVolumeArgs, NFSVolumeArgs, SharedFilesystemVolumeArgs,
|
|
3
|
+
import { PVCVolumeArgs, NFSVolumeArgs, SharedFilesystemVolumeArgs, SambaArgs, Samba } from "./deployment";
|
|
4
|
+
export { AvahiServiceArgs, AvahiService, SambaDcArgs, SambaDc, PVCVolumeArgs, NFSVolumeArgs, SharedFilesystemVolumeArgs, SambaArgs, Samba, };
|
|
4
5
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/samba/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/samba/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/samba/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,0BAA0B,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1G,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,OAAO,EACP,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,SAAS,EACT,KAAK,GACN,CAAC"}
|
package/lib/samba/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Samba = exports.SambaDc = void 0;
|
|
3
|
+
exports.Samba = exports.SambaDc = exports.AvahiService = void 0;
|
|
4
|
+
const avahiService_1 = require("./avahiService");
|
|
5
|
+
Object.defineProperty(exports, "AvahiService", { enumerable: true, get: function () { return avahiService_1.AvahiService; } });
|
|
4
6
|
const dc_1 = require("./dc");
|
|
5
7
|
Object.defineProperty(exports, "SambaDc", { enumerable: true, get: function () { return dc_1.SambaDc; } });
|
|
6
8
|
const deployment_1 = require("./deployment");
|
package/lib/samba/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/samba/index.ts"],"names":[],"mappings":";;;AAAA,6BAA4C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/samba/index.ts"],"names":[],"mappings":";;;AAAA,iDAAgE;AAM9D,6FANyB,2BAAY,OAMzB;AALd,6BAA4C;AAO1C,wFAPoB,YAAO,OAOpB;AANT,6CAA0G;AAWxG,sFAX4E,kBAAK,OAW5E"}
|
|
@@ -1,39 +1,45 @@
|
|
|
1
1
|
#!/bin/bash -e
|
|
2
2
|
|
|
3
|
+
export DEBIAN_FRONTEND="noninteractive"
|
|
4
|
+
|
|
5
|
+
arch="$(dpkg --print-architecture)"
|
|
6
|
+
|
|
3
7
|
function install_bg() {
|
|
4
8
|
# setup kubernetes env
|
|
5
9
|
for var in $(compgen -e); do
|
|
6
10
|
if [[ "${var}" = KUBERNETES_* ]]; then
|
|
7
|
-
echo "
|
|
11
|
+
echo "${var}=\"${!var}\"" >>/etc/environment
|
|
8
12
|
fi
|
|
9
13
|
done
|
|
10
14
|
|
|
11
15
|
# install kubectl
|
|
12
|
-
|
|
13
|
-
curl -sL "https://dl.k8s.io/release/$
|
|
16
|
+
k8s_version="$(curl -sL https://dl.k8s.io/release/stable.txt)"
|
|
17
|
+
curl -sL "https://dl.k8s.io/release/${k8s_version}/bin/linux/${arch}/kubectl" -o /usr/local/bin/kubectl
|
|
14
18
|
chmod +x /usr/local/bin/kubectl
|
|
15
|
-
echo "source <(kubectl completion bash)" >>/etc/bash.bashrc
|
|
16
|
-
echo "alias k=kubectl" >>/etc/bash.bashrc
|
|
17
|
-
echo "complete -F __start_kubectl k" >>/etc/bash.bashrc
|
|
19
|
+
echo "source <(kubectl completion bash); alias k=kubectl; complete -F __start_kubectl k" >>/etc/bash.bashrc
|
|
18
20
|
|
|
19
21
|
# upgrade packages
|
|
20
|
-
apt-get
|
|
22
|
+
apt-get -qq -y dist-upgrade
|
|
21
23
|
|
|
22
24
|
# install additional packages
|
|
23
|
-
|
|
25
|
+
if [ -f /run/k8s/init/packages.txt ]; then
|
|
26
|
+
read -ra packages </run/k8s/init/packages.txt || true
|
|
27
|
+
apt-get -qq -y install "${packages[@]}"
|
|
28
|
+
fi
|
|
24
29
|
}
|
|
25
30
|
|
|
26
31
|
# setup apt
|
|
27
|
-
apt-get
|
|
32
|
+
apt-get -qq -y update
|
|
28
33
|
|
|
29
|
-
# install
|
|
30
|
-
apt-get install openssh-server
|
|
34
|
+
# install essential packages
|
|
35
|
+
apt-get -qq -y install apt-utils bash-completion curl wget openssh-server
|
|
31
36
|
|
|
32
37
|
# background installation of additional stuff
|
|
33
38
|
install_bg &
|
|
34
39
|
|
|
35
40
|
# create privilege separation directory
|
|
36
|
-
mkdir -p
|
|
41
|
+
mkdir -p /var/run/sshd
|
|
42
|
+
chmod 755 /var/run/sshd
|
|
37
43
|
|
|
38
44
|
# setup ssh host keys
|
|
39
45
|
rm -f /etc/ssh/ssh_host_*_key
|
|
@@ -49,4 +55,4 @@ cp /run/k8s/ssh/authorized_keys /root/.ssh/authorized_keys
|
|
|
49
55
|
chmod 600 /root/.ssh/authorized_keys
|
|
50
56
|
|
|
51
57
|
# start sshd
|
|
52
|
-
/usr/sbin/sshd -D
|
|
58
|
+
exec /usr/sbin/sshd -D
|
|
@@ -23,8 +23,6 @@ export interface WireguardArgs {
|
|
|
23
23
|
}>;
|
|
24
24
|
}
|
|
25
25
|
export declare class Wireguard extends ComponentResource {
|
|
26
|
-
static readonly gatewayLabel = "network.ydkn.network/vpn-gateway";
|
|
27
|
-
static readonly gatewayLabelValue = "true";
|
|
28
26
|
static readonly defaultInterfaceName = "wireguard";
|
|
29
27
|
static readonly defaultInterfacePort = 51920;
|
|
30
28
|
static readonly defaultMTU = 1500;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAI9C,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,gBAAuB,oBAAoB,eAAe;IAC1D,gBAAuB,oBAAoB,SAAS;IACpD,gBAAuB,UAAU,QAAQ;IAEzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAoC;IACxE,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAgItF"}
|
|
@@ -28,9 +28,8 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
28
28
|
const k8s = __importStar(require("@pulumi/kubernetes"));
|
|
29
29
|
const common_1 = require("../common");
|
|
30
30
|
const kubernetes = __importStar(require("../kubernetes"));
|
|
31
|
+
const node = __importStar(require("../node"));
|
|
31
32
|
class Wireguard extends common_1.ComponentResource {
|
|
32
|
-
static gatewayLabel = "network.ydkn.network/vpn-gateway";
|
|
33
|
-
static gatewayLabelValue = "true";
|
|
34
33
|
static defaultInterfaceName = "wireguard";
|
|
35
34
|
static defaultInterfacePort = 51920;
|
|
36
35
|
static defaultMTU = 1500;
|
|
@@ -97,8 +96,6 @@ class Wireguard extends common_1.ComponentResource {
|
|
|
97
96
|
return data;
|
|
98
97
|
})));
|
|
99
98
|
this.config = new kubernetes.v1.Secret(name, { metadata, stringData: configData }, opts);
|
|
100
|
-
const defaultNodeSelector = {};
|
|
101
|
-
defaultNodeSelector[Wireguard.gatewayLabel] = Wireguard.gatewayLabelValue;
|
|
102
99
|
this.daemonSet = new k8s.apps.v1.DaemonSet(name, {
|
|
103
100
|
metadata,
|
|
104
101
|
spec: {
|
|
@@ -106,7 +103,7 @@ class Wireguard extends common_1.ComponentResource {
|
|
|
106
103
|
template: {
|
|
107
104
|
metadata: { labels: metadata.labels },
|
|
108
105
|
spec: {
|
|
109
|
-
nodeSelector: args.nodeSelector ??
|
|
106
|
+
nodeSelector: args.nodeSelector ?? node.gatewayNodeSelector,
|
|
110
107
|
tolerations: [
|
|
111
108
|
{ key: "node-role.kubernetes.io/master", operator: "Exists", effect: "NoSchedule" },
|
|
112
109
|
{ key: "node-role.kubernetes.io/control-plane", operator: "Exists", effect: "NoSchedule" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,sCAA8C;AAC9C,0DAA4C;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/wireguard/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.6.
|
|
3
|
+
"version": "0.6.2",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"pulumi"
|
|
6
6
|
],
|
|
@@ -15,42 +15,42 @@
|
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@types/bcrypt": "^5.0.2",
|
|
17
17
|
"@types/js-yaml": "^4.0.9",
|
|
18
|
-
"@types/node": "^20.10.
|
|
18
|
+
"@types/node": "^20.10.4",
|
|
19
19
|
"@types/ssh2": "^1.11.18",
|
|
20
20
|
"@types/ssh2-sftp-client": "^9.0.3",
|
|
21
|
-
"@typescript-eslint/eslint-plugin": "^6.
|
|
22
|
-
"@typescript-eslint/parser": "^6.
|
|
21
|
+
"@typescript-eslint/eslint-plugin": "^6.14.0",
|
|
22
|
+
"@typescript-eslint/parser": "^6.14.0",
|
|
23
23
|
"bcrypt": "^5.1.1",
|
|
24
24
|
"copyfiles": "^2.4.1",
|
|
25
|
-
"eslint": "^8.
|
|
26
|
-
"eslint-config-prettier": "^9.
|
|
25
|
+
"eslint": "^8.55.0",
|
|
26
|
+
"eslint-config-prettier": "^9.1.0",
|
|
27
27
|
"eslint-config-standard": "^17.1.0",
|
|
28
28
|
"eslint-plugin-import": "^2.29.0",
|
|
29
|
-
"eslint-plugin-n": "^16.
|
|
29
|
+
"eslint-plugin-n": "^16.4.0",
|
|
30
30
|
"eslint-plugin-node": "^11.1.0",
|
|
31
31
|
"eslint-plugin-promise": "^6.1.1",
|
|
32
32
|
"eslint-plugin-security": "^1.7.1",
|
|
33
|
-
"prettier": "^3.1.
|
|
33
|
+
"prettier": "^3.1.1",
|
|
34
34
|
"rimraf": "^5.0.5",
|
|
35
|
-
"typescript": "^5.3.
|
|
35
|
+
"typescript": "^5.3.3"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@pulumi/aws": "^6.
|
|
38
|
+
"@pulumi/aws": "^6.13.3",
|
|
39
39
|
"@pulumi/cloudflare": "^5.16.0",
|
|
40
40
|
"@pulumi/gitlab": "^6.6.0",
|
|
41
41
|
"@pulumi/hcloud": "^1.16.2",
|
|
42
42
|
"@pulumi/kubernetes": "^4.5.5",
|
|
43
43
|
"@pulumi/mailgun": "^3.5.0",
|
|
44
|
-
"@pulumi/pulumi": "^3.
|
|
45
|
-
"@pulumi/random": "^4.
|
|
46
|
-
"@pulumi/tls": "^
|
|
44
|
+
"@pulumi/pulumi": "^3.96.2",
|
|
45
|
+
"@pulumi/random": "^4.15.0",
|
|
46
|
+
"@pulumi/tls": "^5.0.0",
|
|
47
47
|
"@ydkn/pulumi-k0s": "^0.1.11",
|
|
48
48
|
"glob": "^10.3.10",
|
|
49
49
|
"js-yaml": "^4.1.0",
|
|
50
50
|
"ssh2": "^1.14.0",
|
|
51
51
|
"ssh2-sftp-client": "^9.1.0",
|
|
52
52
|
"template-file": "^6.0.1",
|
|
53
|
-
"urllib": "^3.
|
|
53
|
+
"urllib": "^3.21.0"
|
|
54
54
|
},
|
|
55
55
|
"scripts": {
|
|
56
56
|
"clean": "rimraf dist",
|