@ydkn/pulumi-components 0.7.15 → 0.8.0

package/lib/unifi/{controller.d.ts → networkServer.d.ts}

@@ -1,6 +1,6 @@
 import * as pulumi from "@pulumi/pulumi";
 import { ComponentResource } from "../common/index.js";
-export interface UnifiControllerArgs {
+export interface NetworkServerArgs {
     namespace?: pulumi.Input<string>;
     ingressClassName?: pulumi.Input<string>;
     hostname: pulumi.Input<string>;
@@ -8,10 +8,21 @@ export interface UnifiControllerArgs {
     storageClassName?: pulumi.Input<string>;
     storage?: pulumi.Input<string>;
     serviceType?: pulumi.Input<string>;
+    serviceLabels?: pulumi.Input<{
+        [key: string]: pulumi.Input<string>;
+    }>;
     serviceLoadBalancerClass?: pulumi.Input<string>;
     protect?: boolean;
 }
-export declare class UnifiController extends ComponentResource {
+export declare class NetworkServer extends ComponentResource {
+    private readonly mongodbInitUsername;
+    private readonly mongodbInitPassword;
+    private readonly mongodbUsername;
+    private readonly mongodbPassword;
+    private readonly mongodbAuthSource;
+    private readonly mongodbDatabase;
+    private readonly mongodb;
+    private readonly mongodbInitConfigMap;
     private readonly volumeClaim;
     private readonly deployment;
     private readonly podDisruptionBudget;
@@ -20,10 +31,10 @@ export declare class UnifiController extends ComponentResource {
     readonly namespace: pulumi.Output<string>;
     readonly informUrl: pulumi.Output<string>;
     /**
-     * Create a new UniFi controller resource.
-     * @param name The name of the UniFi controller resource.
-     * @param args A bag of arguments to control the UniFi controller creation.
+     * Create a new UniFi network server resource.
+     * @param name The name of the UniFi network server resource.
+     * @param args A bag of arguments to control the UniFi network server creation.
      * @param opts A bag of options that control this resource's behavior.
      */
-    constructor(name: string, args: UnifiControllerArgs, opts?: pulumi.ComponentResourceOptions);
+    constructor(name: string, args: NetworkServerArgs, opts?: pulumi.ComponentResourceOptions);
 }

package/lib/unifi/{controller.js → networkServer.js}

@@ -1,9 +1,20 @@
 import * as pulumi from "@pulumi/pulumi";
+import * as random from "@pulumi/random";
 import * as k8s from "@pulumi/kubernetes";
+import * as path from "path";
+import * as fs from "fs";
+import * as url from "url";
 import { ComponentResource } from "../common/index.js";
 import * as kubernetes from "../kubernetes/index.js";
-import * as traefik from "../traefik/index.js";
-export class UnifiController extends ComponentResource {
+export class NetworkServer extends ComponentResource {
+    mongodbInitUsername;
+    mongodbInitPassword;
+    mongodbUsername;
+    mongodbPassword;
+    mongodbAuthSource;
+    mongodbDatabase;
+    mongodb;
+    mongodbInitConfigMap;
     volumeClaim;
     deployment;
     podDisruptionBudget;
@@ -12,30 +23,54 @@ export class UnifiController extends ComponentResource {
     namespace;
     informUrl;
     /**
-     * Create a new UniFi controller resource.
-     * @param name The name of the UniFi controller resource.
-     * @param args A bag of arguments to control the UniFi controller creation.
+     * Create a new UniFi network server resource.
+     * @param name The name of the UniFi network server resource.
+     * @param args A bag of arguments to control the UniFi network server creation.
      * @param opts A bag of options that control this resource's behavior.
      */
     constructor(name, args, opts) {
-        super("unifi:controller", name, args, opts);
-        opts = this.opts(k8s.Provider);
+        super("unifi:network-server", name, args, opts);
+        const k8sOpts = this.opts(k8s.Provider);
+        opts = this.opts();
         if (args.storage === undefined) {
             args.storage = "10Gi";
         }
+        this.mongodbInitUsername = pulumi.output("root");
+        this.mongodbInitPassword = new random.RandomPassword(`${name}-mongodb-admin-password`, { length: 24, special: false }, opts).result;
+        this.mongodbUsername = pulumi.output("unifi");
+        this.mongodbPassword = new random.RandomPassword(`${name}-mongodb-password`, { length: 24, special: false }, opts).result;
+        this.mongodbAuthSource = pulumi.output("admin");
+        this.mongodbDatabase = pulumi.output("unifi");
         this.namespace = args.namespace
             ? pulumi.output(args.namespace)
-            : new k8s.core.v1.Namespace(name, { metadata: { name } }, opts).metadata.name;
+            : new k8s.core.v1.Namespace(name, { metadata: { name } }, k8sOpts).metadata.name;
         const metadata = {
-            name: pulumi.interpolate `${name}-controller`,
+            name: `${name}-network-server`,
             namespace: this.namespace,
             labels: {
                 "app.kubernetes.io/name": "unifi",
-                "app.kubernetes.io/component": "controller",
+                "app.kubernetes.io/component": "network-server",
                 "app.kubernetes.io/instance": name,
             },
         };
-        const volumeClaimName = `${name}-controller-data`;
+        this.mongodb = new kubernetes.v1.Secret(`${name}-mongodb`, {
+            metadata: { ...metadata, name: `${metadata.name}-mongodb` },
+            stringData: {
+                INITDB_ROOT_USERNAME: this.mongodbInitUsername,
+                INITDB_ROOT_PASSWORD: this.mongodbInitPassword,
+                USERNAME: this.mongodbUsername,
+                PASSWORD: this.mongodbPassword,
+                DBNAME: this.mongodbDatabase,
+                AUTHSOURCE: this.mongodbAuthSource,
+            },
+        }, k8sOpts);
+        this.mongodbInitConfigMap = new k8s.core.v1.ConfigMap(`${name}-mongodb-init`, {
+            metadata: { ...metadata, name: `${metadata.name}-mongodb-init` },
+            data: {
+                "init-mongo.sh": fs.readFileSync(path.join(path.dirname(url.fileURLToPath(import.meta.url)), "assets", "init-mongo.sh"), "utf-8"),
+            },
+        }, k8sOpts);
+        const volumeClaimName = `${name}-network-server-data`;
         this.volumeClaim = new k8s.core.v1.PersistentVolumeClaim(name, {
             metadata: { ...metadata, name: volumeClaimName },
             spec: {
@@ -43,7 +78,7 @@ export class UnifiController extends ComponentResource {
                 storageClassName: args.storageClassName,
                 resources: { requests: { storage: args.storage } },
             },
-        }, { ...opts, protect: args.protect });
+        }, { ...k8sOpts, protect: args.protect });
         this.deployment = new k8s.apps.v1.Deployment(name, {
             metadata,
             spec: {
@@ -56,20 +91,43 @@ export class UnifiController extends ComponentResource {
                         annotations: {
                             "backup.velero.io/backup-volumes": "backup",
                             "pre.hook.backup.velero.io/command": '["/bin/sh", "-c", "rm -rf /backup/* && cp -rp /config/data/backup/* /backup/"]',
-                            "pre.hook.backup.velero.io/container": "controller",
+                            "pre.hook.backup.velero.io/container": "network-server",
                             "pre.hook.backup.velero.io/timeout": "5m",
                         },
                     },
                     spec: {
                         containers: [
                             {
-                                name: "controller",
-                                image: "ghcr.io/linuxserver/unifi-controller:latest",
+                                name: "network-server",
+                                image: "lscr.io/linuxserver/unifi-network-application:latest",
                                 imagePullPolicy: "Always",
                                 securityContext: { runAsNonRoot: false },
-                                env: [{ name: "MEM_LIMIT", value: "896" }],
+                                env: [
+                                    { name: "MEM_LIMIT", value: "640" },
+                                    { name: "MEM_STARTUP", value: "640" },
+                                    { name: "MONGO_HOST", value: "localhost" },
+                                    { name: "MONGO_PORT", value: "27017" },
+                                    { name: "MONGO_TLS", value: "false" },
+                                    {
+                                        name: "MONGO_USER",
+                                        valueFrom: { secretKeyRef: { name: this.mongodb.metadata.name, key: "USERNAME" } },
+                                    },
+                                    {
+                                        name: "MONGO_PASS",
+                                        valueFrom: { secretKeyRef: { name: this.mongodb.metadata.name, key: "PASSWORD" } },
+                                    },
+                                    {
+                                        name: "MONGO_DBNAME",
+                                        valueFrom: { secretKeyRef: { name: this.mongodb.metadata.name, key: "DBNAME" } },
+                                    },
+                                    {
+                                        name: "MONGO_AUTHSOURCE",
+                                        valueFrom: { secretKeyRef: { name: this.mongodb.metadata.name, key: "AUTHSOURCE" } },
+                                    },
+                                ],
                                 ports: [
                                     { protocol: "UDP", containerPort: 3478, name: "p3478" },
+                                    { protocol: "UDP", containerPort: 5514, name: "p5514" },
                                     { protocol: "UDP", containerPort: 10001, name: "p10001" },
                                     { protocol: "TCP", containerPort: 8080, name: "p8080" },
                                     { protocol: "TCP", containerPort: 8081, name: "p8081" },
@@ -91,16 +149,36 @@ export class UnifiController extends ComponentResource {
                                     failureThreshold: 3,
                                 },
                                 volumeMounts: [
-                                    { name: "data", mountPath: "/config/data" },
+                                    { name: "data", mountPath: "/config/data", subPath: "unifi" },
                                     { name: "backup", mountPath: "/backup" },
                                 ],
                                 resources: {
-                                    requests: { memory: "1024Mi" },
-                                    limits: { memory: "1536Mi" },
+                                    requests: { memory: "768Mi" },
+                                    limits: { memory: "1024Mi" },
+                                },
+                            },
+                            {
+                                name: "mongodb",
+                                image: "docker.io/mongo:7.0",
+                                imagePullPolicy: "Always",
+                                envFrom: [{ secretRef: { name: this.mongodb.metadata.name }, prefix: "MONGO_" }],
+                                volumeMounts: [
+                                    {
+                                        name: "mongo-init",
+                                        mountPath: "/docker-entrypoint-initdb.d/init-mongo.sh",
+                                        subPath: "init-mongo.sh",
+                                        readOnly: true,
+                                    },
+                                    { name: "data", mountPath: "/data/db", subPath: "mongodb" },
+                                ],
+                                resources: {
+                                    requests: { memory: "256Mi" },
+                                    limits: { memory: "384Mi" },
                                 },
                             },
                         ],
                         volumes: [
+                            { name: "mongo-init", configMap: { name: this.mongodbInitConfigMap.metadata.name } },
                             { name: "data", persistentVolumeClaim: { claimName: volumeClaimName } },
                             { name: "backup", emptyDir: {} },
                         ],
@@ -138,23 +216,29 @@ export class UnifiController extends ComponentResource {
                     },
                 },
             },
-        }, opts);
+        }, k8sOpts);
         this.podDisruptionBudget = new k8s.policy.v1.PodDisruptionBudget(name, {
             metadata,
             spec: {
                 minAvailable: 1,
                 selector: { matchLabels: metadata.labels },
             },
-        }, opts);
+        }, k8sOpts);
         this.service = new kubernetes.v1.Service(name, {
             hostnames: [args.informHostname],
-            metadata,
+            metadata: {
+                ...metadata,
+                labels: pulumi.all([args.serviceLabels]).apply(([labels]) => {
+                    return { ...metadata.labels, ...labels };
+                }),
+            },
             spec: {
                 loadBalancerClass: args.serviceLoadBalancerClass,
                 type: args.serviceType ?? "ClusterIP",
                 selector: metadata.labels,
                 ports: [
                     { protocol: "UDP", port: 3478, name: "p3478" },
+                    { protocol: "UDP", port: 5514, name: "p5514" },
                     { protocol: "TCP", port: 6789, name: "p6789" },
                     { protocol: "TCP", port: 8080, name: "p8080" },
                     { protocol: "TCP", port: 8081, name: "p8081" },
@@ -164,8 +248,8 @@ export class UnifiController extends ComponentResource {
                     { protocol: "UDP", port: 10001, name: "p10001" },
                 ],
             },
-        }, { ...opts, dependsOn: [this.deployment] });
-        this.ingress = new traefik.SecureIngress(name, {
+        }, { ...k8sOpts, dependsOn: [this.deployment] });
+        this.ingress = new kubernetes.v1.SecureIngress(name, {
             metadata,
             spec: {
                 ingressClassName: args.ingressClassName,
@@ -184,9 +268,9 @@ export class UnifiController extends ComponentResource {
                     },
                 ],
             },
-        }, opts);
+        }, k8sOpts);
         this.informUrl = pulumi.concat("http://", args.informHostname, ":8080", "/inform");
         this.registerOutputs();
     }
 }
-//# sourceMappingURL=controller.js.map
+//# sourceMappingURL=networkServer.js.map

package/lib/unifi/networkServer.js.map

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

package/lib/wireguard/deployment.js

@@ -59,7 +59,7 @@ export class Wireguard extends ComponentResource {
                     conf.push(`PresharedKey = ${peer.presharedKey}`);
                 }
                 if (peer.endpoint !== undefined) {
-                    const endpoint = (/:\d{1,5}$/.exec(peer.endpoint))
+                    const endpoint = /:\d{1,5}$/.exec(peer.endpoint)
                         ? peer.endpoint
                         : `${peer.endpoint}:${Wireguard.defaultInterfacePort}`;
                     conf.push(`Endpoint = ${endpoint}`);
@@ -90,7 +90,14 @@ export class Wireguard extends ComponentResource {
                                 imagePullPolicy: "Always",
                                 securityContext: { privileged: true, capabilities: { add: ["NET_ADMIN"] } },
                                 volumeMounts: [{ name: "conf", mountPath: "/etc/wireguard", readOnly: true }],
-                                ports: [{ name: "wireguard", containerPort: this.interfacePort, protocol: "UDP" }],
+                                ports: [
+                                    {
+                                        name: "wireguard",
+                                        protocol: "UDP",
+                                        containerPort: this.interfacePort,
+                                        hostPort: this.interfacePort,
+                                    },
+                                ],
                                 resources: {
                                     requests: { memory: "8Mi" },
                                     limits: { memory: "12Mi" },

package/lib/wireguard/deployment.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ydkn/pulumi-components",
-  "version": "0.7.15",
+  "version": "0.8.0",
   "keywords": [
     "pulumi"
   ],
@@ -14,34 +14,34 @@
   },
   "type": "module",
   "devDependencies": {
-    "@eslint/js": "^9.11.1",
+    "@eslint/js": "^9.13.0",
     "@types/bcrypt": "^5.0.2",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.7.2",
+    "@types/node": "^22.7.7",
     "@types/ssh2": "^1.15.1",
     "@types/ssh2-sftp-client": "^9.0.4",
     "bcrypt": "^5.1.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^9.11.1",
+    "eslint": "^9.13.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-promise": "^7.1.0",
     "eslint-plugin-security": "^3.0.1",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
-    "typescript": "^5.6.2",
-    "typescript-eslint": "^8.7.0"
+    "typescript": "^5.6.3",
+    "typescript-eslint": "^8.10.0"
   },
   "dependencies": {
-    "@pulumi/aws": "^6.52.0",
-    "@pulumi/cloudflare": "^5.39.1",
+    "@pulumi/aws": "^6.56.1",
+    "@pulumi/cloudflare": "^5.41.0",
     "@pulumi/command": "^1.0.1",
-    "@pulumi/gitlab": "^8.4.1",
-    "@pulumi/hcloud": "^1.20.4",
-    "@pulumi/kubernetes": "^4.18.1",
-    "@pulumi/mailgun": "^3.5.5",
-    "@pulumi/pulumi": "^3.134.1",
-    "@pulumi/random": "^4.16.6",
-    "@pulumi/tls": "^5.0.7",
+    "@pulumi/gitlab": "^8.5.0",
+    "@pulumi/hcloud": "^1.20.5",
+    "@pulumi/kubernetes": "^4.18.2",
+    "@pulumi/mailgun": "^3.5.6",
+    "@pulumi/pulumi": "^3.137.0",
+    "@pulumi/random": "^4.16.7",
+    "@pulumi/tls": "^5.0.9",
     "@ydkn/pulumi-k0s": "^0.2.1",
     "glob": "^11.0.0",
     "js-yaml": "^4.1.0",
@@ -49,7 +49,7 @@
     "ssh2": "^1.16.0",
     "ssh2-sftp-client": "^11.0.0",
     "template-file": "^6.0.1",
-    "urllib": "^4.3.1"
+    "urllib": "^4.4.0"
   },
   "scripts": {
     "clean": "rimraf dist",

package/lib/traefik/secureIngress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"secureIngress.js","sourceRoot":"","sources":["../../../lib/traefik/secureIngress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAS1C,MAAM,OAAO,aAAc,SAAQ,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO;IAClD,MAAM,CAAU,oBAAoB,GAAG,aAAa,CAAC;IAE7D;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAuB,EAAE,IAAmC;QACpF,MAAM,WAAW,GAAG,MAAM;aACvB,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;aAChE,KAAK,CAAC,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE;YAC/D,MAAM,QAAQ,GAAG,eAAqD,CAAC;YACvE,MAAM,IAAI,GAAG,WAAwD,CAAC;YAEtE,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACvC,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC;YAC5B,CAAC;YAED,MAAM,WAAW,GAAyC;gBACxD,kDAAkD,EAAE,WAAW;gBAC/D,0CAA0C,EAAE,MAAM;aACnD,CAAC;YAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,WAAW,CAAC,wBAAwB,CAAC,GAAG,MAAM,CAAC;YACjD,CAAC;iBAAM,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBACvC,WAAW,CAAC,gCAAgC,CAAC,GAAG,aAAa,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,gCAAgC,CAAC,GAAG,aAAa,CAAC,oBAAoB,CAAC;YACrF,CAAC;YAED,QAAQ,CAAC,WAAW,GAAG,MAAM;iBAC1B,GAAG,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;iBACxC,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAAE,EAAE;gBAC5C,OAAO,EAAE,GAAG,WAAW,EAAE,GAAG,mBAAmB,EAAE,CAAC;YACpD,CAAC,CAAC,CAAC;YAEL,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,GAAG,GAAG,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YACvG,CAAC;YAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEL,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,KAA+E;QAClG,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAQ,KAAqD;aAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO,CAAC,CAAC,IAAI,CAAC;QAChB,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,OAAO,CAAC,KAAK,SAAS,CAAC;QACzB,CAAC,CAAa,CAAC;IACnB,CAAC"}

package/lib/unifi/controller.js.map

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