underpost 2.8.51 → 2.8.52

package/.vscode/settings.json

@@ -42,6 +42,7 @@
     "Itemledger",
     "jsonld",
     "lampp",
+    "letsencrypt",
     "loadingio",
     "Longname",
     "metanarrative",

package/bin/index.js

@@ -88,6 +88,7 @@ program
   .option('--mongodb', 'Init with mongodb statefulset')
   .option('--valkey', 'Init with valkey service')
   .option('--contour', 'Init with project contour base HTTPProxy and envoy')
+  .option('--cert-manager', 'Init with letsencrypt-prod ClusterIssuer')
   .option('--info', 'Get all kinds objects deployed')
   .option('--full', 'Init with all statefulsets and services available')
   .option('--ns-use <ns-name>', 'Switches current context to namespace')
@@ -136,7 +137,8 @@ program
   .argument('<deploy-id>', 'Deploy configuration id')
   .argument('[env]', 'Optional environment, for default is development')
   .argument('[path]', 'Absolute or relative directory, for default is current')
-  .option('--image-archive', 'Only load tar image from /images')
+  .option('--image-archive', 'Only load tar image from ./images')
+  .option('--podman-save', 'Save image from podman to ./images')
   .description('Build image from Dockerfile')
   .action(Underpost.image.dockerfile.build);
 

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.51'
+      engine.version: '2.8.52'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.51",
+    "version": "2.8.52",
     "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

@@ -2,12 +2,23 @@ import { timer } from '../client/components/core/CommonJs.js';
 import { cliSpinner } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
+import UnderpostDeploy from './deploy.js';
 
 const logger = loggerFactory(import.meta);
 
 class UnderpostCluster {
   static API = {
-    async init(options = { valkey: false, mariadb: false, valkey: false, full: false, info: false, nsUse: '' }) {
+    async init(
+      options = {
+        valkey: false,
+        mariadb: false,
+        valkey: false,
+        full: false,
+        info: false,
+        certManager: false,
+        nsUse: '',
+      },
+    ) {
       if (options.nsUse) {
         shellExec(`kubectl config set-context --current --namespace=${options.nsUse}`);
         return;
@@ -40,6 +51,7 @@ class UnderpostCluster {
         logger.info('----------------------------------------------------------------');
         shellExec(`kubectl get secrets --all-namespaces -o wide`);
         shellExec(`docker secret ls`);
+        shellExec(`kubectl get crd --all-namespaces -o wide`);
         return;
       }
       const testClusterInit = shellExec(`kubectl get pods --all-namespaces -o wide`, {
@@ -88,14 +100,7 @@ class UnderpostCluster {
           const monitor = async () => {
             cliSpinner(1000, `[cluster.js] `, ` Load mongodb instance`, 'yellow', 'material');
             await timer(1000);
-            if (
-              shellExec(`kubectl get pods --all-namespaces -o wide`, {
-                silent: true,
-                stdout: true,
-                disableLog: true,
-              }).match(`mongodb-1                                    1/1     Running`)
-            )
-              return resolve();
+            if (UnderpostDeploy.API.getPods('mongodb-1').find((p) => p.STATUS === 'Running')) return resolve();
             return monitor();
           };
           await monitor();
@@ -119,6 +124,23 @@ class UnderpostCluster {
 
       if (options.full || options.contour)
         shellExec(`kubectl apply -f https://projectcontour.io/quickstart/contour.yaml`);
+
+      if (options.full || options.certManager) {
+        if (!UnderpostDeploy.API.getPods('cert-manager').find((p) => p.STATUS === 'Running')) {
+          shellExec(`helm repo add jetstack https://charts.jetstack.io --force-update`);
+          shellExec(
+            `helm install cert-manager jetstack/cert-manager \
+--namespace cert-manager \
+--create-namespace \
+--version v1.17.0 \
+--set crds.enabled=true`,
+          );
+        }
+
+        const letsEncName = 'letsencrypt-prod';
+        shellExec(`sudo kubectl delete ClusterIssuer ${letsEncName}`);
+        shellExec(`sudo kubectl apply -f ./manifests/${letsEncName}.yaml`);
+      }
     },
     reset() {
       shellExec(`kind get clusters | xargs -t -n1 kind delete cluster --name`);

package/src/cli/deploy.js

@@ -205,12 +205,19 @@ spec:
         const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
         for (const host of Object.keys(confServer)) {
           shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+          if (env === 'production') shellExec(`sudo kubectl delete Certificate ${host}`);
           if (!options.remove === true && env === 'development') concatHots += ` ${host}`;
         }
 
+        const manifestsPath =
+          env === 'production'
+            ? `engine-private/conf/${deployId}/build/production`
+            : `manifests/deployment/${deployId}-${env}`;
+
         if (!options.remove === true) {
-          shellExec(`sudo kubectl apply -f ./manifests/deployment/${deployId}-${env}/deployment.yaml`);
-          shellExec(`sudo kubectl apply -f ./manifests/deployment/${deployId}-${env}/proxy.yaml`);
+          shellExec(`sudo kubectl apply -f ./${manifestsPath}/deployment.yaml`);
+          shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
+          if (env === 'production') shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
         }
 
         let renderHosts;

package/src/cli/image.js

@@ -13,11 +13,18 @@ class UnderpostImage {
       pullBaseImages() {
         shellExec(`sudo podman pull docker.io/library/debian:buster`);
       },
-      build(deployId = 'default', env = 'development', path = '.', options = { imageArchive: false }) {
+      build(
+        deployId = 'default',
+        env = 'development',
+        path = '.',
+        options = { imageArchive: false, podmanSave: false },
+      ) {
         const imgName = `${deployId}-${env}:${Underpost.version}`;
         const podManImg = `localhost/${imgName}`;
-        const imagesStoragePath = `./images`;
-        const tarFile = `${imagesStoragePath}/${imgName.replace(':', '_')}.tar`;
+        const imagesStoragePath = `/images`;
+        if (!fs.existsSync(`${path}${imagesStoragePath}`))
+          fs.mkdirSync(`${path}${imagesStoragePath}`, { recursive: true });
+        const tarFile = `.${imagesStoragePath}/${imgName.replace(':', '_')}.tar`;
 
         let secrets = ' ';
         let secretDockerInput = '';
@@ -36,8 +43,9 @@ class UnderpostImage {
             `cd ${path}${secrets}&& sudo podman build -f ./Dockerfile -t ${imgName} --pull=never --cap-add=CAP_AUDIT_WRITE${secretDockerInput}`,
           );
           fs.removeSync(`${path}/.env.underpost`);
-          shellExec(`cd ${path} && podman save -o ${tarFile} ${podManImg}`);
         }
+        if (options.imageArchive !== true || options.podmanSave === true)
+          shellExec(`cd ${path} && podman save -o ${tarFile} ${podManImg}`);
         shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
       },
       async script(deployId = 'default', env = 'development', options = { run: false }) {
@@ -101,12 +109,12 @@ class UnderpostImage {
         shellExec(`node bin/deploy conf ${deployId} ${env}`);
         shellExec(`node bin/deploy build-full-client ${deployId}`);
         if (options.run === true) {
-          const runCmd = env === 'production' ? 'prod-img' : 'dev-img';
+          const runCmd = env === 'production' ? 'start' : 'run dev-img';
           if (fs.existsSync(`./engine-private/replica`)) {
             const replicas = await fs.readdir(`./engine-private/replica`);
             for (const replica of replicas) {
               shellExec(`node bin/deploy conf ${replica} ${env}`);
-              shellExec(`npm run ${runCmd} ${replica} deploy`, { async: true });
+              shellExec(`npm ${runCmd} ${replica} deploy`, { async: true });
               fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
               const monitor = async () => {
                 await timer(1000);
@@ -116,7 +124,7 @@ class UnderpostImage {
             }
             shellExec(`node bin/deploy conf ${deployId} ${env}`);
           }
-          shellExec(`npm run ${runCmd} ${deployId} deploy`);
+          shellExec(`npm ${runCmd} ${deployId} deploy`);
         }
       },
     },

package/src/index.js

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