underpost 2.8.853 → 2.8.856

package/manifests/deployment/{dd-template-development → dd-default-development}/deployment.yaml

@@ -2,22 +2,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: dd-template-development-blue
+  name: dd-default-development-blue
   labels:
-    app: dd-template-development-blue
+    app: dd-default-development-blue
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: dd-template-development-blue
+      app: dd-default-development-blue
   template:
     metadata:
       labels:
-        app: dd-template-development-blue
+        app: dd-default-development-blue
     spec:
       containers:
-        - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.853
+        - name: dd-default-development-blue
+          image: localhost/rockylinux9-underpost:v2.8.856
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -40,10 +40,10 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: dd-template-development-blue-service
+  name: dd-default-development-blue-service
 spec:
   selector:
-    app: dd-template-development-blue
+    app: dd-default-development-blue
   ports:
     - name: 'tcp-4001'
       protocol: TCP
@@ -85,22 +85,22 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: dd-template-development-green
+  name: dd-default-development-green
   labels:
-    app: dd-template-development-green
+    app: dd-default-development-green
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: dd-template-development-green
+      app: dd-default-development-green
   template:
     metadata:
       labels:
-        app: dd-template-development-green
+        app: dd-default-development-green
     spec:
       containers:
-        - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.853
+        - name: dd-default-development-green
+          image: localhost/rockylinux9-underpost:v2.8.856
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -124,10 +124,10 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: dd-template-development-green-service
+  name: dd-default-development-green-service
 spec:
   selector:
-    app: dd-template-development-green
+    app: dd-default-development-green
   ports:
     - name: 'tcp-4001'
       protocol: TCP

package/manifests/deployment/{dd-template-development → dd-default-development}/proxy.yaml

@@ -16,7 +16,7 @@ spec:
         - prefix: /
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4001
           weight: 100
 
@@ -24,7 +24,7 @@ spec:
         - prefix: /peer
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4002
           weight: 100
 
@@ -41,6 +41,6 @@ spec:
         - prefix: /
       enableWebsockets: true
       services:
-        - name: dd-template-development-blue-service
+        - name: dd-default-development-blue-service
           port: 4003
           weight: 100

package/manifests/grafana/deployment.yaml

@@ -0,0 +1,57 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: grafana
+  name: grafana
+spec:
+  selector:
+    matchLabels:
+      app: grafana
+  template:
+    metadata:
+      labels:
+        app: grafana
+    spec:
+      securityContext:
+        fsGroup: 472
+        supplementalGroups:
+          - 0
+      containers:
+        - name: grafana
+          image: grafana/grafana:latest
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 3000
+              name: http-grafana
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /robots.txt
+              port: 3000
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            successThreshold: 1
+            timeoutSeconds: 2
+          livenessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            tcpSocket:
+              port: 3000
+            timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 250m
+              memory: 750Mi
+          volumeMounts:
+            - mountPath: /var/lib/grafana
+              name: grafana-pv
+      volumes:
+        - name: grafana-pv
+          persistentVolumeClaim:
+            claimName: grafana-pvc

package/manifests/grafana/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - pvc.yaml
+  - deployment.yaml
+  - service.yaml

package/manifests/grafana/pvc.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: grafana-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: local-path
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/grafana/service.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana
+spec:
+  ports:
+    - port: 3000
+      protocol: TCP
+      targetPort: http-grafana
+  selector:
+    app: grafana
+  sessionAffinity: None
+  type: LoadBalancer

package/manifests/prometheus/deployment.yaml

@@ -0,0 +1,82 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prometheus-config
+  labels:
+    app: prometheus
+data:
+  prometheus.yml: |
+    global:
+      scrape_interval: 30s
+      evaluation_interval: 30s
+
+    scrape_configs:
+      - job_name: 'scraper'
+        metrics_path: /metrics
+        scheme: https
+        static_configs:
+          - targets: []
+        # tls_config:
+        #   insecure_skip_verify: true
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: prometheus
+  template:
+    metadata:
+      labels:
+        app: prometheus
+    spec:
+      containers:
+        - name: prometheus
+          image: prom/prometheus:latest
+          args:
+            - '--config.file=/etc/prometheus/prometheus.yml'
+            - '--storage.tsdb.path=/prometheus'
+            - '--web.console.libraries=/usr/share/prometheus/console_libraries'
+            - '--web.console.templates=/usr/share/prometheus/consoles'
+          ports:
+            - containerPort: 9090
+              name: web
+          volumeMounts:
+            - name: prometheus-config
+              mountPath: /etc/prometheus/
+            - name: prometheus-data
+              mountPath: /prometheus
+          resources:
+            requests:
+              memory: '200Mi'
+              cpu: '100m'
+      volumes:
+        - name: prometheus-config
+          configMap:
+            name: prometheus-config
+        - name: prometheus-data
+          emptyDir: {}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+spec:
+  ports:
+    - port: 9090
+      targetPort: 9090
+      protocol: TCP
+      name: web
+  selector:
+    app: prometheus
+  type: ClusterIP

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.853",
+    "version": "2.8.856",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -21,7 +21,6 @@
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
         "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
         "install": "npm run install-global && npm run install-test",
-        "docker:start": "docker-compose up",
         "prettier": "prettier --write .",
         "fix": "npm audit fix --force && npm audit",
         "changelog": "auto-changelog"

package/src/cli/cluster.js

@@ -5,6 +5,7 @@ import UnderpostBaremetal from './baremetal.js';
 import UnderpostDeploy from './deploy.js';
 import UnderpostTest from './test.js';
 import os from 'os';
+import fs from 'fs-extra';
 
 const logger = loggerFactory(import.meta);
 
@@ -33,12 +34,13 @@ class UnderpostCluster {
      * @param {string} [options.nsUse=''] - Set the current kubectl namespace.
      * @param {boolean} [options.infoCapacity=false] - Display resource capacity information for the cluster.
      * @param {boolean} [options.infoCapacityPod=false] - Display resource capacity information for pods.
-     * @param {boolean} [options.istio=false] - Deploy Istio service mesh.
      * @param {boolean} [options.pullImage=false] - Pull necessary Docker images before deployment.
      * @param {boolean} [options.dedicatedGpu=false] - Configure for dedicated GPU usage (e.g., NVIDIA GPU Operator).
      * @param {boolean} [options.kubeadm=false] - Initialize the cluster using Kubeadm.
      * @param {boolean} [options.k3s=false] - Initialize the cluster using K3s.
      * @param {boolean} [options.initHost=false] - Perform initial host setup (install Docker, Podman, Kind, Kubeadm, Helm).
+     * @param {boolean} [options.grafana=false] - Initialize the cluster with a Grafana deployment.
+     * @param {string} [options.prom=''] - Initialize the cluster with a Prometheus Operator deployment and monitor scrap for specified hosts.
      * @param {boolean} [options.uninstallHost=false] - Uninstall all host components.
      * @param {boolean} [options.config=false] - Apply general host configuration (SELinux, containerd, sysctl, firewalld).
      * @param {boolean} [options.worker=false] - Configure as a worker node (for Kubeadm or K3s join).
@@ -63,12 +65,13 @@ class UnderpostCluster {
         nsUse: '',
         infoCapacity: false,
         infoCapacityPod: false,
-        istio: false,
         pullImage: false,
         dedicatedGpu: false,
         kubeadm: false,
         k3s: false,
         initHost: false,
+        grafana: false,
+        prom: '',
         uninstallHost: false,
         config: false,
         worker: false,
@@ -260,6 +263,42 @@ class UnderpostCluster {
         );
       }
 
+      if (options.grafana === true) {
+        shellExec(`kubectl delete deployment grafana --ignore-not-found`);
+        shellExec(`kubectl apply -k ${underpostRoot}/manifests/grafana`);
+      }
+
+      if (options.prom && typeof options.prom === 'string') {
+        shellExec(`kubectl delete deployment prometheus --ignore-not-found`);
+        shellExec(`kubectl delete configmap prometheus-config --ignore-not-found`);
+        shellExec(`kubectl delete service prometheus --ignore-not-found`);
+        // Prometheus server host: http://<prometheus-cluster-ip>:9090
+        const yaml = `${fs.readFileSync(`${underpostRoot}/manifests/prometheus/deployment.yaml`, 'utf8').replace(
+          '- targets: []',
+          `- targets: [${options.prom
+            .split(',')
+            .map((host) => `'${host}'`)
+            .join(',')}]`,
+        )}`;
+        console.log(yaml);
+        shellExec(`kubectl apply -f - <<EOF
+${yaml}
+EOF
+`);
+
+        // https://grafana.com/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/config-other-methods/prometheus/prometheus-operator/
+        // shellExec(
+        //   `kubectl create -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/master/bundle.yaml`,
+        // );
+        // shellExec(`kubectl apply -f ${underpostRoot}/manifests/prometheus/prometheus-cr.yaml`);
+        // shellExec(`kubectl rollout status sts prometheus-prometheus -n default`);
+        // shellExec(`kubectl apply -f ${underpostRoot}/manifests/prometheus/prometheus-server.yaml`);
+        // shellExec(`helm repo add prometheus-community https://prometheus-community.github.io/helm-charts`);
+        // shellExec(`helm repo update`);
+        // shellExec(`helm install prometheus prometheus-community/prometheus`);
+        // shellExec(`kubectl rollout status deployment prometheus-server -n default`);
+      }
+
       if (options.full === true || options.valkey === true) {
         if (options.pullImage === true) {
           // shellExec(`sudo podman pull valkey/valkey:latest`);

package/src/cli/index.js

@@ -123,6 +123,11 @@ program
   .option('--full', 'Initializes the cluster with all available statefulsets and services.')
   .option('--ns-use <ns-name>', 'Switches the current Kubernetes context to the specified namespace.')
   .option('--kubeadm', 'Initializes the cluster using kubeadm for control plane management.')
+  .option('--grafana', 'Initializes the cluster with a Grafana deployment.')
+  .option(
+    '--prom [hosts]',
+    'Initializes the cluster with a Prometheus Operator deployment and monitor scrap for specified hosts.',
+  )
   .option('--dev', 'Initializes a development-specific cluster configuration.')
   .option('--list-pods', 'Displays detailed information about all pods.')
   .option('--info-capacity', 'Displays the current total machine capacity information.')

package/src/cli/run.js

@@ -1,7 +1,7 @@
 import { daemonProcess, getTerminalPid, openTerminal, pbcopy, shellCd, shellExec } from '../server/process.js';
 import read from 'read';
 import { getNpmRootPath } from '../server/conf.js';
-import { loggerFactory } from '../server/logger.js';
+import { actionInitLog, loggerFactory } from '../server/logger.js';
 import UnderpostTest from './test.js';
 import fs from 'fs-extra';
 import { range, setPad, timer } from '../client/components/core/CommonJs.js';
@@ -98,6 +98,25 @@ class UnderpostRun {
       shellExec(`${baseCommand} cmt . --empty ci package-pwa-microservices-template`);
       shellExec(`${baseCommand} push . underpostnet/engine`);
     },
+    clean: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellCd(path ?? `/home/dd/engine`);
+      shellExec(`node bin/deploy clean-core-repo`);
+    },
+    pull: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellCd(`/home/dd/engine`);
+      shellExec(`node bin/deploy clean-core-repo`);
+      shellExec(`underpost pull . underpostnet/engine`);
+      shellExec(`underpost pull engine-private underpostnet/engine-private`, { silent: true });
+    },
+    'release-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      actionInitLog();
+      shellExec(`underpost --version`);
+      shellCd(`/home/dd/engine`);
+      for (const _deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')) {
+        const deployId = _deployId.trim();
+        shellExec(`underpost run deploy ${deployId}`, { async: true });
+      }
+    },
     'ssh-deploy': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const baseCommand = options.dev || true ? 'node bin' : 'underpost';
       shellCd('/home/dd/engine');
@@ -221,16 +240,20 @@ class UnderpostRun {
       const ignorePods = UnderpostDeploy.API.get(`${deployId}-${env}-${targetTraffic}`).map((p) => p.NAME);
       shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic}`);
 
-      let secondsElapsed = 0;
-      logger.info('Deployment init', { deployId, env, targetTraffic });
+      let checkStatusIteration = 0;
+      const checkStatusIterationMsDelay = 1000;
+      const iteratorTag = `[${deployId}-${env}-${targetTraffic}]`;
+      logger.info('Deployment init', { deployId, env, targetTraffic, checkStatusIterationMsDelay });
 
       while (!UnderpostDeploy.API.checkDeploymentReadyStatus(deployId, env, targetTraffic, ignorePods).ready) {
-        await timer(1000);
-        secondsElapsed++;
-        logger.info(`Deployment in progress, seconds elapsed: ${secondsElapsed}`);
+        await timer(checkStatusIterationMsDelay);
+        checkStatusIteration++;
+        logger.info(
+          `${iteratorTag} | Deployment in progress... | Delay number check iterations: ${checkStatusIteration}`,
+        );
       }
 
-      logger.info(`Deployment ready, seconds elapsed: ${secondsElapsed}`);
+      logger.info(`${iteratorTag} | Deployment ready. | Total delay number check iterations: ${checkStatusIteration}`);
 
       UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, targetTraffic);
 

package/src/client/Default.index.js

@@ -15,7 +15,6 @@ import { DefaultParams } from './components/default/CommonDefault.js';
 import { SocketIo } from './components/core/SocketIo.js';
 import { SocketIoDefault } from './components/default/SocketIoDefault.js';
 import { ElementsDefault } from './components/default/ElementsDefault.js';
-import { Scroll } from './components/core/Scroll.js';
 import { CssDefaultDark, CssDefaultLight } from './components/default/CssDefault.js';
 
 const htmlMainBody = async () => {
@@ -39,7 +38,6 @@ window.onload = () =>
       await LogInDefault();
       await LogOutDefault();
       await SignUpDefault();
-      await Scroll.pullTopRefresh();
       await Keyboard.Init({ callBackTime: DefaultParams.EVENT_CALLBACK_TIME });
     },
   });

package/src/client/components/core/Modal.js

@@ -502,7 +502,7 @@ const Modal = {
                       class="abs modal slide-menu-top-bar-fix"
                       style="height: ${options.heightTopBar}px; top: 0px"
                     >
-                      <a class="a-link-top-banner">
+                      <a class="a-link-top-banner fl">
                         <div class="inl">${await options.slideMenuTopBarBannerFix()}</div></a
                       >
                     </div>`
@@ -1160,7 +1160,7 @@ const Modal = {
                   if (s(`.slide-menu-top-bar-fix`)) {
                     htmls(
                       `.slide-menu-top-bar-fix`,
-                      html`<a class="a-link-top-banner">${await options.slideMenuTopBarBannerFix()}</a>`,
+                      html`<a class="a-link-top-banner fl">${await options.slideMenuTopBarBannerFix()}</a>`,
                     );
                     Modal.setTopBannerLink();
                   }