@ydkn/pulumi-components 0.8.8 → 0.9.1

package/lib/flatcar/config.d.ts

@@ -1,9 +1,6 @@
 import * as pulumi from "@pulumi/pulumi";
 import { ComponentResource } from "../common/index.js";
-import { IgnitionArgs } from "../node/index.js";
-export interface ConfigArgs extends IgnitionArgs {
-    hostname: pulumi.Input<string>;
-}
+import { OperatingSystemConfigArgs } from "../node/index.js";
 export declare class Config extends ComponentResource {
     readonly ignitionConfig: pulumi.Output<string>;
     /**
@@ -12,7 +9,8 @@ export declare class Config extends ComponentResource {
      * @param args A bag of arguments to control the Flatcar config creation.
      * @param opts A bag of options that control this resource's behavior.
      */
-    constructor(name: string, args: ConfigArgs, opts?: pulumi.ComponentResourceOptions);
+    constructor(name: string, args: OperatingSystemConfigArgs, opts?: pulumi.ComponentResourceOptions);
     private defaultConfig;
+    private assetContent;
     private encodeContents;
 }

package/lib/flatcar/config.js

@@ -1,4 +1,7 @@
 import * as pulumi from "@pulumi/pulumi";
+import * as path from "path";
+import * as fs from "fs";
+import * as url from "url";
 import * as compress from "zlib";
 import { ComponentResource } from "../common/index.js";
 export class Config extends ComponentResource {
@@ -12,17 +15,8 @@ export class Config extends ComponentResource {
     constructor(name, args, opts) {
         super("flatcar:config", name, args, opts);
         this.ignitionConfig = pulumi
-            .all([
-            this.defaultConfig(),
-            args.hostname,
-            args.users,
-            args.disks,
-            args.filesystems,
-            args.files,
-            args.links,
-            args.systemdUnits,
-        ])
-            .apply(([config, hostname, users, disks, filesystems, files, links, systemdUnits]) => {
+            .all([this.defaultConfig(), args.hostname, args.users, args.filesystems, args.files, args.run])
+            .apply(([config, hostname, users, filesystems, files, run]) => {
             /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
             if (hostname !== undefined) {
                 config.storage.files.push({
@@ -33,29 +27,14 @@ export class Config extends ComponentResource {
                 });
             }
             for (const user of users ?? []) {
+                user.sshAuthorizedKeys = (user.sshAuthorizedKeys ?? []).map((key) => key.trim());
                 config.passwd.users.push(user);
             }
-            for (const disk of disks ?? []) {
-                config.storage.disks.push({
-                    device: disk.device,
-                    partitions: disk.partitions.map((partition) => {
-                        return {
-                            label: partition.label,
-                            size_mib: partition.size,
-                            start_mib: partition.start,
-                            number: partition.number,
-                            resize: partition.resize,
-                        };
-                    }),
-                    wipe_table: disk.wipeTable,
-                });
-            }
             for (const filesystem of filesystems ?? []) {
                 config.storage.filesystems.push({
                     device: filesystem.device,
                     path: filesystem.path,
                     format: filesystem.format,
-                    label: filesystem.label,
                 });
                 if (filesystem.path !== undefined) {
                     const checkSystemdName = filesystem.device.replace(/-/g, "\\x2d").replace(/^\//, "").replace(/\//g, "-");
@@ -83,19 +62,17 @@ export class Config extends ComponentResource {
                     path: file.path,
                     contents: this.encodeContents(file.contents),
                     mode: file.mode ?? 0o644,
-                    overwrite: file.overwrite ?? true,
-                });
-            }
-            for (const link of links ?? []) {
-                config.storage.links.push({
-                    path: link.path,
-                    target: link.target,
+                    user: file.user,
+                    group: file.group,
                     overwrite: true,
                 });
             }
-            for (const unit of systemdUnits ?? []) {
-                config.systemd.units.push(unit);
-            }
+            config.storage.files.push({
+                path: "/usr/local/sbin/install-run",
+                contents: this.encodeContents(["#!/bin/bash", "", ...(run ?? []), "", "exit 0"].join("\n")),
+                mode: 0o755,
+                overwrite: true,
+            });
             return JSON.stringify(config);
         });
         this.registerOutputs();
@@ -112,6 +89,12 @@ export class Config extends ComponentResource {
                 filesystems: [],
                 directories: [],
                 files: [
+                    {
+                        path: "/etc/modules-load.d/wireguard.conf",
+                        contents: this.encodeContents("wireguard"),
+                        mode: 0o644,
+                        overwrite: true,
+                    },
                     {
                         path: "/etc/sysctl.d/10-kernel-logging.conf",
                         contents: this.encodeContents("kernel.printk=4"),
@@ -119,8 +102,12 @@ export class Config extends ComponentResource {
                         overwrite: true,
                     },
                     {
-                        path: "/etc/sysctl.d/20-fs-inotify.conf",
-                        contents: this.encodeContents("fs.inotify.max_user_instances = 8192\nfs.inotify.max_user_watches = 524288"),
+                        path: "/etc/sysctl.d/20-fs.conf",
+                        contents: this.encodeContents([
+                            "fs.file-max = 65536",
+                            "fs.inotify.max_user_instances = 8192",
+                            "fs.inotify.max_user_watches = 524288",
+                        ].join("\n")),
                         mode: 0o644,
                         overwrite: true,
                     },
@@ -136,13 +123,28 @@ export class Config extends ComponentResource {
                         mode: 0o644,
                         overwrite: true,
                     },
-                    { path: "/etc/systemd/resolved.conf", append: [this.encodeContents("LLMNR=no")], overwrite: false },
                 ],
-                links: [],
             },
-            systemd: { units: [] },
+            systemd: {
+                units: [
+                    {
+                        name: "install-ready.service",
+                        enabled: true,
+                        contents: this.assetContent("install-ready.service"),
+                    },
+                    {
+                        name: "install-run.service",
+                        enabled: true,
+                        contents: this.assetContent("install-run.service"),
+                    },
+                ],
+            },
         };
     }
+    assetContent(filename) {
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
+        return fs.readFileSync(path.join(path.dirname(url.fileURLToPath(import.meta.url)), "assets", filename), "utf-8");
+    }
     encodeContents(data) {
         return {
             compression: "gzip",

package/lib/flatcar/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/flatcar/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/flatcar/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,QAAQ,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAGvD,MAAM,OAAO,MAAO,SAAQ,iBAAiB;IAC3B,cAAc,CAAwB;IAEtD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAA+B,EAAE,IAAsC;QAC/F,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,CAAC,cAAc,GAAG,MAAM;aACzB,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;aAC9F,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE;YAC5D,kGAAkG;YAClG,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;oBACxB,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;oBACvC,IAAI,EAAE,KAAK;oBACX,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;gBAC/B,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEjF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;gBAC3C,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC9B,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBAEH,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAClC,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBAEzG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;wBACxB,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ;wBACvE,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE;4BACR,QAAQ;4BACR,wBAAwB;4BACxB,yBAAyB,gBAAgB,UAAU;4BACnD,sBAAsB,gBAAgB,UAAU;4BAChD,SAAS;4BACT,SAAS,UAAU,CAAC,IAAI,EAAE;4BAC1B,QAAQ,UAAU,CAAC,MAAM,EAAE;4BAC3B,QAAQ,UAAU,CAAC,MAAM,EAAE;4BAC3B,0BAA0B;4BAC1B,WAAW;4BACX,4BAA4B;yBAC7B,CAAC,IAAI,CAAC,IAAI,CAAC;qBACb,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;oBACxB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC5C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,KAAK;oBACxB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,6BAA6B;gBACnC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3F,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,8DAA8D;IACtD,aAAa;QACnB,OAAO;YACL,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;YAC9B,MAAM,EAAE;gBACN,KAAK,EAAE,EAAE;aACV;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,oCAAoC;wBAC1C,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;wBAC1C,IAAI,EAAE,KAAK;wBACX,SAAS,EAAE,IAAI;qBAChB;oBACD;wBACE,IAAI,EAAE,sCAAsC;wBAC5C,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC;wBAChD,IAAI,EAAE,KAAK;wBACX,SAAS,EAAE,IAAI;qBAChB;oBACD;wBACE,IAAI,EAAE,0BAA0B;wBAChC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAC3B;4BACE,qBAAqB;4BACrB,sCAAsC;4BACtC,sCAAsC;yBACvC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb;wBACD,IAAI,EAAE,KAAK;wBACX,SAAS,EAAE,IAAI;qBAChB;oBACD;wBACE,IAAI,EAAE,uCAAuC;wBAC7C,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC;wBACxD,IAAI,EAAE,KAAK;wBACX,SAAS,EAAE,IAAI;qBAChB;oBACD;wBACE,IAAI,EAAE,0CAA0C;wBAChD,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,kCAAkC,CAAC;wBACjE,IAAI,EAAE,KAAK;wBACX,SAAS,EAAE,IAAI;qBAChB;iBACF;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,uBAAuB;wBAC7B,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC;qBACrD;oBACD;wBACE,IAAI,EAAE,qBAAqB;wBAC3B,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC;qBACnD;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,QAAgB;QACnC,mEAAmE;QACnE,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IACnH,CAAC;IAEO,cAAc,CAAC,IAAY;QACjC,OAAO;YACL,WAAW,EAAE,MAAM;YACnB,MAAM,EAAE,gBAAgB,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;SAChG,CAAC;IACJ,CAAC;CACF"}

package/lib/flatcar/host.d.ts

@@ -1,20 +1,16 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as tls from "@pulumi/tls";
 import { ComponentResource } from "../common/index.js";
-import { ConfigArgs } from "./config.js";
-export interface HostUserArgs {
-    name: pulumi.Input<string>;
-    groups?: pulumi.Input<pulumi.Input<string>[]>;
-}
-export interface HostArgs extends ConfigArgs {
-    sshUsers?: pulumi.Input<pulumi.Input<HostUserArgs>[]>;
+import { OperatingSystemConfigArgs } from "../node/index.js";
+export interface HostArgs extends OperatingSystemConfigArgs {
+    sshAuthorizedKeys?: pulumi.Input<pulumi.Input<string>[]>;
 }
 export declare class Host extends ComponentResource {
-    private static readonly defaultModules;
-    readonly sshPrivateKeys: pulumi.Output<{
-        [key: string]: tls.PrivateKey;
-    }>;
-    readonly ignitionConfig: pulumi.Output<string>;
+    static readonly defaultUsername = "core";
+    private static readonly defaultDeployUsername;
+    readonly deployUsername: string;
+    readonly deployPrivateKey: tls.PrivateKey;
+    readonly initConfig: pulumi.Output<string>;
     /**
      * Create a new Flatcar host resource.
      * @param name The name of the Flatcar host resource.

package/lib/flatcar/host.js

@@ -3,9 +3,11 @@ import * as tls from "@pulumi/tls";
 import { ComponentResource } from "../common/index.js";
 import { Config } from "./config.js";
 export class Host extends ComponentResource {
-    static defaultModules = ["wireguard"];
-    sshPrivateKeys;
-    ignitionConfig;
+    static defaultUsername = "core";
+    static defaultDeployUsername = "pulumi";
+    deployUsername;
+    deployPrivateKey;
+    initConfig;
     /**
      * Create a new Flatcar host resource.
      * @param name The name of the Flatcar host resource.
@@ -15,37 +17,45 @@ export class Host extends ComponentResource {
     constructor(name, args, opts) {
         super("flatcar:host", name, args, opts);
         const emptyOpts = this.opts();
-        this.sshPrivateKeys = pulumi.all([args.sshUsers]).apply(([sshUsers]) => {
-            const sshPrivateKeys = {};
-            for (const sshUser of sshUsers ?? []) {
-                sshPrivateKeys[sshUser.name] = new tls.PrivateKey(`${name}-${sshUser.name}`, { algorithm: "ED25519" }, emptyOpts);
-            }
-            return sshPrivateKeys;
-        });
-        this.ignitionConfig = new Config(name, {
+        this.deployUsername = Host.defaultDeployUsername;
+        this.deployPrivateKey = new tls.PrivateKey(`${name}-${Host.defaultDeployUsername}`, { algorithm: "ED25519" }, emptyOpts);
+        this.initConfig = new Config(name, {
             ...args,
-            files: pulumi.all([args.files ?? []]).apply(([files]) => files.concat(Host.defaultModules.map((module) => ({
-                path: `/etc/modules-load.d/${module}.conf`,
-                contents: module,
-                mode: 0o644,
-            })))),
             users: pulumi
-                .all([args.users, args.sshUsers, this.sshPrivateKeys])
-                .apply(([users, sshUsers, sshPrivateKeys]) => {
-                const allUsers = [];
-                for (const user of users ?? []) {
-                    allUsers.push(user);
+                .all([this.deployUsername, this.deployPrivateKey.publicKeyOpenssh, args.users, args.sshAuthorizedKeys])
+                .apply(([deployUsername, deployPublicKeyOpenssh, users, sshAuthorizedKeys]) => pulumi.all(users ?? []).apply((users) => {
+                let foundDefaultUser = false;
+                let foundDeployUser = false;
+                for (const user of users) {
+                    if (user.name === Host.defaultUsername) {
+                        user.sshAuthorizedKeys = (sshAuthorizedKeys ?? []).concat(user.sshAuthorizedKeys ?? []);
+                        user.groups = (user.groups ?? []).concat(["sudo"]);
+                        user.lockPasswd = true;
+                        foundDefaultUser = true;
+                    }
+                    if (user.name === deployUsername) {
+                        user.sshAuthorizedKeys = [deployPublicKeyOpenssh].concat(user.sshAuthorizedKeys ?? []);
+                        user.groups = (user.groups ?? []).concat(["sudo"]);
+                        user.lockPasswd = true;
+                        foundDeployUser = true;
+                    }
                 }
-                for (const sshUser of sshUsers ?? []) {
-                    allUsers.push({
-                        name: sshUser.name,
-                        groups: sshUser.groups,
-                        sshAuthorizedKeys: sshPrivateKeys[sshUser.name].publicKeyOpenssh.apply((key) => [key.trim()]),
+                if (!foundDefaultUser) {
+                    users.push({
+                        name: Host.defaultUsername,
+                        groups: ["sudo"],
+                        sshAuthorizedKeys,
                     });
                 }
-                return allUsers;
-            }),
-            systemdUnits: [],
+                if (!foundDeployUser) {
+                    users.push({
+                        name: deployUsername,
+                        groups: ["sudo"],
+                        sshAuthorizedKeys: [deployPublicKeyOpenssh],
+                    });
+                }
+                return users;
+            })),
         }, emptyOpts).ignitionConfig;
         this.registerOutputs();
     }

package/lib/flatcar/host.js.map

@@ -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,EAAc,MAAM,EAAE,MAAM,aAAa,CAAC;AAWjD,MAAM,OAAO,IAAK,SAAQ,iBAAiB;IACjC,MAAM,CAAU,cAAc,GAAa,CAAC,WAAW,CAAC,CAAC;IAEjD,cAAc,CAAmD;IACjE,cAAc,CAAwB;IAEtD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAc,EAAE,IAAsC;QAC9E,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;YACrE,MAAM,cAAc,GAAsC,EAAE,CAAC;YAE7D,KAAK,MAAM,OAAO,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;gBACrC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAC/C,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,EACzB,EAAE,SAAS,EAAE,SAAS,EAAE,EACxB,SAAS,CACV,CAAC;YACJ,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,IAAI,MAAM,CAC9B,IAAI,EACJ;YACE,GAAG,IAAI;YACP,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CACtD,KAAK,CAAC,MAAM,CACV,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACnC,IAAI,EAAE,uBAAuB,MAAM,OAAO;gBAC1C,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC,CACJ,CACF;YACD,KAAK,EAAE,MAAM;iBACV,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;iBACrD,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE;gBAC3C,MAAM,QAAQ,GAAqC,EAAE,CAAC;gBAEtD,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;oBAC/B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,CAAC;gBAED,KAAK,MAAM,OAAO,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;oBACrC,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;wBACtB,iBAAiB,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;qBAC9F,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC;YACJ,YAAY,EAAE,EAAE;SACjB,EACD,SAAS,CACV,CAAC,cAAc,CAAC;QAEjB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC"}
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/flatcar/host.ts"],"names":[],"mappings":"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"}

package/lib/flatcar/index.d.ts

@@ -1,3 +1,3 @@
-import { ConfigArgs, Config } from "./config.js";
-import { HostUserArgs, HostArgs, Host } from "./host.js";
-export { ConfigArgs, Config, HostUserArgs, HostArgs, Host };
+import { Config } from "./config.js";
+import { HostArgs, Host } from "./host.js";
+export { Config, HostArgs, Host };

package/lib/flatcar/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/flatcar/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAA0B,IAAI,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,EAAc,MAAM,EAA0B,IAAI,EAAE,CAAC"}
+{"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/freeradius/deployment.js

@@ -104,7 +104,7 @@ export class FreeRadiusServer extends ComponentResource {
             spec: {
                 selector: { matchLabels: metadata.labels },
                 strategy: { type: "Recreate" },
-                replicas: 1,
+                replicas: 2,
                 template: {
                     metadata: {
                         labels: metadata.labels,

package/lib/gitlab/project.js

@@ -38,9 +38,9 @@ export class Project extends ComponentResource {
         });
         args.defaultBranch ??= "main";
         args.initializeWithReadme ??= false;
-        args.issuesEnabled ??= true;
+        args.issuesAccessLevel ??= "private";
         args.lfsEnabled ??= false;
-        args.mergeRequestsEnabled ??= true;
+        args.mergeRequestsAccessLevel ??= "private";
         args.onlyAllowMergeIfAllDiscussionsAreResolved ??= true;
         args.onlyAllowMergeIfPipelineSucceeds ??= true;
         args.packagesEnabled ??= false;
@@ -48,10 +48,10 @@ export class Project extends ComponentResource {
         args.printingMergeRequestLinkEnabled ??= true;
         args.removeSourceBranchAfterMerge ??= true;
         args.sharedRunnersEnabled ??= true;
-        args.snippetsEnabled ??= false;
+        args.snippetsAccessLevel ??= "disabled";
         args.squashOption ??= "default_on";
         args.visibilityLevel ??= "private";
-        args.wikiEnabled ??= false;
+        args.wikiAccessLevel ??= "disabled";
         this.project = new gitlab.Project(name, args, { ...opts, protect: args.protect });
         this.pipelineBadge = new gitlab.ProjectBadge(`${name}-pipeline-badge`, {
             project: this.project.id,

package/lib/gitlab/project.js.map

@@ -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,aAAa,KAAK,IAAI,CAAC;QAC5B,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC;QAC1B,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,yCAAyC,KAAK,IAAI,CAAC;QACxD,IAAI,CAAC,gCAAgC,KAAK,IAAI,CAAC;QAC/C,IAAI,CAAC,eAAe,KAAK,KAAK,CAAC;QAC/B,IAAI,CAAC,gBAAgB,KAAK,UAAU,CAAC;QACrC,IAAI,CAAC,+BAA+B,KAAK,IAAI,CAAC;QAC9C,IAAI,CAAC,4BAA4B,KAAK,IAAI,CAAC;QAC3C,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,eAAe,KAAK,KAAK,CAAC;QAC/B,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC;QACnC,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;QACnC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC;QAE3B,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAElF,IAAI,CAAC,aAAa,GAAG,IAAI,MAAM,CAAC,YAAY,CAC1C,GAAG,IAAI,iBAAiB,EACxB;YACE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,8CAA8C;YACvD,QAAQ,EAAE,6DAA6D;SACxE,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"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"}

package/lib/grafana/alloy.d.ts

@@ -30,7 +30,7 @@ export declare class Alloy extends ComponentResource {
     private readonly lokiSecret;
     private readonly helmRelease;
     private readonly kubeletService;
-    private readonly kubeletEndpoints;
+    private readonly kubeletEndpointSlice;
     private readonly kubeletServiceMonitor;
     readonly namespace: pulumi.Output<string>;
     /**

package/lib/grafana/alloy.js

@@ -10,7 +10,7 @@ export class Alloy extends ComponentResource {
     lokiSecret;
     helmRelease;
     kubeletService;
-    kubeletEndpoints;
+    kubeletEndpointSlice;
     kubeletServiceMonitor;
     namespace;
     /**
@@ -91,6 +91,7 @@ export class Alloy extends ComponentResource {
                                 if (prometheus.username !== undefined && prometheus.password !== undefined) {
                                     config.push("basic_auth {", `username = nonsensitive(remote.kubernetes.secret.metrics-credentials.data["username"])`, `password = remote.kubernetes.secret.metrics-credentials.data["password"]`, "}");
                                 }
+                                config.push("write_relabel_config {", `source_labels = ["cluster"]`, `target_label = "cluster"`, `replacement = "${clusterName}"`, "}");
                                 config.push("}", `external_labels = { "cluster" = "${clusterName}" }`, "}");
                                 config.push(`prometheus.operator.podmonitors "metrics" {`, "forward_to = [prometheus.remote_write.metrics.receiver]", "}", `prometheus.operator.servicemonitors "metrics" {`, "forward_to = [prometheus.remote_write.metrics.receiver]", "}");
                             }
@@ -150,17 +151,15 @@ export class Alloy extends ComponentResource {
                 ports: [{ name: "https-metrics", port: 10250, targetPort: 10250, protocol: "TCP" }],
             },
         }, k8sOpts);
-        this.kubeletEndpoints = new k8s.core.v1.Endpoints("kubelet", {
+        this.kubeletEndpointSlice = new k8s.discovery.v1.EndpointSlice("kubelet", {
             metadata: kubeletMetadata,
-            subsets: [
-                {
-                    addresses: pulumi.all([args.nodes]).apply(([nodes]) => nodes.map((node) => ({
-                        ip: node.privateIpv4Address ?? node.ipv4Address,
-                        targetRef: { kind: "Node", name: node.hostname },
-                    }))),
-                    ports: [{ name: "https-metrics", port: 10250, protocol: "TCP" }],
-                },
-            ],
+            addressType: "IPv4",
+            endpoints: pulumi.all([args.nodes]).apply(([nodes]) => nodes.map((node) => ({
+                addresses: [node.privateIpv4Address ?? node.ipv4Address],
+                nodeName: node.hostname,
+                targetRef: { kind: "Node", name: node.hostname },
+            }))),
+            ports: [{ name: "https-metrics", port: 10250, protocol: "TCP" }],
         }, { ...k8sOpts, dependsOn: this.kubeletService });
         this.kubeletServiceMonitor = new prometheus.ServiceMonitor(`${name}-kubelet`, {
             metadata: kubeletMetadata,
@@ -251,7 +250,7 @@ export class Alloy extends ComponentResource {
                 namespaceSelector: { matchNames: [this.namespace] },
                 selector: { matchLabels: kubeletMetadata.labels },
             },
-        }, { ...k8sOpts, dependsOn: this.kubeletEndpoints });
+        }, { ...k8sOpts, dependsOn: this.kubeletEndpointSlice });
         this.registerOutputs();
     }
 }

package/lib/grafana/alloy.js.map

@@ -1 +1 @@
-{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.ts"],"names":[],"mappings":"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"}

package/lib/grafana/deployment.js

@@ -95,8 +95,8 @@ export class Grafana extends ComponentResource {
                     datasources: { enabled: true, searchNamespace: "ALL" },
                     dashboards: { enabled: true, searchNamespace: "ALL" },
                     resources: {
-                        requests: { memory: "96Mi" },
-                        limits: { memory: "128Mi" },
+                        requests: { memory: "128Mi" },
+                        limits: { memory: "384Mi" },
                     },
                 },
                 resources: {

package/lib/grafana/deployment.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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"}

package/lib/hcloud/assets/alpine-install.sh

@@ -0,0 +1,45 @@
+#!/bin/sh -e
+
+ALPINE_VERSION="3.23"
+REPO_URL="https://hel1.your-objectstorage.com/repo-3bc298f9844f/alpine-preseed"
+
+DRIVE="${1}"
+METADATA="${2}"
+USERDATA="${3}"
+
+ARCH="$(uname -m)"
+
+apt-get update -qq -y
+apt-get install -qq -y xorriso
+
+curl -sf -o /tmp/alpine-preseed_virt.iso.gz "${REPO_URL}/alpine-preseed_virt-v${ALPINE_VERSION}-${ARCH}.iso.gz"
+gunzip /tmp/alpine-preseed_virt.iso.gz
+mkdir -p /tmp/iso
+mount -o loop /tmp/alpine-preseed_virt.iso /tmp/iso
+cp -r /tmp/iso /tmp/newiso
+
+mkdir -p /tmp/newiso/cloud-init
+cp -r "${METADATA}" /tmp/newiso/cloud-init/meta-data
+cp -r "${USERDATA}" /tmp/newiso/cloud-init/user-data
+
+case "${ARCH}" in
+  x86_64)
+    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
+    ;;
+  aarch64)
+    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
+    ;;
+  *)
+    echo "Unsupported architecture: ${ARCH}"
+    exit 1
+    ;;
+esac
+
+dd if=/tmp/new.iso of="${DRIVE}"
+
+asyncReboot() {
+  sleep 2
+  reboot
+}
+
+asyncReboot &

package/lib/hcloud/assets/fcos-install.sh

@@ -1,27 +1,34 @@
 #!/bin/sh -e
 
-COREOS_INSTALLER_VERSION="0.22.1"
+COREOS_INSTALLER_TAG="release"
+LIBC_RELEASE="trixie"
 
 DRIVE="${1}"
 CONFIG="${2}"
 
+export DEBIAN_FRONTEND=noninteractive
+
 update-alternatives --set iptables /usr/sbin/iptables-legacy
 update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 
-apt-get update -y
-apt-get install -y docker.io fuse-overlayfs
+apt-get update -qq -y
+apt-get -o Dpkg::Options::="--force-confold" install -qq -y docker.io fuse-overlayfs
 
 mkdir /tmp/coreos-installer
 cd /tmp/coreos-installer
-docker pull "quay.io/coreos/coreos-installer:v${COREOS_INSTALLER_VERSION}"
-docker save "quay.io/coreos/coreos-installer:v${COREOS_INSTALLER_VERSION}" >image.tar
+docker pull "quay.io/coreos/coreos-installer:${COREOS_INSTALLER_TAG}"
+docker save "quay.io/coreos/coreos-installer:${COREOS_INSTALLER_TAG}" >image.tar
 tar -xf image.tar
 rm image.tar
 for l in */layer.tar; do
   tar -xf "${l}"
 done
 
-./usr/sbin/coreos-installer install "${DRIVE}" -i "${CONFIG}"
+echo "deb http://mirror.hetzner.com/debian/packages ${LIBC_RELEASE} main contrib non-free non-free-firmware" > /etc/apt/sources.list.d/libc6.list
+apt-get update -qq -y
+apt-get -o Dpkg::Options::="--force-confold" install -qq -y libc6
+
+./usr/sbin/coreos-installer install "${DRIVE}" -p hetzner -i "${CONFIG}"
 
 asyncReboot() {
   sleep 2