@ydkn/pulumi-components 0.8.8 → 0.9.1

package/lib/avahi/deployment.js

@@ -2,9 +2,11 @@ import * as pulumi from "@pulumi/pulumi";
 import * as k8s from "@pulumi/kubernetes";
 import { ComponentResource } from "../common/index.js";
 export class Avahi extends ComponentResource {
+    static k8sSidecarVersion = "2.7.3";
     serviceAccount;
     clusterRole;
     clusterRoleBinding;
+    reloadScript;
     deployment;
     podDisruptionBudget;
     namespace;
@@ -33,7 +35,7 @@ export class Avahi extends ComponentResource {
         this.serviceAccount = new k8s.core.v1.ServiceAccount(name, { metadata }, opts);
         this.clusterRole = new k8s.rbac.v1.ClusterRole(name, {
             metadata,
-            rules: [{ apiGroups: [""], resources: ["configmaps"], verbs: ["get", "list"] }],
+            rules: [{ apiGroups: [""], resources: ["configmaps"], verbs: ["get", "list", "watch"] }],
         }, opts);
         this.clusterRoleBinding = new k8s.rbac.v1.ClusterRoleBinding(name, {
             metadata,
@@ -50,7 +52,27 @@ export class Avahi extends ComponentResource {
                 apiGroup: "rbac.authorization.k8s.io",
             },
         }, opts);
-        this.labelName = pulumi.interpolate `${name}-service`;
+        this.reloadScript = new k8s.core.v1.ConfigMap(`${name}-reload-script`, {
+            metadata: { ...metadata, name: `${name}-reload-script` },
+            data: {
+                reload: "#!/bin/sh\npkill -HUP avahi-daemon",
+            },
+        }, opts);
+        this.labelName = pulumi.interpolate `${name}-avahi-service`;
+        const servicesSpec = {
+            image: `ghcr.io/kiwigrid/k8s-sidecar:${Avahi.k8sSidecarVersion}`,
+            imagePullPolicy: "Always",
+            env: [
+                { name: "NAMESPACE", value: "ALL" },
+                { name: "LABEL", value: this.labelName },
+                { name: "FOLDER", value: "/etc/avahi/services" },
+            ],
+            resources: {
+                requests: { memory: "96Mi" },
+                limits: { memory: "128Mi" },
+            },
+            volumeMounts: [{ name: "services", mountPath: "/etc/avahi/services" }],
+        };
         this.deployment = new k8s.apps.v1.Deployment(name, {
             metadata,
             spec: {
@@ -63,22 +85,12 @@ export class Avahi extends ComponentResource {
                         serviceAccountName: this.serviceAccount.metadata.name,
                         nodeSelector: args.nodeSelector,
                         hostNetwork: true,
+                        shareProcessNamespace: true,
                         initContainers: [
                             {
-                                name: "services",
-                                image: "cyrilix/k8s-sidecar:latest",
-                                imagePullPolicy: "Always",
-                                env: [
-                                    { name: "NAMESPACE", value: "ALL" },
-                                    { name: "METHOD", value: "LIST" },
-                                    { name: "LABEL", value: this.labelName },
-                                    { name: "FOLDER", value: "/etc/avahi/services" },
-                                ],
-                                resources: {
-                                    requests: { memory: "48Mi" },
-                                    limits: { memory: "64Mi" },
-                                },
-                                volumeMounts: [{ name: "services", mountPath: "/etc/avahi/services" }],
+                                ...servicesSpec,
+                                name: "services-init",
+                                env: [...servicesSpec.env, { name: "METHOD", value: "LIST" }, { name: "HEALTH_PORT", value: "8081" }],
                             },
                         ],
                         containers: [
@@ -95,13 +107,25 @@ export class Avahi extends ComponentResource {
                                     },
                                 ],
                                 resources: {
-                                    requests: { memory: "12Mi" },
-                                    limits: { memory: "16Mi" },
+                                    requests: { memory: "16Mi" },
+                                    limits: { memory: "24Mi" },
                                 },
                                 volumeMounts: [{ name: "services", mountPath: "/etc/avahi/services" }],
                             },
+                            {
+                                ...servicesSpec,
+                                name: "services-update",
+                                env: [...servicesSpec.env, { name: "SCRIPT", value: "/opt/reload.sh" }],
+                                volumeMounts: [
+                                    ...servicesSpec.volumeMounts,
+                                    { name: "reload-script", mountPath: "/opt/reload.sh", subPath: "reload" },
+                                ],
+                            },
+                        ],
+                        volumes: [
+                            { name: "reload-script", configMap: { name: this.reloadScript.metadata.name, defaultMode: 0o755 } },
+                            { name: "services", emptyDir: {} },
                         ],
-                        volumes: [{ name: "services", emptyDir: {} }],
                         affinity: {
                             podAntiAffinity: {
                                 preferredDuringSchedulingIgnoredDuringExecution: [
@@ -135,7 +159,7 @@ export class Avahi extends ComponentResource {
         this.podDisruptionBudget = new k8s.policy.v1.PodDisruptionBudget(name, {
             metadata,
             spec: {
-                maxUnavailable: 0,
+                maxUnavailable: 1,
                 selector: { matchLabels: metadata.labels },
             },
         }, opts);

package/lib/avahi/deployment.js.map

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

package/lib/avahi/service.d.ts

@@ -9,19 +9,19 @@ export interface AvahiServiceDefinitionArgs {
 }
 export interface AvahiServiceArgs {
     metadata: pulumi.Input<k8s.types.input.meta.v1.ObjectMeta>;
-    labelName: pulumi.Input<string>;
+    labelNames: pulumi.Input<pulumi.Input<string>[]>;
     name: pulumi.Input<string>;
     services: pulumi.Input<pulumi.Input<AvahiServiceDefinitionArgs>[]>;
 }
 export type ConfigAvahiServicesArgs = pulumi.Input<{
     [key: string]: pulumi.Input<{
         name: pulumi.Input<string>;
+        labelNames: pulumi.Input<pulumi.Input<string>[]>;
         services: pulumi.Input<pulumi.Input<AvahiServiceDefinitionArgs>[]>;
     }>;
 }>;
 export interface ConfigAvahiServiceArgs {
     metadata: pulumi.Input<k8s.types.input.meta.v1.ObjectMeta>;
-    labelName: pulumi.Input<string>;
     services: ConfigAvahiServicesArgs;
 }
 export declare class AvahiService extends k8s.core.v1.ConfigMap {

package/lib/avahi/service.js

@@ -39,11 +39,13 @@ export class AvahiService extends k8s.core.v1.ConfigMap {
             configMapData[`${AvahiService.sanitizeName(name)}.service`] = serviceData.join("\n");
             return configMapData;
         });
-        const metadata = pulumi.all([args.labelName, args.metadata]).apply(([labelName, metadata]) => {
+        const metadata = pulumi.all([args.labelNames, args.metadata]).apply(([labelNames, metadata]) => {
             metadata ??= {};
             metadata.labels ??= {};
-            // eslint-disable-next-line security/detect-object-injection
-            metadata.labels[labelName] = "true";
+            for (const labelName of labelNames) {
+                // eslint-disable-next-line security/detect-object-injection
+                metadata.labels[labelName] = "true";
+            }
             return metadata;
         });
         super(name, { metadata, data }, opts);
@@ -54,12 +56,12 @@ export class AvahiService extends k8s.core.v1.ConfigMap {
             for (const name in services) {
                 avahiServices.push(
                 // eslint-disable-next-line security/detect-object-injection
-                pulumi.all([name, services[name]]).apply(([name, services]) => new AvahiService(name, {
+                pulumi.all([name, services[name].labelNames, services[name]]).apply(([name, labelNames, services]) => new AvahiService(name, {
                     ...services,
-                    metadata: pulumi.all([name, args.metadata, args.labelName]).apply(([name, metadata, labelName]) => {
-                        return { ...metadata, name: pulumi.interpolate `${name}-${labelName}` };
+                    metadata: pulumi.all([args.metadata]).apply(([metadata]) => {
+                        return { ...metadata, name: metadata.name ?? name };
                     }),
-                    labelName: args.labelName,
+                    labelNames,
                 }, opts)));
             }
             return avahiServices;

package/lib/avahi/service.js.map

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

package/lib/certManager/certificate.js

@@ -22,7 +22,7 @@ export class Certificate extends k8s.apiextensions.CustomResource {
             return spec;
         });
         super(name, { apiVersion: "cert-manager.io/v1", kind: "Certificate", metadata: args.metadata, spec }, opts);
-        this.hostnames = pulumi.all([spec]).apply(([spec]) => (spec.dnsNames ?? []));
+        this.hostnames = pulumi.all([spec]).apply(([spec]) => spec.dnsNames ?? []);
         this.secretName = pulumi.all([spec]).apply(([spec]) => spec.secretName);
     }
 }

package/lib/certManager/certificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"certificate.js","sourceRoot":"","sources":["../../../lib/certManager/certificate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAgE1C,MAAM,OAAO,WAAY,SAAQ,GAAG,CAAC,aAAa,CAAC,cAAc;IACxD,MAAM,CAAU,oBAAoB,GAAG,aAAa,CAAC;IAE5C,UAAU,CAAwB;IAClC,SAAS,CAA0B;IAEnD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAqB,EAAE,IAAmC;QAClF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE;YACpD,IAAI,CAAC,UAAU,KAAK,GAAG,IAAI,MAAM,CAAC;YAClC,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,cAAc,KAAK,QAAQ,CAAC;YAC5C,IAAI,CAAC,SAAS,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,oBAAoB,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;YAErF,IAAI,IAAI,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,KAAK,YAAY,CAAC;YACjD,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QAE5G,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAa,CAAC,CAAC;QACzF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;IAC3E,CAAC"}
+{"version":3,"file":"certificate.js","sourceRoot":"","sources":["../../../lib/certManager/certificate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAgE1C,MAAM,OAAO,WAAY,SAAQ,GAAG,CAAC,aAAa,CAAC,cAAc;IACxD,MAAM,CAAU,oBAAoB,GAAG,aAAa,CAAC;IAE5C,UAAU,CAAwB;IAClC,SAAS,CAA0B;IAEnD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAqB,EAAE,IAAmC;QAClF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE;YACpD,IAAI,CAAC,UAAU,KAAK,GAAG,IAAI,MAAM,CAAC;YAClC,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,cAAc,KAAK,QAAQ,CAAC;YAC5C,IAAI,CAAC,SAAS,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,oBAAoB,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;YAErF,IAAI,IAAI,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,KAAK,YAAY,CAAC;YACjD,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QAE5G,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;IAC3E,CAAC"}

package/lib/certManager/issuer.d.ts

@@ -21,7 +21,7 @@ export interface WebhookSolverArgs {
     groupName: pulumi.Input<string>;
     solverName: pulumi.Input<string>;
     config?: pulumi.Input<{
-        [key: string]: pulumi.Input<string>;
+        [key: string]: pulumi.Input<any>;
     }>;
 }
 export interface DnsSolverArgs {

package/lib/certManager/operator.js

@@ -149,7 +149,7 @@ export class CertManager extends ComponentResource {
                 if (hetzner !== undefined) {
                     if (hetzner.issuerName === undefined && !defaultIssuerUsed) {
                         hetzner.issuerName = Certificate.DefaultClusterIssuer;
-                        defaultIssuerUsed = true;
+                        // defaultIssuerUsed = true;
                     }
                     else {
                         hetzner.issuerName ??= "letsencrypt-hetzner";
@@ -207,24 +207,24 @@ export class CertManager extends ComponentResource {
         const secret = new kubernetes.v1.Secret(`${name}-hetzner`, {
             metadata: { ...metadata, name: `${name}-hetzner` },
             stringData: {
-                "api-key": hetzner.token,
+                token: hetzner.token,
             },
         }, opts);
-        const groupName = "acme.hetzner";
+        const groupName = "acme.hetzner.com";
         const helmRelease = new kubernetes.helm.v3.Release(`${name}-hetzner`, {
             name: `${name}-hetzner`,
             namespace: metadata.namespace,
-            repositoryOpts: { repo: "https://vadimkim.github.io/cert-manager-webhook-hetzner" },
+            repositoryOpts: { repo: "https://charts.hetzner.cloud" },
             chart: "cert-manager-webhook-hetzner",
             values: {
                 fullnameOverride: `${name}-hetzner`,
                 groupName,
                 certManager: { namespace: metadata.namespace, serviceAccountName: name },
-                secretName: [secret.metadata.name],
                 resources: {
-                    requests: { memory: "24Mi" },
-                    limits: { memory: "32Mi" },
+                    requests: { memory: "32Mi" },
+                    limits: { memory: "48Mi" },
                 },
+                metrics: { serviceMonitor: { enabled: true } },
             },
         }, opts);
         return new ClusterIssuer(`${name}-hetzner`, {
@@ -240,7 +240,7 @@ export class CertManager extends ComponentResource {
                                 webhook: {
                                     groupName,
                                     solverName: "hetzner",
-                                    config: { apiUrl: "https://dns.hetzner.com/api/v1", secretName: secret.metadata.name },
+                                    config: { tokenSecretKeyRef: { name: secret.metadata.name, key: "token" } },
                                 },
                             },
                         },

package/lib/certManager/operator.js.map

@@ -1 +1 @@
-{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/certManager/operator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/certManager/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAwB/C,MAAM,OAAO,WAAY,SAAQ,iBAAiB;IAC/B,WAAW,CAA6B;IACxC,gBAAgB,CAAY;IAC7B,SAAS,CAAwB;IACjC,cAAc,CAA0D;IAExF;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAqB,EAAE,IAAsC;QACrF,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEhF,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,cAAc;gBACxC,6BAA6B,EAAE,cAAc;gBAC7C,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC/C,IAAI,EACJ;YACE,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,cAAc,EAAE,EAAE,IAAI,EAAE,4BAA4B,EAAE;YACtD,KAAK,EAAE,cAAc;YACrB,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,YAAY,EAAE,IAAI,CAAC,QAAQ;gBAC3B,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE;gBACzD,SAAS,EAAE,CAAC,qCAAqC,CAAC;gBAClD,OAAO,EAAE;oBACP,YAAY,EAAE,IAAI,CAAC,QAAQ;oBAC3B,QAAQ,EAAE;wBACR,eAAe,EAAE;4BACf,+CAA+C,EAAE;gCAC/C;oCACE,MAAM,EAAE,GAAG;oCACX,eAAe,EAAE;wCACf,aAAa,EAAE;4CACb,gBAAgB,EAAE;gDAChB,EAAE,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE;gDAC3E,EAAE,GAAG,EAAE,6BAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;gDAC3E,EAAE,GAAG,EAAE,4BAA4B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;6CACtE;yCACF;wCACD,WAAW,EAAE,wBAAwB;qCACtC;iCACF;6BACF;yBACF;qBACF;oBACD,qBAAqB,EAAE,iBAAiB;oBACxC,SAAS,EAAE;wBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;wBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;qBAC3B;iBACF;gBACD,UAAU,EAAE;oBACV,YAAY,EAAE,IAAI,CAAC,QAAQ;oBAC3B,QAAQ,EAAE;wBACR,eAAe,EAAE;4BACf,+CAA+C,EAAE;gCAC/C;oCACE,MAAM,EAAE,GAAG;oCACX,eAAe,EAAE;wCACf,aAAa,EAAE;4CACb,gBAAgB,EAAE;gDAChB,EAAE,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE;gDAC3E,EAAE,GAAG,EAAE,6BAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE;gDAC9E,EAAE,GAAG,EAAE,4BAA4B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;6CACtE;yCACF;wCACD,WAAW,EAAE,wBAAwB;qCACtC;iCACF;6BACF;yBACF;qBACF;oBACD,SAAS,EAAE;wBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;wBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;qBAC5B;iBACF;gBACD,UAAU,EAAE,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;gBACjD,QAAQ,EAAE;oBACR,eAAe,EAAE;wBACf,+CAA+C,EAAE;4BAC/C;gCACE,MAAM,EAAE,GAAG;gCACX,eAAe,EAAE;oCACf,aAAa,EAAE;wCACb,gBAAgB,EAAE;4CAChB,EAAE,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE;4CAC3E,EAAE,GAAG,EAAE,6BAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE;4CAC9E,EAAE,GAAG,EAAE,4BAA4B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;yCACtE;qCACF;oCACD,WAAW,EAAE,wBAAwB;iCACtC;6BACF;yBACF;qBACF;iBACF;gBACD,qBAAqB,EAAE,iBAAiB;gBACxC,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;iBAC5B;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,MAAM;aACzB,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;aACtD,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE;YAC5C,MAAM,cAAc,GAA6C,EAAE,CAAC;YAEpE,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAEtF,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAE9B,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7B,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBAC9D,UAAU,CAAC,UAAU,GAAG,WAAW,CAAC,oBAAoB,CAAC;wBACzD,iBAAiB,GAAG,IAAI,CAAC;oBAC3B,CAAC;yBAAM,CAAC;wBACN,UAAU,CAAC,UAAU,KAAK,wBAAwB,CAAC;oBACrD,CAAC;oBAED,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,2BAA2B,CAC1D,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,IAAI,CACL,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAEhB,IAAI,UAAU,CAAC,UAAU,IAAI,WAAW,CAAC,oBAAoB,EAAE,CAAC;wBAC9D,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC;oBAC/E,CAAC;gBACH,CAAC;gBAED,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1B,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBAC3D,OAAO,CAAC,UAAU,GAAG,WAAW,CAAC,oBAAoB,CAAC;wBACtD,4BAA4B;oBAC9B,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,UAAU,KAAK,qBAAqB,CAAC;oBAC/C,CAAC;oBAED,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,wBAAwB,CACpD,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,OAAO,EACP,IAAI,CACL,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAEhB,IAAI,OAAO,CAAC,UAAU,IAAI,WAAW,CAAC,oBAAoB,EAAE,CAAC;wBAC3D,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC;oBAC5E,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,gBAAgB,GAAG,IAAI,SAAS,CACnC,GAAG,IAAI,oBAAoB,EAC3B;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,oBAAoB,EAAE;YAC9E,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,EAAE,CAAC,YAAY,CACnB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EACvF,OAAO,CACR;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEO,gBAAgB,CACtB,IAAY,EACZ,QAA4C,EAC5C,IAAsC;QAEtC,OAAO,IAAI,aAAa,CACtB,GAAG,IAAI,cAAc,EACrB;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE;YAC9C,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;SACzB,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;IACJ,CAAC;IAEO,2BAA2B,CACjC,IAAY,EACZ,QAA4C,EAC5C,WAA4B,EAC5B,UAA0B,EAC1B,IAAsC;QAEtC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CACrC,GAAG,IAAI,aAAa,EACpB;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,aAAa,EAAE;YACrD,UAAU,EAAE;gBACV,QAAQ,EAAE,UAAU,CAAC,KAAK;aAC3B;SACF,EACD,IAAI,CACL,CAAC;QAEF,OAAO,IAAI,aAAa,CACtB,GAAG,IAAI,aAAa,EACpB;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE;YACtD,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,MAAM,EAAE,gDAAgD;oBACxD,mBAAmB,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,yBAAyB,EAAE;oBAC/D,OAAO,EAAE;wBACP;4BACE,KAAK,EAAE;gCACL,UAAU,EAAE;oCACV,KAAK,EAAE,WAAW,CAAC,KAAK;oCACxB,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE;iCACnE;6BACF;yBACF;qBACF;iBACF;aACF;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;IACJ,CAAC;IAEO,wBAAwB,CAC9B,IAAY,EACZ,QAA4C,EAC5C,WAA4B,EAC5B,OAAoB,EACpB,IAAsC;QAEtC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CACrC,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,UAAU,EAAE;YAClD,UAAU,EAAE;gBACV,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB;SACF,EACD,IAAI,CACL,CAAC;QAEF,MAAM,SAAS,GAAG,kBAAkB,CAAC;QAErC,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAChD,GAAG,IAAI,UAAU,EACjB;YACE,IAAI,EAAE,GAAG,IAAI,UAAU;YACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,cAAc,EAAE,EAAE,IAAI,EAAE,8BAA8B,EAAE;YACxD,KAAK,EAAE,8BAA8B;YACrC,MAAM,EAAE;gBACN,gBAAgB,EAAE,GAAG,IAAI,UAAU;gBACnC,SAAS;gBACT,WAAW,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,kBAAkB,EAAE,IAAI,EAAE;gBACxE,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC3B;gBACD,OAAO,EAAE,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;aAC/C;SACF,EACD,IAAI,CACL,CAAC;QAEF,OAAO,IAAI,aAAa,CACtB,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE;YACnD,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,MAAM,EAAE,gDAAgD;oBACxD,mBAAmB,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,sBAAsB,EAAE;oBAC5D,OAAO,EAAE;wBACP;4BACE,KAAK,EAAE;gCACL,OAAO,EAAE;oCACP,SAAS;oCACT,UAAU,EAAE,SAAS;oCACrB,MAAM,EAAE,EAAE,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;iCAC5E;6BACF;yBACF;qBACF;iBACF;aACF;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CACxD,CAAC;IACJ,CAAC;CACF"}

package/lib/cups/avahiService.d.ts

@@ -5,7 +5,7 @@ export interface AvahiServiceArgs {
     metadata: pulumi.Input<k8s.types.input.meta.v1.ObjectMeta>;
     name: pulumi.Input<string>;
     description?: pulumi.Input<string>;
-    labelName: pulumi.Input<string>;
+    labelNames: pulumi.Input<pulumi.Input<string>[]>;
     hostname: pulumi.Input<string>;
 }
 export declare class AvahiService extends avahi.AvahiService {

package/lib/cups/avahiService.js

@@ -10,7 +10,7 @@ export class AvahiService extends avahi.AvahiService {
     constructor(name, args, opts) {
         super(name, {
             metadata: args.metadata,
-            labelName: args.labelName,
+            labelNames: args.labelNames,
             name: args.name,
             services: [
                 {

package/lib/cups/avahiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"avahiService.js","sourceRoot":"","sources":["../../../lib/cups/avahiService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAU3C,MAAM,OAAO,YAAa,SAAQ,KAAK,CAAC,YAAY;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAsB,EAAE,IAA6B;QAC7E,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,2BAA2B;oBACpC,IAAI,EAAE,GAAG;oBACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE;wBACV,WAAW;wBACX,UAAU;wBACV,eAAe;wBACf,UAAU;wBACV,MAAM,CAAC,WAAW,CAAA,eAAe,IAAI,CAAC,IAAI,EAAE;wBAC5C,MAAM,CAAC,WAAW,CAAA,QAAQ,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;wBACpD,2BAA2B;wBAC3B,iBAAiB;wBACjB,sBAAsB;wBACtB,MAAM;4BACJ;gCACE,0BAA0B;gCAC1B,iBAAiB;gCACjB,wBAAwB;gCACxB,6BAA6B;gCAC7B,WAAW;gCACX,YAAY;gCACZ,WAAW;gCACX,YAAY;gCACZ,WAAW;gCACX,WAAW;gCACX,YAAY;gCACZ,yCAAyC;gCACzC,0BAA0B;6BAC3B,CAAC,IAAI,CAAC,GAAG,CAAC;qBACd;iBACF;aACF;SACF,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"avahiService.js","sourceRoot":"","sources":["../../../lib/cups/avahiService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAU3C,MAAM,OAAO,YAAa,SAAQ,KAAK,CAAC,YAAY;IAClD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAsB,EAAE,IAA6B;QAC7E,KAAK,CACH,IAAI,EACJ;YACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,2BAA2B;oBACpC,IAAI,EAAE,GAAG;oBACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE;wBACV,WAAW;wBACX,UAAU;wBACV,eAAe;wBACf,UAAU;wBACV,MAAM,CAAC,WAAW,CAAA,eAAe,IAAI,CAAC,IAAI,EAAE;wBAC5C,MAAM,CAAC,WAAW,CAAA,QAAQ,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;wBACpD,2BAA2B;wBAC3B,iBAAiB;wBACjB,sBAAsB;wBACtB,MAAM;4BACJ;gCACE,0BAA0B;gCAC1B,iBAAiB;gCACjB,wBAAwB;gCACxB,6BAA6B;gCAC7B,WAAW;gCACX,YAAY;gCACZ,WAAW;gCACX,YAAY;gCACZ,WAAW;gCACX,WAAW;gCACX,YAAY;gCACZ,yCAAyC;gCACzC,0BAA0B;6BAC3B,CAAC,IAAI,CAAC,GAAG,CAAC;qBACd;iBACF;aACF;SACF,EACD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}

package/lib/cups/deployment.d.ts

@@ -8,7 +8,7 @@ export interface CupsArgs {
     namespace?: pulumi.Input<string>;
     hostname: pulumi.Input<string>;
     ingressClassName?: pulumi.Input<string>;
-    avahiLabelName?: pulumi.Input<string>;
+    avahiLabelNames?: pulumi.Input<pulumi.Input<string>[]>;
     storageClassName?: pulumi.Input<string>;
     nodeSelector?: pulumi.Input<{
         [key: string]: pulumi.Input<string>;

package/lib/cups/deployment.js

@@ -115,15 +115,15 @@ export class Cups extends ComponentResource {
                 ],
             },
         }, k8sOpts);
-        if (args.avahiLabelName !== undefined) {
-            this.avahiServices = pulumi.all([args.printers, args.avahiLabelName]).apply(([printers, avahiLabelName]) => {
+        if (args.avahiLabelNames !== undefined) {
+            this.avahiServices = pulumi.all([args.printers, args.avahiLabelNames]).apply(([printers, labelNames]) => {
                 const avahiServices = [];
                 for (const printerName in printers) {
                     // eslint-disable-next-line security/detect-object-injection
                     const printer = printers[printerName];
                     avahiServices.push(new AvahiService(`${name}-${printerName}`, {
                         metadata: { ...metadata, name: `${name}-${printerName}` },
-                        labelName: avahiLabelName,
+                        labelNames,
                         name: printer.name,
                         description: printer.description,
                         hostname: args.hostname,

package/lib/cups/deployment.js.map

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

package/lib/dashy/deployment.d.ts

@@ -0,0 +1,35 @@
+import * as pulumi from "@pulumi/pulumi";
+import { ComponentResource } from "../common/index.js";
+export interface ItemArgs {
+    title: pulumi.Input<string>;
+    description?: pulumi.Input<string>;
+    url: pulumi.Input<string>;
+    icon?: pulumi.Input<string>;
+}
+export interface SectionArgs {
+    name: pulumi.Input<string>;
+    icon?: pulumi.Input<number>;
+    items?: pulumi.Input<pulumi.Input<ItemArgs>[]>;
+}
+export interface DashyArgs {
+    namespace?: pulumi.Input<string>;
+    replicas?: pulumi.Input<number>;
+    hostname: pulumi.Input<string>;
+    ingressClassName?: pulumi.Input<string>;
+    clusterIssuer?: pulumi.Input<string>;
+    title?: pulumi.Input<string>;
+    description?: pulumi.Input<string>;
+    customCss?: pulumi.Input<string>;
+    sections?: pulumi.Input<pulumi.Input<SectionArgs>[]>;
+}
+export declare class Dashy extends ComponentResource {
+    private readonly helmRelease;
+    readonly namespace: pulumi.Output<string>;
+    /**
+     * Create a new Dashy resource.
+     * @param name The name of Dashy resource.
+     * @param args A bag of arguments to control the Dashy creation.
+     * @param opts A bag of options that control this resource's behavior.
+     */
+    constructor(name: string, args: DashyArgs, opts?: pulumi.ComponentResourceOptions);
+}

package/lib/dashy/deployment.js

@@ -0,0 +1,78 @@
+import * as pulumi from "@pulumi/pulumi";
+import * as k8s from "@pulumi/kubernetes";
+import * as yaml from "js-yaml";
+import { ComponentResource } from "../common/index.js";
+import * as kubernetes from "../kubernetes/index.js";
+import { Certificate } from "../certManager/index.js";
+export class Dashy extends ComponentResource {
+    helmRelease;
+    namespace;
+    /**
+     * Create a new Dashy resource.
+     * @param name The name of Dashy resource.
+     * @param args A bag of arguments to control the Dashy creation.
+     * @param opts A bag of options that control this resource's behavior.
+     */
+    constructor(name, args, opts) {
+        super("dashy", name, args, opts);
+        opts = this.opts(k8s.Provider);
+        args.replicas ??= 1;
+        this.namespace = args.namespace
+            ? pulumi.output(args.namespace)
+            : new k8s.core.v1.Namespace(name, { metadata: { name } }, opts).metadata.name;
+        this.helmRelease = new kubernetes.helm.v3.Release(name, {
+            name,
+            namespace: this.namespace,
+            repositoryOpts: { repo: "https://vyrtualsynthese.github.io/selfhosted-helmcharts/" },
+            chart: "dashy",
+            values: {
+                fullnameOverride: name,
+                serviceAccount: { create: false },
+                image: { tag: "latest" },
+                resources: {
+                    requests: { memory: "1536Mi" },
+                    limits: { memory: "2048Mi" },
+                },
+                ingress: {
+                    enabled: true,
+                    className: args.ingressClassName,
+                    annotations: {
+                        "traefik.ingress.kubernetes.io/router.entrypoints": "websecure",
+                        "traefik.ingress.kubernetes.io/router.tls": "true",
+                        "cert-manager.io/cluster-issuer": args.clusterIssuer ?? Certificate.DefaultClusterIssuer,
+                    },
+                    hosts: [{ host: args.hostname, paths: [{ path: "/", pathType: "Prefix" }] }],
+                    tls: [{ secretName: `${name}-tls`, hosts: [args.hostname] }],
+                },
+                static: {
+                    configMapContent: {
+                        conf: pulumi.all([args.sections ?? []]).apply(([sections]) => yaml.dump({
+                            appConfig: {
+                                theme: "one-dark",
+                                layout: "horizontal",
+                                webSearch: { disableWebSearch: true },
+                                hideComponents: { hideSearch: true, hideSettings: true, hideFooter: true },
+                                customCss: args.customCss,
+                            },
+                            pageInfo: {
+                                title: args.title ?? "Dashy",
+                                description: args.description ?? "",
+                                navLinks: [],
+                            },
+                            sections: sections.map((section) => {
+                                return {
+                                    ...section,
+                                    items: (section.items ?? []).map((item) => {
+                                        return { target: "sametab", ...item };
+                                    }),
+                                };
+                            }),
+                        })),
+                    },
+                },
+            },
+        }, opts);
+        this.registerOutputs();
+    }
+}
+//# sourceMappingURL=deployment.js.map

package/lib/dashy/deployment.js.map

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

package/lib/dashy/index.d.ts

@@ -0,0 +1,2 @@
+import { DashyArgs, Dashy } from "./deployment.js";
+export { DashyArgs, Dashy };

package/lib/dashy/index.js

@@ -0,0 +1,3 @@
+import { Dashy } from "./deployment.js";
+export { Dashy };
+//# sourceMappingURL=index.js.map

package/lib/dashy/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/dashy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAa,KAAK,EAAE,CAAC"}

package/lib/dhcpd/deployment.d.ts

@@ -1,12 +1,12 @@
 import * as pulumi from "@pulumi/pulumi";
 import { ComponentResource } from "../common/index.js";
 export interface Subnet {
-    subnet: string;
-    nameservers: string[];
-    start: string;
-    end: string;
-    netmask: string;
-    router: string;
+    interface: pulumi.Input<string>;
+    cidr: pulumi.Input<string>;
+    start: pulumi.Input<string>;
+    end: pulumi.Input<string>;
+    router: pulumi.Input<string>;
+    nameservers: pulumi.Input<pulumi.Input<string>[]>;
 }
 export interface DhcpdArgs {
     namespace?: pulumi.Input<string>;