@ydkn/pulumi-components 0.7.15 → 0.8.1

package/lib/grafana/alloy.js

@@ -2,11 +2,15 @@ import * as pulumi from "@pulumi/pulumi";
 import * as k8s from "@pulumi/kubernetes";
 import { ComponentResource } from "../common/index.js";
 import * as kubernetes from "../kubernetes/index.js";
+import * as prometheus from "../prometheus/index.js";
 export class Alloy extends ComponentResource {
     prometheusCRDsRelease;
     prometheusSecret;
     lokiSecret;
     helmRelease;
+    kubeletService;
+    kubeletEndpoints;
+    kubeletServiceMonitor;
     namespace;
     /**
      * Create a new grafana alloy resource.
@@ -21,8 +25,8 @@ export class Alloy extends ComponentResource {
         }
         if (args.resources === undefined) {
             args.resources = {
-                requests: { memory: "256Mi" },
-                limits: { memory: "384Mi" },
+                requests: { memory: "512Mi" },
+                limits: { memory: "768Mi" },
             };
         }
         if (args.installPrometheusCRDs === undefined) {
@@ -105,7 +109,7 @@ export class Alloy extends ComponentResource {
                                     config.push("basic_auth {", `username = nonsensitive(remote.kubernetes.secret.logs-credentials.data["username"])`, `password = remote.kubernetes.secret.logs-credentials.data["password"]`, "}");
                                 }
                                 config.push("}", `external_labels = { "cluster" = "${clusterName}" }`, "}");
-                                config.push(`discovery.kubernetes "pods" {`, `role = "pod"`, "}", `loki.source.kubernetes "logs" {`, "targets = discovery.kubernetes.pods.targets", "forward_to = [loki.write.logs.receiver]", "}");
+                                config.push(`discovery.kubernetes "pods" {`, `role = "pod"`, "}", `discovery.relabel "pods" {`, "targets = discovery.kubernetes.pods.targets", "rule {", `source_labels = ["__meta_kubernetes_namespace"]`, `action = "replace"`, `target_label = "namespace"`, "}", "rule {", `source_labels = ["__meta_kubernetes_pod_name"]`, `action = "replace"`, `target_label = "pod"`, "}", "rule {", `source_labels = ["__meta_kubernetes_pod_container_name"]`, `action = "replace"`, `target_label = "container"`, "}", "rule {", `source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]`, `action = "replace"`, `target_label = "app"`, "}", "rule {", `source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_component"]`, `action = "replace"`, `target_label = "component"`, "}", "}", `loki.source.kubernetes "pods" {`, "targets    = discovery.relabel.pods.output", "forward_to = [loki.write.logs.receiver]", "}");
                             }
                             return config.join("\n");
                         }),
@@ -121,13 +125,12 @@ export class Alloy extends ComponentResource {
                 controller: {
                     type: "statefulset",
                     replicas: 1,
-                    tolerations: [{ operator: "Exists" }],
                     enableStatefulSetAutoDeletePVC: true,
                 },
                 serviceMonitor: { enabled: true },
                 ingress: {
                     enabled: args.hostname ?? false,
-                    ingressClassName: args.ingressClassName ?? "internal",
+                    ingressClassName: args.ingressClassName ?? "cilium",
                     annotations: {
                         "cert-manager.io/cluster-issuer": args.clusterIssuer ?? "letsencrypt",
                         "traefik.ingress.kubernetes.io/router.entrypoints": "websecure",
@@ -139,6 +142,123 @@ export class Alloy extends ComponentResource {
                 },
             },
         }, k8sOpts);
+        const kubeletMetadata = {
+            name: "kubelet",
+            namespace: this.namespace,
+            labels: {
+                "app.kubernetes.io/name": "kubelet",
+            },
+        };
+        this.kubeletService = new k8s.core.v1.Service("kubelet", {
+            metadata: kubeletMetadata,
+            spec: {
+                clusterIP: "None",
+                ipFamilyPolicy: "RequireDualStack",
+                ports: [{ name: "https-metrics", port: 10250, targetPort: 10250, protocol: "TCP" }],
+            },
+        }, k8sOpts);
+        this.kubeletEndpoints = new k8s.core.v1.Endpoints("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" }],
+                },
+            ],
+        }, { ...k8sOpts, dependsOn: this.kubeletService });
+        this.kubeletServiceMonitor = new prometheus.ServiceMonitor(`${name}-kubelet`, {
+            metadata: kubeletMetadata,
+            spec: {
+                endpoints: [
+                    {
+                        bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+                        honorLabels: true,
+                        interval: "60s",
+                        port: "https-metrics",
+                        scheme: "https",
+                        tlsConfig: { insecureSkipVerify: true },
+                        relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
+                    },
+                    {
+                        bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+                        honorLabels: true,
+                        honorTimestamps: false,
+                        interval: "60s",
+                        path: "/metrics/cadvisor",
+                        port: "https-metrics",
+                        scheme: "https",
+                        tlsConfig: { insecureSkipVerify: true },
+                        metricRelabelings: [
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: "go_.*",
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: [
+                                    "container_cpu_cfs_throttled_seconds_total",
+                                    "container_cpu_load_average_10s",
+                                    "container_cpu_system_seconds_total",
+                                    "container_cpu_user_seconds_total",
+                                ].join("|"),
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: [
+                                    "container_fs_io_current",
+                                    "container_fs_io_time_seconds_total",
+                                    "container_fs_io_time_weighted_seconds_total",
+                                    "container_fs_reads_merged_total",
+                                    "container_fs_sector_reads_total",
+                                    "container_fs_sector_writes_total",
+                                    "container_fs_writes_merged_total",
+                                ].join("|"),
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: ["container_memory_mapped_file", "container_memory_swap"].join("|"),
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: ["container_file_descriptors", "container_tasks_state", "container_threads_max"].join("|"),
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["__name__"],
+                                regex: "container_spec.*",
+                            },
+                            {
+                                action: "drop",
+                                sourceLabels: ["id", "pod"],
+                                regex: ".+;",
+                            },
+                        ],
+                        relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
+                    },
+                    {
+                        bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+                        honorLabels: true,
+                        honorTimestamps: false,
+                        interval: "60s",
+                        path: "/metrics/probes",
+                        port: "https-metrics",
+                        scheme: "https",
+                        tlsConfig: { insecureSkipVerify: true },
+                        relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
+                    },
+                ],
+                namespaceSelector: { matchNames: [this.namespace] },
+                selector: { matchLabels: kubeletMetadata.labels },
+            },
+        }, { ...k8sOpts, dependsOn: this.kubeletEndpoints });
         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/dashboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../../lib/grafana/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAQ1C,MAAM,OAAO,SAAU,SAAQ,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAmB,EAAE,IAAmC;QAChF,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACzD,OAAO;oBACL,GAAG,QAAQ;oBACX,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE;iBACvD,CAAC;YACJ,CAAC,CAAC;YACF,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;gBACvE,MAAM,CAAC,GAA2B,EAAE,CAAC;gBAErC,CAAC,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,CAAC;gBAElC,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;SACH,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"dashboard.js","sourceRoot":"","sources":["../../../lib/grafana/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAQ1C,MAAM,OAAO,SAAU,SAAQ,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAmB,EAAE,IAAmC;QAChF,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACzD,OAAO;oBACL,GAAG,QAAQ;oBACX,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE;iBACvD,CAAC;YACJ,CAAC,CAAC;YACF,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;gBACvE,MAAM,CAAC,GAA8B,EAAE,CAAC;gBAExC,CAAC,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,CAAC;gBAElC,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;SACH,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}

package/lib/grafana/datasource.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../lib/grafana/datasource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAWrD,MAAM,OAAO,UAAW,SAAQ,UAAU,CAAC,EAAE,CAAC,MAAM;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAoB,EAAE,IAAmC;QACjF,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACzD,OAAO;oBACL,GAAG,QAAQ;oBACX,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE;iBACxD,CAAC;YACJ,CAAC,CAAC;YACF,UAAU,EAAE,MAAM;iBACf,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBACjE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE;gBACjD,MAAM,IAAI,GAA2B,EAAE,CAAC;gBAExC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;oBAChC,UAAU,EAAE,CAAC;oBACb,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;oBACxD,WAAW,EAAE;wBACX;4BACE,GAAG,EAAE,IAAI;4BACT,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,MAAM;4BACZ,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,KAAK,IAAI,CAAC;4BACjB,GAAG;4BACH,QAAQ,EAAE,KAAK;4BACf,SAAS,EAAE,SAAS,IAAI,KAAK;yBAC9B;qBACF;iBACF,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;SACL,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../lib/grafana/datasource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAWrD,MAAM,OAAO,UAAW,SAAQ,UAAU,CAAC,EAAE,CAAC,MAAM;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAoB,EAAE,IAAmC;QACjF,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACzD,OAAO;oBACL,GAAG,QAAQ;oBACX,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE;iBACxD,CAAC;YACJ,CAAC,CAAC;YACF,UAAU,EAAE,MAAM;iBACf,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBACjE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE;gBACjD,MAAM,IAAI,GAA8B,EAAE,CAAC;gBAE3C,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;oBAChC,UAAU,EAAE,CAAC;oBACb,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;oBACxD,WAAW,EAAE;wBACX;4BACE,GAAG,EAAE,IAAI;4BACT,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,MAAM;4BACZ,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,KAAK,IAAI,CAAC;4BACjB,GAAG;4BACH,QAAQ,EAAE,KAAK;4BACf,SAAS,EAAE,SAAS,IAAI,KAAK;yBAC9B;qBACF;iBACF,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;SACL,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}

package/lib/grafana/deployment.d.ts

@@ -15,6 +15,8 @@ export interface GrafanaArgs {
     replicas?: pulumi.Input<number>;
 }
 export declare class Grafana extends ComponentResource {
+    private static readonly kubernetesDashboards;
+    private static readonly cephDashboards;
     private readonly helmRelease;
     readonly adminPassword: pulumi.Output<string>;
     readonly namespace: pulumi.Output<string>;
@@ -25,4 +27,7 @@ export declare class Grafana extends ComponentResource {
      * @param opts A bag of options that control this resource's behavior.
      */
     constructor(name: string, args: GrafanaArgs, opts?: pulumi.ComponentResourceOptions);
+    private dashboard;
+    private kubernetesDashboard;
+    private cephDashboard;
 }

package/lib/grafana/deployment.js

@@ -1,9 +1,29 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as random from "@pulumi/random";
 import * as k8s from "@pulumi/kubernetes";
+import * as https from "https";
 import { ComponentResource } from "../common/index.js";
 import * as kubernetes from "../kubernetes/index.js";
+import { Dashboard } from "./dashboard.js";
 export class Grafana extends ComponentResource {
+    static kubernetesDashboards = [
+        "k8s-system-coredns",
+        "k8s-views-global",
+        "k8s-views-namespaces",
+        "k8s-views-nodes",
+        "k8s-views-pods",
+    ];
+    static cephDashboards = [
+        "ceph-cluster",
+        "ceph-cluster-advanced",
+        "hosts-overview",
+        "host-details",
+        "osds-overview",
+        "osd-device-details",
+        "pool-overview",
+        "pool-detail",
+        "cephfs-overview",
+    ];
     helmRelease;
     adminPassword;
     namespace;
@@ -34,7 +54,7 @@ export class Grafana extends ComponentResource {
                 replicas: args.replicas,
                 adminPassword: this.adminPassword,
                 testFramework: { enabled: false },
-                plugins: ["grafana-piechart-panel", "vonage-status-panel"],
+                plugins: ["grafana-clock-panel", "grafana-piechart-panel", "natel-discrete-panel", "vonage-status-panel"],
                 ingress: kubernetes.helm.v3.ingressValues(name, [args.hostname], args.ingressClassName),
                 serviceAccount: { create: true, autoMount: true },
                 rbac: { pspEnabled: false },
@@ -87,7 +107,41 @@ export class Grafana extends ComponentResource {
                 },
             },
         }, k8sOpts);
+        for (const id of Grafana.kubernetesDashboards) {
+            this.kubernetesDashboard(name, this.namespace, id, k8sOpts);
+        }
+        for (const id of Grafana.cephDashboards) {
+            this.cephDashboard(name, this.namespace, id, k8sOpts);
+        }
         this.registerOutputs();
     }
+    dashboard(name, namespace, id, url, opts) {
+        return new Dashboard(`${name}-grafana-dashboard-${id}`, {
+            metadata: { name: pulumi.interpolate `${name}-grafana-dashboard-${id}`, namespace },
+            name: id,
+            data: new Promise((resolve, reject) => {
+                https
+                    .request(url, (r) => {
+                    let data = "";
+                    r.on("data", (chunk) => {
+                        data += chunk;
+                    });
+                    r.on("end", () => {
+                        resolve(data);
+                    });
+                    r.on("error", (err) => {
+                        reject(err);
+                    });
+                })
+                    .end();
+            }),
+        }, opts);
+    }
+    kubernetesDashboard(name, namespace, id, opts) {
+        return this.dashboard(name, namespace, id, `https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/${id}.json`, opts);
+    }
+    cephDashboard(name, namespace, id, opts) {
+        return this.dashboard(name, namespace, id, `https://raw.githubusercontent.com/ceph/ceph/refs/heads/main/monitoring/ceph-mixin/dashboards_out/${id}.json`, opts);
+    }
 }
 //# sourceMappingURL=deployment.js.map

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/fcos-install.sh

@@ -1,25 +1,27 @@
 #!/bin/sh -e
 
-COREOS_INSTALLER_VERSION="0.21.0"
-COREOS_INSTALLER_BASE_URL="https://static.ydkn.io/fcos"
+COREOS_INSTALLER_VERSION="0.22.1"
 
 DRIVE="${1}"
 CONFIG="${2}"
 
-curl -sf -o /tmp/coreos-installer "${COREOS_INSTALLER_BASE_URL}/v${COREOS_INSTALLER_VERSION}/$(arch)/coreos-installer"
-chmod +x /tmp/coreos-installer
+update-alternatives --set iptables /usr/sbin/iptables-legacy
+update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 
-cat <<EOF >/etc/apt/sources.list
-deb http://mirror.hetzner.com/debian/packages testing main contrib non-free
-deb http://mirror.hetzner.com/debian/packages testing-updates main contrib non-free
-EOF
+apt-get update -y
+apt-get install -y docker.io fuse-overlayfs
 
-export DEBIAN_FRONTEND=noninteractive
+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
+tar -xf image.tar
+rm image.tar
+for l in */layer.tar; do
+  tar -xf "${l}"
+done
 
-apt-get -q update
-apt-get install -q -y libc-bin libssl3
-
-/tmp/coreos-installer install "${DRIVE}" -i "${CONFIG}"
+./usr/sbin/coreos-installer install "${DRIVE}" -i "${CONFIG}"
 
 asyncReboot() {
   sleep 2

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

@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+DRIVE="${1}"
+CONFIG="${2}"
+
+apt-get update -y
+apt-get install -y gawk
+
+curl -sf -o /tmp/flatcar-install https://raw.githubusercontent.com/flatcar/init/flatcar-master/bin/flatcar-install
+chmod +x /tmp/flatcar-install
+
+/tmp/flatcar-install -d "${DRIVE}" -o hetzner -C stable -i "${CONFIG}"
+
+asyncReboot() {
+  sleep 2
+  reboot
+}
+
+asyncReboot &

package/lib/hcloud/cluster.d.ts

@@ -3,29 +3,20 @@ import * as tls from "@pulumi/tls";
 import * as k8s from "@pulumi/kubernetes";
 import { ComponentResource } from "../common/index.js";
 import * as node from "../node/index.js";
-import * as fcos from "../fcos/index.js";
 import * as k0s from "../k0s/index.js";
-interface Nodes extends node.Node, fcos.HostArgs {
+export interface Node extends node.Node, node.IgnitionArgs {
     serverType: pulumi.Input<string>;
     count?: pulumi.Input<number>;
     location?: pulumi.Input<string>;
-    disabled?: pulumi.Input<boolean>;
 }
-export interface Node extends node.Node {
-    fcosHost: fcos.Host;
-    disabled: boolean;
-}
-/**
- * Arguments for hcloud cluster resource
- */
-export interface ClusterArgs extends k0s.ClusterArgs, fcos.IgnitionArgs {
+export interface ClusterArgs extends k0s.ClusterArgs, node.IgnitionArgs {
     name?: pulumi.Input<string>;
     token: pulumi.Input<string>;
     location: pulumi.Input<string>;
     zone: pulumi.Input<string>;
     networkRange: pulumi.Input<string>;
     nodeRange: pulumi.Input<string>;
-    nodes: pulumi.Input<pulumi.Input<Nodes>[]>;
+    nodes: pulumi.Input<pulumi.Input<Node>[]>;
     externalSshAccess?: pulumi.Input<boolean>;
     trustedNetworkRanges?: pulumi.Input<pulumi.Input<string>[]>;
     externalAccess?: pulumi.Input<boolean>;
@@ -33,12 +24,13 @@ export interface ClusterArgs extends k0s.ClusterArgs, fcos.IgnitionArgs {
 }
 export declare class Cluster extends ComponentResource {
     private static readonly rescueSshUsername;
+    private static readonly defaultOperatingSystem;
     private static readonly sshUsername;
     private static readonly interfacesMap;
     private static readonly dnsServers;
     private static readonly gatewayIPv6;
-    private static readonly fcosInstallScriptPathRemote;
-    private static readonly fcosConfigPathRemote;
+    private static readonly ignitionConfigPathRemote;
+    private static readonly installScriptPathRemote;
     private readonly sshKey;
     private readonly network;
     private readonly nodeSubnet;
@@ -54,7 +46,7 @@ export declare class Cluster extends ComponentResource {
     readonly networkId: pulumi.Output<number>;
     readonly networkRange: pulumi.Output<string>;
     readonly nodeRange: pulumi.Output<string>;
-    readonly nodes: pulumi.Output<pulumi.Output<Node>[]>;
+    readonly nodes: pulumi.Output<pulumi.Output<node.Node>[]>;
     readonly kubeconfig: pulumi.Output<string>;
     readonly provider: k8s.Provider;
     readonly kubeletDirPath: pulumi.Output<string>;
@@ -67,5 +59,7 @@ export declare class Cluster extends ComponentResource {
     constructor(name: string, args: ClusterArgs, opts?: pulumi.ComponentResourceOptions);
     private createServers;
     private configureFcosNode;
+    private configureFlatcarNode;
+    private fileAssetFromString;
+    private static ethernetInterfaceName;
 }
-export {};