@kapeta/local-cluster-service 0.32.1 → 0.33.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.33.0](https://github.com/kapetacom/local-cluster-service/compare/v0.32.2...v0.33.0) (2023-12-30)
+
+
+### Features
+
+* Bump codegen to use improved merge capabilities ([2be1b8e](https://github.com/kapetacom/local-cluster-service/commit/2be1b8e94c36d83eff28023c4d8afe7c2e71b575))
+
+## [0.32.2](https://github.com/kapetacom/local-cluster-service/compare/v0.32.1...v0.32.2) (2023-12-25)
+
+
+### Bug Fixes
+
+* Use volumes instead of host mounts for faster speeds ([#108](https://github.com/kapetacom/local-cluster-service/issues/108)) ([eac48ea](https://github.com/kapetacom/local-cluster-service/commit/eac48ea767dfc8773a7d0990106fe1f3f29bfec4))
+
 ## [0.32.1](https://github.com/kapetacom/local-cluster-service/compare/v0.32.0...v0.32.1) (2023-12-23)
 
 

package/dist/cjs/src/containerManager.d.ts

@@ -22,6 +22,7 @@ export interface DockerMounts {
     Type: string;
     ReadOnly: boolean;
     Consistency: string;
+    Labels?: StringMap;
 }
 export type DockerContainerStatus = 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
 export type DockerContainerHealth = 'starting' | 'healthy' | 'unhealthy' | 'none';
@@ -48,6 +49,7 @@ declare class ContainerManager {
     isAlive(): boolean;
     getMountPoint(systemId: string, ref: string, mountName: string): string;
     createMounts(systemId: string, kind: string, mountOpts: StringMap | null | undefined): Promise<StringMap>;
+    createVolumes(systemId: string, kind: string, mountOpts: StringMap | null | undefined): Promise<DockerMounts[]>;
     ping(): Promise<void>;
     docker(): Docker;
     getContainerByName(containerName: string): Promise<ContainerInfo | undefined>;

package/dist/cjs/src/containerManager.js

@@ -165,6 +165,27 @@ class ContainerManager {
         }
         return mounts;
     }
+    async createVolumes(systemId, kind, mountOpts) {
+        const Mounts = [];
+        if (mountOpts) {
+            const mountOptList = Object.entries(mountOpts);
+            for (const [mountName, containerPath] of mountOptList) {
+                const volumeName = `${systemId}_${kind}_${mountName}`.replace(/[^a-z0-9]/gi, '_');
+                Mounts.push({
+                    Target: containerPath,
+                    Source: volumeName,
+                    Type: 'volume',
+                    ReadOnly: false,
+                    Consistency: 'consistent',
+                    Labels: {
+                        [exports.COMPOSE_LABEL_PROJECT]: systemId.replace(/[^a-z0-9]/gi, '_'),
+                        [exports.COMPOSE_LABEL_SERVICE]: kind.replace(/[^a-z0-9]/gi, '_'),
+                    },
+                });
+            }
+        }
+        return Mounts;
+    }
     async ping() {
         try {
             const pingResult = await this.docker().ping();

package/dist/cjs/src/operatorManager.js

@@ -146,7 +146,6 @@ class OperatorManager {
                     hostPort,
                 };
             }
-            const mounts = await containerManager_1.containerManager.createMounts(systemId, resourceType, operatorData.mounts);
             const nameParts = [systemId, resourceType.toLowerCase(), version];
             const containerName = `kapeta-resource-${(0, md5_1.default)(nameParts.join('_'))}`;
             const PortBindings = {};
@@ -170,7 +169,7 @@ class OperatorManager {
                 ];
                 Labels[containerManager_1.CONTAINER_LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;
             });
-            const Mounts = containerManager_1.containerManager.toDockerMounts(mounts);
+            const Mounts = await containerManager_1.containerManager.createVolumes(systemId, resourceType, operatorData.mounts);
             lodash_1.default.forEach(operatorData.env, (value, name) => {
                 Env.push(name + '=' + value);
             });

package/dist/esm/src/containerManager.d.ts

@@ -22,6 +22,7 @@ export interface DockerMounts {
     Type: string;
     ReadOnly: boolean;
     Consistency: string;
+    Labels?: StringMap;
 }
 export type DockerContainerStatus = 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
 export type DockerContainerHealth = 'starting' | 'healthy' | 'unhealthy' | 'none';
@@ -48,6 +49,7 @@ declare class ContainerManager {
     isAlive(): boolean;
     getMountPoint(systemId: string, ref: string, mountName: string): string;
     createMounts(systemId: string, kind: string, mountOpts: StringMap | null | undefined): Promise<StringMap>;
+    createVolumes(systemId: string, kind: string, mountOpts: StringMap | null | undefined): Promise<DockerMounts[]>;
     ping(): Promise<void>;
     docker(): Docker;
     getContainerByName(containerName: string): Promise<ContainerInfo | undefined>;

package/dist/esm/src/containerManager.js

@@ -165,6 +165,27 @@ class ContainerManager {
         }
         return mounts;
     }
+    async createVolumes(systemId, kind, mountOpts) {
+        const Mounts = [];
+        if (mountOpts) {
+            const mountOptList = Object.entries(mountOpts);
+            for (const [mountName, containerPath] of mountOptList) {
+                const volumeName = `${systemId}_${kind}_${mountName}`.replace(/[^a-z0-9]/gi, '_');
+                Mounts.push({
+                    Target: containerPath,
+                    Source: volumeName,
+                    Type: 'volume',
+                    ReadOnly: false,
+                    Consistency: 'consistent',
+                    Labels: {
+                        [exports.COMPOSE_LABEL_PROJECT]: systemId.replace(/[^a-z0-9]/gi, '_'),
+                        [exports.COMPOSE_LABEL_SERVICE]: kind.replace(/[^a-z0-9]/gi, '_'),
+                    },
+                });
+            }
+        }
+        return Mounts;
+    }
     async ping() {
         try {
             const pingResult = await this.docker().ping();

package/dist/esm/src/operatorManager.js

@@ -146,7 +146,6 @@ class OperatorManager {
                     hostPort,
                 };
             }
-            const mounts = await containerManager_1.containerManager.createMounts(systemId, resourceType, operatorData.mounts);
             const nameParts = [systemId, resourceType.toLowerCase(), version];
             const containerName = `kapeta-resource-${(0, md5_1.default)(nameParts.join('_'))}`;
             const PortBindings = {};
@@ -170,7 +169,7 @@ class OperatorManager {
                 ];
                 Labels[containerManager_1.CONTAINER_LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;
             });
-            const Mounts = containerManager_1.containerManager.toDockerMounts(mounts);
+            const Mounts = await containerManager_1.containerManager.createVolumes(systemId, resourceType, operatorData.mounts);
             lodash_1.default.forEach(operatorData.env, (value, name) => {
                 Env.push(name + '=' + value);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.32.1",
+    "version": "0.33.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/containerManager.ts

@@ -37,6 +37,7 @@ export interface DockerMounts {
     Type: string;
     ReadOnly: boolean;
     Consistency: string;
+    Labels?: StringMap;
 }
 
 interface JSONProgress {
@@ -249,6 +250,35 @@ class ContainerManager {
         return mounts;
     }
 
+    async createVolumes(
+        systemId: string,
+        kind: string,
+        mountOpts: StringMap | null | undefined
+    ): Promise<DockerMounts[]> {
+        const Mounts: DockerMounts[] = [];
+
+        if (mountOpts) {
+            const mountOptList = Object.entries(mountOpts);
+            for (const [mountName, containerPath] of mountOptList) {
+                const volumeName = `${systemId}_${kind}_${mountName}`.replace(/[^a-z0-9]/gi, '_');
+
+                Mounts.push({
+                    Target: containerPath,
+                    Source: volumeName,
+                    Type: 'volume',
+                    ReadOnly: false,
+                    Consistency: 'consistent',
+                    Labels: {
+                        [COMPOSE_LABEL_PROJECT]: systemId.replace(/[^a-z0-9]/gi, '_'),
+                        [COMPOSE_LABEL_SERVICE]: kind.replace(/[^a-z0-9]/gi, '_'),
+                    },
+                });
+            }
+        }
+
+        return Mounts;
+    }
+
     async ping() {
         try {
             const pingResult = await this.docker().ping();

package/src/operatorManager.ts

@@ -201,8 +201,6 @@ class OperatorManager {
                 };
             }
 
-            const mounts = await containerManager.createMounts(systemId, resourceType, operatorData.mounts);
-
             const nameParts = [systemId, resourceType.toLowerCase(), version];
 
             const containerName = `kapeta-resource-${md5(nameParts.join('_'))}`;
@@ -236,7 +234,7 @@ class OperatorManager {
                 Labels[CONTAINER_LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;
             });
 
-            const Mounts = containerManager.toDockerMounts(mounts);
+            const Mounts = await containerManager.createVolumes(systemId, resourceType, operatorData.mounts);
 
             _.forEach(operatorData.env, (value, name) => {
                 Env.push(name + '=' + value);