@ydkn/pulumi-components 0.8.8 → 0.8.9
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/index.d.ts +7 -1
- package/index.js +7 -1
- package/index.js.map +1 -1
- package/lib/alpine/assets/init.sh +0 -0
- package/lib/alpine/config.d.ts +19 -0
- package/lib/alpine/config.js +194 -0
- package/lib/alpine/config.js.map +1 -0
- package/lib/alpine/deployment.js +1 -1
- package/lib/alpine/deployment.js.map +1 -1
- package/lib/alpine/host.d.ts +25 -0
- package/lib/alpine/host.js +96 -0
- package/lib/alpine/host.js.map +1 -0
- package/lib/alpine/index.d.ts +3 -1
- package/lib/alpine/index.js +3 -1
- package/lib/alpine/index.js.map +1 -1
- package/lib/avahi/deployment.d.ts +2 -0
- package/lib/avahi/deployment.js +43 -19
- package/lib/avahi/deployment.js.map +1 -1
- package/lib/avahi/service.d.ts +2 -2
- package/lib/avahi/service.js +9 -7
- package/lib/avahi/service.js.map +1 -1
- package/lib/certManager/certificate.js +1 -1
- package/lib/certManager/certificate.js.map +1 -1
- package/lib/certManager/issuer.d.ts +1 -1
- package/lib/certManager/operator.js +8 -8
- package/lib/certManager/operator.js.map +1 -1
- package/lib/cilium/deployment.d.ts +33 -0
- package/lib/cilium/deployment.js +112 -0
- package/lib/cilium/deployment.js.map +1 -0
- package/lib/cilium/index.d.ts +5 -0
- package/lib/cilium/index.js +6 -0
- package/lib/cilium/index.js.map +1 -0
- package/lib/cilium/l2AnnouncementPolicy.d.ts +22 -0
- package/lib/cilium/l2AnnouncementPolicy.js +25 -0
- package/lib/cilium/l2AnnouncementPolicy.js.map +1 -0
- package/lib/cilium/loadBalancerIPPool.d.ts +22 -0
- package/lib/cilium/loadBalancerIPPool.js +18 -0
- package/lib/cilium/loadBalancerIPPool.js.map +1 -0
- package/lib/cilium/localRedirectPolicy.d.ts +40 -0
- package/lib/cilium/localRedirectPolicy.js +13 -0
- package/lib/cilium/localRedirectPolicy.js.map +1 -0
- package/lib/cups/avahiService.d.ts +1 -1
- package/lib/cups/avahiService.js +1 -1
- package/lib/cups/avahiService.js.map +1 -1
- package/lib/cups/deployment.d.ts +1 -1
- package/lib/cups/deployment.js +3 -3
- package/lib/cups/deployment.js.map +1 -1
- package/lib/dashy/deployment.d.ts +35 -0
- package/lib/dashy/deployment.js +78 -0
- package/lib/dashy/deployment.js.map +1 -0
- package/lib/dashy/index.d.ts +2 -0
- package/lib/dashy/index.js +3 -0
- package/lib/dashy/index.js.map +1 -0
- package/lib/dhcpd/deployment.d.ts +6 -6
- package/lib/dhcpd/deployment.js +40 -30
- package/lib/dhcpd/deployment.js.map +1 -1
- package/lib/externalDns/operator.d.ts +2 -2
- package/lib/externalDns/operator.js +5 -16
- package/lib/externalDns/operator.js.map +1 -1
- package/lib/fcos/assets/install-ready.service +12 -0
- package/lib/fcos/assets/install-run.service +14 -0
- package/lib/fcos/assets/rpm-ostree-install.sh +0 -0
- package/lib/fcos/config.d.ts +2 -5
- package/lib/fcos/config.js +44 -34
- package/lib/fcos/config.js.map +1 -1
- package/lib/fcos/host.d.ts +8 -12
- package/lib/fcos/host.js +45 -39
- package/lib/fcos/host.js.map +1 -1
- package/lib/fcos/index.d.ts +3 -3
- package/lib/fcos/index.js.map +1 -1
- package/lib/flatcar/assets/install-ready.service +12 -0
- package/lib/flatcar/assets/install-run.service +14 -0
- package/lib/flatcar/config.d.ts +3 -5
- package/lib/flatcar/config.js +44 -42
- package/lib/flatcar/config.js.map +1 -1
- package/lib/flatcar/host.d.ts +8 -12
- package/lib/flatcar/host.js +39 -29
- package/lib/flatcar/host.js.map +1 -1
- package/lib/flatcar/index.d.ts +3 -3
- package/lib/flatcar/index.js.map +1 -1
- package/lib/gitlab/project.js +4 -4
- package/lib/gitlab/project.js.map +1 -1
- package/lib/grafana/alloy.d.ts +1 -1
- package/lib/grafana/alloy.js +10 -12
- package/lib/grafana/alloy.js.map +1 -1
- package/lib/grafana/deployment.js +2 -2
- package/lib/grafana/deployment.js.map +1 -1
- package/lib/hcloud/assets/alpine-install.sh +45 -0
- package/lib/hcloud/assets/fcos-install.sh +13 -6
- package/lib/hcloud/assets/flatcar-install.sh +2 -2
- package/lib/hcloud/cluster.d.ts +9 -2
- package/lib/hcloud/cluster.js +273 -117
- package/lib/hcloud/cluster.js.map +1 -1
- package/lib/homeAssistant/deployment.d.ts +38 -0
- package/lib/homeAssistant/deployment.js +183 -0
- package/lib/homeAssistant/deployment.js.map +1 -0
- package/lib/homeAssistant/index.d.ts +2 -0
- package/lib/homeAssistant/index.js +3 -0
- package/lib/homeAssistant/index.js.map +1 -0
- package/lib/jellyfin/deployment.d.ts +1 -1
- package/lib/jellyfin/deployment.js +2 -5
- package/lib/jellyfin/deployment.js.map +1 -1
- package/lib/k0s/cluster.js +9 -4
- package/lib/k0s/cluster.js.map +1 -1
- package/lib/kubernetes/assets/crashed-cleanup.sh +0 -0
- package/lib/kubernetes/crashedCleanup.js +19 -2
- package/lib/kubernetes/crashedCleanup.js.map +1 -1
- package/lib/kubernetes/index.d.ts +2 -1
- package/lib/kubernetes/index.js +2 -1
- package/lib/kubernetes/index.js.map +1 -1
- package/lib/kubernetes/interfaceBridge/assets/bridge.sh +43 -0
- package/lib/kubernetes/interfaceBridge/bridge.d.ts +6 -0
- package/lib/kubernetes/interfaceBridge/bridge.js +26 -0
- package/lib/kubernetes/interfaceBridge/bridge.js.map +1 -0
- package/lib/kubernetes/interfaceBridge/index.d.ts +2 -0
- package/lib/kubernetes/interfaceBridge/index.js +3 -0
- package/lib/kubernetes/interfaceBridge/index.js.map +1 -0
- package/lib/kubernetes/transformations/removeCrdDescriptions.js.map +1 -1
- package/lib/kubernetes/v1/secureIngress.js.map +1 -1
- package/lib/loki/deployment.js +8 -1
- package/lib/loki/deployment.js.map +1 -1
- package/lib/metallb/controller.d.ts +3 -0
- package/lib/metallb/controller.js +2 -0
- package/lib/metallb/controller.js.map +1 -1
- package/lib/mongodb/cluster.js +1 -1
- package/lib/mongodb/cluster.js.map +1 -1
- package/lib/musicAssistant/deployment.d.ts +26 -0
- package/lib/musicAssistant/deployment.js +77 -0
- package/lib/musicAssistant/deployment.js.map +1 -0
- package/lib/musicAssistant/index.d.ts +2 -0
- package/lib/musicAssistant/index.js +3 -0
- package/lib/musicAssistant/index.js.map +1 -0
- package/lib/netbird/agent.js +5 -4
- package/lib/netbird/agent.js.map +1 -1
- package/lib/netbird/assets/nftables.sh +0 -0
- package/lib/netbird/management.js +15 -0
- package/lib/netbird/management.js.map +1 -1
- package/lib/node/config.d.ts +37 -0
- package/lib/node/config.js +2 -0
- package/lib/node/config.js.map +1 -0
- package/lib/node/index.d.ts +2 -2
- package/lib/node/index.js.map +1 -1
- package/lib/node/node.d.ts +1 -1
- package/lib/oauth2Proxy/deployment.d.ts +20 -0
- package/lib/oauth2Proxy/deployment.js +56 -0
- package/lib/oauth2Proxy/deployment.js.map +1 -0
- package/lib/oauth2Proxy/index.d.ts +2 -0
- package/lib/oauth2Proxy/index.js +3 -0
- package/lib/oauth2Proxy/index.js.map +1 -0
- package/lib/paperless/deployment.d.ts +36 -0
- package/lib/paperless/deployment.js +164 -0
- package/lib/paperless/deployment.js.map +1 -0
- package/lib/paperless/index.d.ts +2 -0
- package/lib/paperless/index.js +3 -0
- package/lib/paperless/index.js.map +1 -0
- package/lib/plex/mediaServer.d.ts +1 -1
- package/lib/plex/mediaServer.js +3 -3
- package/lib/plex/mediaServer.js.map +1 -1
- package/lib/postgresql/cluster.js +1 -1
- package/lib/postgresql/cluster.js.map +1 -1
- package/lib/qbittorrent/deployment.d.ts +65 -0
- package/lib/qbittorrent/deployment.js +410 -0
- package/lib/qbittorrent/deployment.js.map +1 -0
- package/lib/qbittorrent/index.d.ts +2 -0
- package/lib/qbittorrent/index.js +3 -0
- package/lib/qbittorrent/index.js.map +1 -0
- package/lib/raspberrypi/cluster.d.ts +5 -2
- package/lib/raspberrypi/cluster.js +110 -76
- package/lib/raspberrypi/cluster.js.map +1 -1
- package/lib/redis/standalone.js +2 -2
- package/lib/rook/blockPool.js +1 -0
- package/lib/rook/blockPool.js.map +1 -1
- package/lib/rook/cluster.d.ts +0 -2
- package/lib/rook/cluster.js +10 -35
- package/lib/rook/cluster.js.map +1 -1
- package/lib/rook/filesystem.js +1 -1
- package/lib/rook/filesystem.js.map +1 -1
- package/lib/rook/operator.js +12 -2
- package/lib/rook/operator.js.map +1 -1
- package/lib/rook/sharedFilesystem.js +1 -0
- package/lib/rook/sharedFilesystem.js.map +1 -1
- package/lib/samba/avahiService.d.ts +1 -1
- package/lib/samba/avahiService.js +1 -1
- package/lib/samba/avahiService.js.map +1 -1
- package/lib/samba/dc.js +26 -0
- package/lib/samba/dc.js.map +1 -1
- package/lib/samba/deployment.d.ts +2 -1
- package/lib/samba/deployment.js +4 -5
- package/lib/samba/deployment.js.map +1 -1
- package/lib/torproxy/deployment.js +2 -3
- package/lib/torproxy/deployment.js.map +1 -1
- package/lib/traefik/controller.d.ts +12 -0
- package/lib/traefik/controller.js +31 -1
- package/lib/traefik/controller.js.map +1 -1
- package/lib/transmission/deployment.d.ts +5 -3
- package/lib/transmission/deployment.js +27 -11
- package/lib/transmission/deployment.js.map +1 -1
- package/lib/ubuntu/assets/init.sh +0 -0
- package/lib/ubuntu/deployment.js +1 -1
- package/lib/ubuntu/deployment.js.map +1 -1
- package/lib/unifi/index.d.ts +2 -2
- package/lib/unifi/index.js +2 -2
- package/lib/unifi/index.js.map +1 -1
- package/lib/unifi/{networkServer.d.ts → osServer.d.ts} +7 -16
- package/lib/unifi/{networkServer.js → osServer.js} +90 -140
- package/lib/unifi/osServer.js.map +1 -0
- package/lib/utils/args.js +1 -1
- package/lib/utils/args.js.map +1 -1
- package/lib/velero/operator.d.ts +2 -2
- package/lib/velero/operator.js +6 -6
- package/lib/velero/operator.js.map +1 -1
- package/lib/zitadel/deployment.js +1 -1
- package/lib/zitadel/deployment.js.map +1 -1
- package/package.json +31 -31
- package/lib/unifi/assets/init-mongo.sh +0 -19
- package/lib/unifi/networkServer.js.map +0 -1
package/lib/flatcar/host.js
CHANGED
|
@@ -3,9 +3,11 @@ import * as tls from "@pulumi/tls";
|
|
|
3
3
|
import { ComponentResource } from "../common/index.js";
|
|
4
4
|
import { Config } from "./config.js";
|
|
5
5
|
export class Host extends ComponentResource {
|
|
6
|
-
static
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
static defaultUsername = "core";
|
|
7
|
+
static defaultDeployUsername = "pulumi";
|
|
8
|
+
deployUsername;
|
|
9
|
+
deployPrivateKey;
|
|
10
|
+
initConfig;
|
|
9
11
|
/**
|
|
10
12
|
* Create a new Flatcar host resource.
|
|
11
13
|
* @param name The name of the Flatcar host resource.
|
|
@@ -15,37 +17,45 @@ export class Host extends ComponentResource {
|
|
|
15
17
|
constructor(name, args, opts) {
|
|
16
18
|
super("flatcar:host", name, args, opts);
|
|
17
19
|
const emptyOpts = this.opts();
|
|
18
|
-
this.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
sshPrivateKeys[sshUser.name] = new tls.PrivateKey(`${name}-${sshUser.name}`, { algorithm: "ED25519" }, emptyOpts);
|
|
22
|
-
}
|
|
23
|
-
return sshPrivateKeys;
|
|
24
|
-
});
|
|
25
|
-
this.ignitionConfig = new Config(name, {
|
|
20
|
+
this.deployUsername = Host.defaultDeployUsername;
|
|
21
|
+
this.deployPrivateKey = new tls.PrivateKey(`${name}-${Host.defaultDeployUsername}`, { algorithm: "ED25519" }, emptyOpts);
|
|
22
|
+
this.initConfig = new Config(name, {
|
|
26
23
|
...args,
|
|
27
|
-
files: pulumi.all([args.files ?? []]).apply(([files]) => files.concat(Host.defaultModules.map((module) => ({
|
|
28
|
-
path: `/etc/modules-load.d/${module}.conf`,
|
|
29
|
-
contents: module,
|
|
30
|
-
mode: 0o644,
|
|
31
|
-
})))),
|
|
32
24
|
users: pulumi
|
|
33
|
-
.all([
|
|
34
|
-
.apply(([
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
25
|
+
.all([this.deployUsername, this.deployPrivateKey.publicKeyOpenssh, args.users, args.sshAuthorizedKeys])
|
|
26
|
+
.apply(([deployUsername, deployPublicKeyOpenssh, users, sshAuthorizedKeys]) => pulumi.all(users ?? []).apply((users) => {
|
|
27
|
+
let foundDefaultUser = false;
|
|
28
|
+
let foundDeployUser = false;
|
|
29
|
+
for (const user of users) {
|
|
30
|
+
if (user.name === Host.defaultUsername) {
|
|
31
|
+
user.sshAuthorizedKeys = (sshAuthorizedKeys ?? []).concat(user.sshAuthorizedKeys ?? []);
|
|
32
|
+
user.groups = (user.groups ?? []).concat(["sudo"]);
|
|
33
|
+
user.lockPasswd = true;
|
|
34
|
+
foundDefaultUser = true;
|
|
35
|
+
}
|
|
36
|
+
if (user.name === deployUsername) {
|
|
37
|
+
user.sshAuthorizedKeys = [deployPublicKeyOpenssh].concat(user.sshAuthorizedKeys ?? []);
|
|
38
|
+
user.groups = (user.groups ?? []).concat(["sudo"]);
|
|
39
|
+
user.lockPasswd = true;
|
|
40
|
+
foundDeployUser = true;
|
|
41
|
+
}
|
|
38
42
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
name:
|
|
42
|
-
groups:
|
|
43
|
-
sshAuthorizedKeys
|
|
43
|
+
if (!foundDefaultUser) {
|
|
44
|
+
users.push({
|
|
45
|
+
name: Host.defaultUsername,
|
|
46
|
+
groups: ["sudo"],
|
|
47
|
+
sshAuthorizedKeys,
|
|
44
48
|
});
|
|
45
49
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
50
|
+
if (!foundDeployUser) {
|
|
51
|
+
users.push({
|
|
52
|
+
name: deployUsername,
|
|
53
|
+
groups: ["sudo"],
|
|
54
|
+
sshAuthorizedKeys: [deployPublicKeyOpenssh],
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
return users;
|
|
58
|
+
})),
|
|
49
59
|
}, emptyOpts).ignitionConfig;
|
|
50
60
|
this.registerOutputs();
|
|
51
61
|
}
|
package/lib/flatcar/host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/flatcar/host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/flatcar/host.ts"],"names":[],"mappings":"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"}
|
package/lib/flatcar/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
export {
|
|
1
|
+
import { Config } from "./config.js";
|
|
2
|
+
import { HostArgs, Host } from "./host.js";
|
|
3
|
+
export { Config, HostArgs, Host };
|
package/lib/flatcar/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/flatcar/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/flatcar/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAY,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAY,IAAI,EAAE,CAAC"}
|
package/lib/gitlab/project.js
CHANGED
|
@@ -38,9 +38,9 @@ export class Project extends ComponentResource {
|
|
|
38
38
|
});
|
|
39
39
|
args.defaultBranch ??= "main";
|
|
40
40
|
args.initializeWithReadme ??= false;
|
|
41
|
-
args.
|
|
41
|
+
args.issuesAccessLevel ??= "private";
|
|
42
42
|
args.lfsEnabled ??= false;
|
|
43
|
-
args.
|
|
43
|
+
args.mergeRequestsAccessLevel ??= "private";
|
|
44
44
|
args.onlyAllowMergeIfAllDiscussionsAreResolved ??= true;
|
|
45
45
|
args.onlyAllowMergeIfPipelineSucceeds ??= true;
|
|
46
46
|
args.packagesEnabled ??= false;
|
|
@@ -48,10 +48,10 @@ export class Project extends ComponentResource {
|
|
|
48
48
|
args.printingMergeRequestLinkEnabled ??= true;
|
|
49
49
|
args.removeSourceBranchAfterMerge ??= true;
|
|
50
50
|
args.sharedRunnersEnabled ??= true;
|
|
51
|
-
args.
|
|
51
|
+
args.snippetsAccessLevel ??= "disabled";
|
|
52
52
|
args.squashOption ??= "default_on";
|
|
53
53
|
args.visibilityLevel ??= "private";
|
|
54
|
-
args.
|
|
54
|
+
args.wikiAccessLevel ??= "disabled";
|
|
55
55
|
this.project = new gitlab.Project(name, args, { ...opts, protect: args.protect });
|
|
56
56
|
this.pipelineBadge = new gitlab.ProjectBadge(`${name}-pipeline-badge`, {
|
|
57
57
|
project: this.project.id,
|
|
@@ -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,CAAC,0BAA0B,KAAK,SAAS,CAAC;QAC9C,IAAI,CAAC,iBAAiB,KAAK,KAAK,CAAC;QACjC,IAAI,CAAC,yBAAyB,KAAK,IAAI,CAAC;QACxC,IAAI,CAAC,iBAAiB,KAAK,SAAS,CAAC;QACrC,IAAI,CAAC,4BAA4B,KAAK,SAAS,CAAC;QAEhD,IAAI,CAAC,yBAAyB,GAAG,MAAM;aACpC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA4B,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;aACxE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;YAC/B,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;gBAC/B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,EAAE;gBACT,eAAe,EAAE,IAAI;gBACrB,aAAa,EAAE,0BAA0B;aAC1C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,aAAa,KAAK,MAAM,CAAC;QAC9B,IAAI,CAAC,oBAAoB,KAAK,KAAK,CAAC;QACpC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"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"}
|
package/lib/grafana/alloy.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export declare class Alloy extends ComponentResource {
|
|
|
30
30
|
private readonly lokiSecret;
|
|
31
31
|
private readonly helmRelease;
|
|
32
32
|
private readonly kubeletService;
|
|
33
|
-
private readonly
|
|
33
|
+
private readonly kubeletEndpointSlice;
|
|
34
34
|
private readonly kubeletServiceMonitor;
|
|
35
35
|
readonly namespace: pulumi.Output<string>;
|
|
36
36
|
/**
|
package/lib/grafana/alloy.js
CHANGED
|
@@ -10,7 +10,7 @@ export class Alloy extends ComponentResource {
|
|
|
10
10
|
lokiSecret;
|
|
11
11
|
helmRelease;
|
|
12
12
|
kubeletService;
|
|
13
|
-
|
|
13
|
+
kubeletEndpointSlice;
|
|
14
14
|
kubeletServiceMonitor;
|
|
15
15
|
namespace;
|
|
16
16
|
/**
|
|
@@ -150,17 +150,15 @@ export class Alloy extends ComponentResource {
|
|
|
150
150
|
ports: [{ name: "https-metrics", port: 10250, targetPort: 10250, protocol: "TCP" }],
|
|
151
151
|
},
|
|
152
152
|
}, k8sOpts);
|
|
153
|
-
this.
|
|
153
|
+
this.kubeletEndpointSlice = new k8s.discovery.v1.EndpointSlice("kubelet", {
|
|
154
154
|
metadata: kubeletMetadata,
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
},
|
|
163
|
-
],
|
|
155
|
+
addressType: "IPv4",
|
|
156
|
+
endpoints: pulumi.all([args.nodes]).apply(([nodes]) => nodes.map((node) => ({
|
|
157
|
+
addresses: [node.privateIpv4Address ?? node.ipv4Address],
|
|
158
|
+
nodeName: node.hostname,
|
|
159
|
+
targetRef: { kind: "Node", name: node.hostname },
|
|
160
|
+
}))),
|
|
161
|
+
ports: [{ name: "https-metrics", port: 10250, protocol: "TCP" }],
|
|
164
162
|
}, { ...k8sOpts, dependsOn: this.kubeletService });
|
|
165
163
|
this.kubeletServiceMonitor = new prometheus.ServiceMonitor(`${name}-kubelet`, {
|
|
166
164
|
metadata: kubeletMetadata,
|
|
@@ -251,7 +249,7 @@ export class Alloy extends ComponentResource {
|
|
|
251
249
|
namespaceSelector: { matchNames: [this.namespace] },
|
|
252
250
|
selector: { matchLabels: kubeletMetadata.labels },
|
|
253
251
|
},
|
|
254
|
-
}, { ...k8sOpts, dependsOn: this.
|
|
252
|
+
}, { ...k8sOpts, dependsOn: this.kubeletEndpointSlice });
|
|
255
253
|
this.registerOutputs();
|
|
256
254
|
}
|
|
257
255
|
}
|
package/lib/grafana/alloy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.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;AAEvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA2BtD,MAAM,OAAO,KAAM,SAAQ,iBAAiB;IACzB,qBAAqB,CAAwD;IAC7E,gBAAgB,CAAuB;IACvC,UAAU,CAAuB;IACjC,WAAW,CAA6B;IACxC,cAAc,CAAsB;IACpC,
|
|
1
|
+
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,8 +95,8 @@ export class Grafana extends ComponentResource {
|
|
|
95
95
|
datasources: { enabled: true, searchNamespace: "ALL" },
|
|
96
96
|
dashboards: { enabled: true, searchNamespace: "ALL" },
|
|
97
97
|
resources: {
|
|
98
|
-
requests: { memory: "
|
|
99
|
-
limits: { memory: "
|
|
98
|
+
requests: { memory: "128Mi" },
|
|
99
|
+
limits: { memory: "384Mi" },
|
|
100
100
|
},
|
|
101
101
|
},
|
|
102
102
|
resources: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
#!/bin/sh -e
|
|
2
|
+
|
|
3
|
+
ALPINE_VERSION="3.23"
|
|
4
|
+
REPO_URL="https://hel1.your-objectstorage.com/repo-3bc298f9844f/alpine-preseed"
|
|
5
|
+
|
|
6
|
+
DRIVE="${1}"
|
|
7
|
+
METADATA="${2}"
|
|
8
|
+
USERDATA="${3}"
|
|
9
|
+
|
|
10
|
+
ARCH="$(uname -m)"
|
|
11
|
+
|
|
12
|
+
apt-get update -qq -y
|
|
13
|
+
apt-get install -qq -y xorriso
|
|
14
|
+
|
|
15
|
+
curl -sf -o /tmp/alpine-preseed_virt.iso.gz "${REPO_URL}/alpine-preseed_virt-v${ALPINE_VERSION}-${ARCH}.iso.gz"
|
|
16
|
+
gunzip /tmp/alpine-preseed_virt.iso.gz
|
|
17
|
+
mkdir -p /tmp/iso
|
|
18
|
+
mount -o loop /tmp/alpine-preseed_virt.iso /tmp/iso
|
|
19
|
+
cp -r /tmp/iso /tmp/newiso
|
|
20
|
+
|
|
21
|
+
mkdir -p /tmp/newiso/cloud-init
|
|
22
|
+
cp -r "${METADATA}" /tmp/newiso/cloud-init/meta-data
|
|
23
|
+
cp -r "${USERDATA}" /tmp/newiso/cloud-init/user-data
|
|
24
|
+
|
|
25
|
+
case "${ARCH}" in
|
|
26
|
+
x86_64)
|
|
27
|
+
xorrisofs -quiet -output /tmp/new.iso -full-iso9660-filenames -joliet -rational-rock -sysid LINUX -volid preseed -isohybrid-mbr /tmp/newiso/boot/syslinux/isohdpfx.bin -eltorito-boot boot/syslinux/isolinux.bin -eltorito-catalog boot/syslinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -follow-links /tmp/newiso
|
|
28
|
+
;;
|
|
29
|
+
aarch64)
|
|
30
|
+
xorrisofs -quiet -output /tmp/new.iso -full-iso9660-filenames -joliet -rational-rock -sysid LINUX -volid preseed -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -follow-links /tmp/newiso
|
|
31
|
+
;;
|
|
32
|
+
*)
|
|
33
|
+
echo "Unsupported architecture: ${ARCH}"
|
|
34
|
+
exit 1
|
|
35
|
+
;;
|
|
36
|
+
esac
|
|
37
|
+
|
|
38
|
+
dd if=/tmp/new.iso of="${DRIVE}"
|
|
39
|
+
|
|
40
|
+
asyncReboot() {
|
|
41
|
+
sleep 2
|
|
42
|
+
reboot
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
asyncReboot &
|
|
@@ -1,27 +1,34 @@
|
|
|
1
1
|
#!/bin/sh -e
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
COREOS_INSTALLER_TAG="release"
|
|
4
|
+
LIBC_RELEASE="trixie"
|
|
4
5
|
|
|
5
6
|
DRIVE="${1}"
|
|
6
7
|
CONFIG="${2}"
|
|
7
8
|
|
|
9
|
+
export DEBIAN_FRONTEND=noninteractive
|
|
10
|
+
|
|
8
11
|
update-alternatives --set iptables /usr/sbin/iptables-legacy
|
|
9
12
|
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
|
|
10
13
|
|
|
11
|
-
apt-get update -y
|
|
12
|
-
apt-get install -y docker.io fuse-overlayfs
|
|
14
|
+
apt-get update -qq -y
|
|
15
|
+
apt-get -o Dpkg::Options::="--force-confold" install -qq -y docker.io fuse-overlayfs
|
|
13
16
|
|
|
14
17
|
mkdir /tmp/coreos-installer
|
|
15
18
|
cd /tmp/coreos-installer
|
|
16
|
-
docker pull "quay.io/coreos/coreos-installer
|
|
17
|
-
docker save "quay.io/coreos/coreos-installer
|
|
19
|
+
docker pull "quay.io/coreos/coreos-installer:${COREOS_INSTALLER_TAG}"
|
|
20
|
+
docker save "quay.io/coreos/coreos-installer:${COREOS_INSTALLER_TAG}" >image.tar
|
|
18
21
|
tar -xf image.tar
|
|
19
22
|
rm image.tar
|
|
20
23
|
for l in */layer.tar; do
|
|
21
24
|
tar -xf "${l}"
|
|
22
25
|
done
|
|
23
26
|
|
|
24
|
-
|
|
27
|
+
echo "deb http://mirror.hetzner.com/debian/packages ${LIBC_RELEASE} main contrib non-free non-free-firmware" > /etc/apt/sources.list.d/libc6.list
|
|
28
|
+
apt-get update -qq -y
|
|
29
|
+
apt-get -o Dpkg::Options::="--force-confold" install -qq -y libc6
|
|
30
|
+
|
|
31
|
+
./usr/sbin/coreos-installer install "${DRIVE}" -p hetzner -i "${CONFIG}"
|
|
25
32
|
|
|
26
33
|
asyncReboot() {
|
|
27
34
|
sleep 2
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
DRIVE="${1}"
|
|
4
4
|
CONFIG="${2}"
|
|
5
5
|
|
|
6
|
-
apt-get update -y
|
|
7
|
-
apt-get install -y gawk
|
|
6
|
+
apt-get update -qq -y
|
|
7
|
+
apt-get install -qq -y gawk
|
|
8
8
|
|
|
9
9
|
curl -sf -o /tmp/flatcar-install https://raw.githubusercontent.com/flatcar/init/flatcar-master/bin/flatcar-install
|
|
10
10
|
chmod +x /tmp/flatcar-install
|
package/lib/hcloud/cluster.d.ts
CHANGED
|
@@ -4,12 +4,12 @@ import * as k8s from "@pulumi/kubernetes";
|
|
|
4
4
|
import { ComponentResource } from "../common/index.js";
|
|
5
5
|
import * as node from "../node/index.js";
|
|
6
6
|
import * as k0s from "../k0s/index.js";
|
|
7
|
-
export interface Node extends node.Node, node.
|
|
7
|
+
export interface Node extends node.Node, node.ConfigArgs {
|
|
8
8
|
serverType: pulumi.Input<string>;
|
|
9
9
|
count?: pulumi.Input<number>;
|
|
10
10
|
location?: pulumi.Input<string>;
|
|
11
11
|
}
|
|
12
|
-
export interface ClusterArgs extends k0s.ClusterArgs, node.
|
|
12
|
+
export interface ClusterArgs extends k0s.ClusterArgs, node.ConfigArgs {
|
|
13
13
|
name?: pulumi.Input<string>;
|
|
14
14
|
token: pulumi.Input<string>;
|
|
15
15
|
location: pulumi.Input<string>;
|
|
@@ -30,6 +30,8 @@ export declare class Cluster extends ComponentResource {
|
|
|
30
30
|
private static readonly dnsServers;
|
|
31
31
|
private static readonly gatewayIPv6;
|
|
32
32
|
private static readonly ignitionConfigPathRemote;
|
|
33
|
+
private static readonly cloudInitMetaDataPathRemote;
|
|
34
|
+
private static readonly cloudInitUserDataPathRemote;
|
|
33
35
|
private static readonly installScriptPathRemote;
|
|
34
36
|
private readonly sshKey;
|
|
35
37
|
private readonly network;
|
|
@@ -58,8 +60,13 @@ export declare class Cluster extends ComponentResource {
|
|
|
58
60
|
*/
|
|
59
61
|
constructor(name: string, args: ClusterArgs, opts?: pulumi.ComponentResourceOptions);
|
|
60
62
|
private createServers;
|
|
63
|
+
private mergeNodeArgs;
|
|
64
|
+
private networkManagerConfigFiles;
|
|
65
|
+
private networkdConfigFiles;
|
|
66
|
+
private interfacesConfigFiles;
|
|
61
67
|
private configureFcosNode;
|
|
62
68
|
private configureFlatcarNode;
|
|
69
|
+
private configureAlpineNode;
|
|
63
70
|
private fileAssetFromString;
|
|
64
71
|
private static ethernetInterfaceName;
|
|
65
72
|
}
|