underpost 2.8.794 → 2.8.795

package/README.md

@@ -68,7 +68,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.794
+## underpost ci/cd cli v2.8.795
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -797,6 +797,13 @@ try {
           .replaceAll(`engine.version: '${version}'`, `engine.version: '${newVersion}'`),
         'utf8',
       );
+      fs.writeFileSync(
+        `./manifests/deployment/dd-template-development/deployment.yaml`,
+        fs
+          .readFileSync(`./manifests/deployment/dd-template-development/deployment.yaml`, 'utf8')
+          .replaceAll(`underpost:v${version}`, `underpost:v${newVersion}`),
+        'utf8',
+      );
 
       if (fs.existsSync(`./.github/workflows/docker-image.yml`))
         fs.writeFileSync(
@@ -921,6 +928,16 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         };
         DefaultConf.server[host][path].apiBaseProxyPath = '/';
         DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
+      } else if (confName === 'template') {
+        const host = 'default.net';
+        const path = '/';
+        DefaultConf.server[host][path].valkey = {
+          port: 6379,
+          host: 'valkey-service.default.svc.cluster.local',
+        };
+        // mongodb-0.mongodb-service
+        DefaultConf.server[host][path].db.host = 'mongodb://mongodb-service:27017';
+        confName = '';
       } else if (confName) {
         DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
         DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
@@ -2223,7 +2240,7 @@ EOF`);
         const args = [
           `node bin dockerfile-image-build --path ${path}/backend/`,
           `--image-name=${imageName} --image-path=${path}`,
-          `--podman-save --${process.argv.includes('kubeadm') ? 'kubeadm' : 'kind'}-load --no-cache`,
+          `--podman-save --${process.argv.includes('kubeadm') ? 'kubeadm' : 'kind'}-load --reset`,
         ];
         shellExec(args.join(' '));
       }
@@ -2235,7 +2252,7 @@ EOF`);
         const args = [
           `node bin dockerfile-image-build --path ${path}/frontend/`,
           `--image-name=${imageName} --image-path=${path}`,
-          `--podman-save --${process.argv.includes('kubeadm') ? 'kubeadm' : 'kind'}-load --no-cache`,
+          `--podman-save --${process.argv.includes('kubeadm') ? 'kubeadm' : 'kind'}-load --reset`,
         ];
         shellExec(args.join(' '));
       }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.794
+## underpost ci/cd cli v2.8.795
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -298,7 +298,7 @@ Options:
   --kubeadm-load                       Import tar image to Kubeadm cluster
   --secrets                            Dockerfile env secrets
   --secrets-path [secrets-path]        Dockerfile custom path env secrets
-  --no-cache                           Build without using cache
+  --reset                              Build without using cache
   -h, --help                           display help for command
  
 ```

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.794'
+      engine.version: '2.8.795'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -0,0 +1,167 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dd-template-development-blue
+  labels:
+    app: dd-template-development-blue
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dd-template-development-blue
+  template:
+    metadata:
+      labels:
+        app: dd-template-development-blue
+    spec:
+      containers:
+        - name: dd-template-development-blue
+          image: localhost/debian-underpost:v2.8.795
+          #          resources:
+          #            requests:
+          #              memory: "124Ki"
+          #              cpu: "100m"
+          #            limits:
+          #              memory: "1992Ki"
+          #              cpu: "1600m"
+          command:
+            - /bin/sh
+            - -c
+            - >
+              npm install -g npm@11.2.0 &&
+              npm install -g underpost &&
+              cd $(underpost root)/underpost &&
+              node bin/deploy update-default-conf template &&
+              mkdir -p /home/dd &&
+              cd /home/dd &&
+              underpost new engine
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dd-template-development-blue-service
+spec:
+  selector:
+    app: dd-template-development-blue
+  ports:
+    - name: "tcp-4001"
+      protocol: TCP
+      port: 4001
+      targetPort: 4001
+    - name: "udp-4001"
+      protocol: UDP
+      port: 4001
+      targetPort: 4001
+
+    - name: "tcp-4002"
+      protocol: TCP
+      port: 4002
+      targetPort: 4002
+    - name: "udp-4002"
+      protocol: UDP
+      port: 4002
+      targetPort: 4002
+
+    - name: "tcp-4003"
+      protocol: TCP
+      port: 4003
+      targetPort: 4003
+    - name: "udp-4003"
+      protocol: UDP
+      port: 4003
+      targetPort: 4003
+
+    - name: "tcp-4004"
+      protocol: TCP
+      port: 4004
+      targetPort: 4004
+    - name: "udp-4004"
+      protocol: UDP
+      port: 4004
+      targetPort: 4004
+  type: LoadBalancer
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dd-template-development-green
+  labels:
+    app: dd-template-development-green
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dd-template-development-green
+  template:
+    metadata:
+      labels:
+        app: dd-template-development-green
+    spec:
+      containers:
+        - name: dd-template-development-green
+          image: localhost/debian-underpost:v2.8.795
+          #          resources:
+          #            requests:
+          #              memory: "124Ki"
+          #              cpu: "100m"
+          #            limits:
+          #              memory: "1992Ki"
+          #              cpu: "1600m"
+          command:
+            - /bin/sh
+            - -c
+            - >
+              npm install -g npm@11.2.0 &&
+              npm install -g underpost &&
+              cd $(underpost root)/underpost &&
+              node bin/deploy update-default-conf template &&
+              mkdir -p /home/dd &&
+              cd /home/dd &&
+              underpost new engine
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dd-template-development-green-service
+spec:
+  selector:
+    app: dd-template-development-green
+  ports:
+    - name: "tcp-4001"
+      protocol: TCP
+      port: 4001
+      targetPort: 4001
+    - name: "udp-4001"
+      protocol: UDP
+      port: 4001
+      targetPort: 4001
+
+    - name: "tcp-4002"
+      protocol: TCP
+      port: 4002
+      targetPort: 4002
+    - name: "udp-4002"
+      protocol: UDP
+      port: 4002
+      targetPort: 4002
+
+    - name: "tcp-4003"
+      protocol: TCP
+      port: 4003
+      targetPort: 4003
+    - name: "udp-4003"
+      protocol: UDP
+      port: 4003
+      targetPort: 4003
+
+    - name: "tcp-4004"
+      protocol: TCP
+      port: 4004
+      targetPort: 4004
+    - name: "udp-4004"
+      protocol: UDP
+      port: 4004
+      targetPort: 4004
+  type: LoadBalancer

package/manifests/deployment/dd-template-development/proxy.yaml

@@ -0,0 +1,46 @@
+# "http://default.net:4001/socket.io": "http://localhost:4001/socket.io",
+# "http://default.net:4002/peer": "http://localhost:4002/peer",
+# "http://default.net:4001/": "http://localhost:4001/",
+# "http://www.default.net:4003/": "http://localhost:4003/"
+
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: default.net
+spec:
+  virtualhost:
+    fqdn: default.net
+  routes:
+    - conditions:
+        - prefix: /
+      enableWebsockets: true
+      services:
+        - name: dd-template-development-blue-service
+          port: 4001
+          weight: 100
+
+    - conditions:
+        - prefix: /peer
+      enableWebsockets: true
+      services:
+        - name: dd-template-development-blue-service
+          port: 4002
+          weight: 100
+
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: www.default.net
+spec:
+  virtualhost:
+    fqdn: www.default.net
+  routes:
+    - conditions:
+        - prefix: /
+      enableWebsockets: true
+      services:
+        - name: dd-template-development-blue-service
+          port: 4003
+          weight: 100

package/manifests/valkey/service.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: service-valkey
+  name: valkey-service
   namespace: default
 spec:
   selector:
-    app: service-valkey
+    app: valkey-service
   ports:
     - port: 6379
       targetPort: 6379

package/manifests/valkey/statefulset.yaml

@@ -1,22 +1,22 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: service-valkey
+  name: valkey-service
   namespace: default
 spec:
-  serviceName: service-valkey
+  serviceName: valkey-service
   replicas: 1
   selector:
     matchLabels:
-      app: service-valkey
+      app: valkey-service
   template:
     metadata:
       labels:
-        app: service-valkey
+        app: valkey-service
     spec:
       automountServiceAccountToken: false
       containers:
-        - name: service-valkey
+        - name: valkey-service
           image: docker.io/valkey/valkey:latest
           imagePullPolicy: IfNotPresent
           command: ["valkey-server"]

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.794",
+    "version": "2.8.795",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/cluster.js

@@ -172,7 +172,7 @@ class UnderpostCluster {
               } valkey/valkey:latest`,
             );
         }
-        shellExec(`kubectl delete statefulset service-valkey`);
+        shellExec(`kubectl delete statefulset valkey-service`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/valkey`);
       }
       if (options.full === true || options.mariadb === true) {

package/src/cli/deploy.js

@@ -256,8 +256,8 @@ kubectl rollout restart deployment/deployment-name
 kubectl rollout undo deployment/deployment-name
 kubectl scale statefulsets <stateful-set-name> --replicas=<new-replicas>
 kubectl get pods -w
-kubectl patch statefulset service-valkey --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"valkey/valkey:latest"}]'
-kubectl patch statefulset service-valkey -p '{"spec":{"template":{"spec":{"containers":[{"name":"service-valkey","imagePullPolicy":"Never"}]}}}}'
+kubectl patch statefulset valkey-service --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"valkey/valkey:latest"}]'
+kubectl patch statefulset valkey-service -p '{"spec":{"template":{"spec":{"containers":[{"name":"valkey-service","imagePullPolicy":"Never"}]}}}}'
 kubectl logs -f <pod-name>
 kubectl describe pod <pod-name>
 kubectl exec -it <pod-name> -- bash
@@ -280,9 +280,9 @@ kubectl get EndpointSlice -o wide --all-namespaces -w
 kubectl run --rm -it test-dns --image=busybox:latest --restart=Never -- /bin/sh -c "
   nslookup kubernetes.default.svc.cluster.local;
   nslookup mongodb-service.default.svc.cluster.local;
-  nslookup service-valkey.default.svc.cluster.local;
+  nslookup valkey-service.default.svc.cluster.local;
   nc -vz mongodb-service 27017;
-  nc -vz service-valkey 6379;
+  nc -vz valkey-service 6379;
   echo exit code: \\\$?
 "
 

package/src/cli/image.js

@@ -23,9 +23,9 @@ class UnderpostImage {
         shellExec(`sudo podman pull docker.io/library/debian:buster`);
         const IMAGE_NAME = `debian-underpost`;
         const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ?? Underpost.version}`;
-        const LOAD_TYPE = options.kindLoad === true ? `--kin-load` : `--kubeadm-load`;
+        const LOAD_TYPE = options.kindLoad === true ? `--kind-load` : `--kubeadm-load`;
         shellExec(
-          `underpost dockerfile-image-build --podman-save --no-cache --image-path=. --path ${
+          `underpost dockerfile-image-build --podman-save --reset --image-path=. --path ${
             options.path ?? getUnderpostRootPath()
           } --image-name=${IMAGE_NAME_FULL} ${LOAD_TYPE}`,
         );
@@ -41,7 +41,7 @@ class UnderpostImage {
           kubeadmLoad: false,
           secrets: false,
           secretsPath: '',
-          noCache: false,
+          reset: false,
         },
       ) {
         const {
@@ -53,7 +53,7 @@ class UnderpostImage {
           secrets,
           secretsPath,
           kindLoad,
-          noCache,
+          reset,
           kubeadmLoad,
         } = options;
         const podManImg = `localhost/${imageName}`;
@@ -75,7 +75,7 @@ class UnderpostImage {
             secretDockerInput += ` --secret id=${key},env=${key} \ `;
           }
         }
-        if (noCache === true) cache += ' --rm --no-cache';
+        if (reset === true) cache += ' --rm --no-cache';
         if (path && typeof path === 'string')
           shellExec(
             `cd ${path}${secretsInput}&& sudo podman build -f ./${

package/src/cli/index.js

@@ -170,7 +170,7 @@ program
   .option('--kubeadm-load', 'Import tar image to Kubeadm cluster')
   .option('--secrets', 'Dockerfile env secrets')
   .option('--secrets-path [secrets-path]', 'Dockerfile custom path env secrets')
-  .option('--no-cache', 'Build without using cache')
+  .option('--reset', 'Build without using cache')
   .description('Build image from Dockerfile')
   .action(Underpost.image.dockerfile.build);
 

package/src/index.js

@@ -31,7 +31,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.794';
+  static version = 'v2.8.795';
   /**
    * Repository cli API
    * @static

package/src/server/valkey.js

@@ -34,7 +34,7 @@ const selectDtoFactory = (payload, select) => {
 const valkeyClientFactory = async (options) => {
   const valkey = new Valkey({
     // port: 6379,
-    // host: 'service-valkey.default.svc.cluster.local',
+    // host: 'valkey-service.default.svc.cluster.local',
     port: options?.port ? options.port : undefined,
     host: options?.port ? options.host : undefined,
     retryStrategy: (attempt) => {