underpost 2.8.78 → 2.8.82

package/src/cli/deploy.js

@@ -81,14 +81,14 @@ spec:
     spec:
       containers:
         - name: ${deployId}-${env}-${suffix}
-          image: localhost/debian-underpost:${Underpost.version}
-          resources:
-            requests:
-              memory: "${resources.requests.memory}"
-              cpu: "${resources.requests.cpu}"
-            limits:
-              memory: "${resources.limits.memory}"
-              cpu: "${resources.limits.cpu}"
+          image: localhost/rockylinux9-underpost:${Underpost.version}
+#          resources:
+#            requests:
+#              memory: "${resources.requests.memory}"
+#              cpu: "${resources.requests.cpu}"
+#            limits:
+#              memory: "${resources.limits.memory}"
+#              cpu: "${resources.limits.cpu}"
           command:
             - /bin/sh
             - -c
@@ -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
@@ -273,6 +273,29 @@ kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "p
 kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "path": "/spec/cidr", "value": "192.168.0.0/24"}]'
 sudo podman run --rm localhost/<image-name>:<image-version> <command>
 kubectl get configmap kubelet-config -n kube-system -o yaml > kubelet-config.yaml
+kubectl -n kube-system rollout restart daemonset kube-proxy
+kubectl get EndpointSlice -o wide --all-namespaces -w
+kubectl apply -k manifests/deployment/adminer/.
+kubectl wait --for=condition=Ready pod/busybox1
+kubectl wait --for=jsonpath='{.status.phase}'=Running pod/busybox1
+kubectl wait --for='jsonpath={.status.conditions[?(@.type=="Ready")].status}=True' pod/busybox1
+kubectl wait --for=delete pod/busybox1 --timeout=60s
+
+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 valkey-service.default.svc.cluster.local;
+  nc -vz mongodb-service 27017;
+  nc -vz valkey-service 6379;
+  echo exit code: \\\$?
+"
+
+kubectl apply -f - <<EOF
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: ...
+EOF
 `);
       if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
         deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
@@ -308,6 +331,7 @@ kubectl get configmap kubelet-config -n kube-system -o yaml > kubelet-config.yam
       if (options.restoreHosts === true) {
         renderHosts = etcHost(concatHots);
         fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+        logger.info(renderHosts);
         return;
       }
 

package/src/cli/env.js

@@ -25,7 +25,7 @@ class UnderpostRootEnv {
       delete env[key];
       writeEnv(envPath, env);
     },
-    get(key) {
+    get(key, value, options = { plain: false }) {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
       if (!fs.existsSync(envPath)) {
@@ -33,7 +33,7 @@ class UnderpostRootEnv {
         return undefined;
       }
       const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-      logger.info(`${key}(${typeof env[key]})`, env[key]);
+      options?.plain === true ? console.log(env[key]) : logger.info(`${key}(${typeof env[key]})`, env[key]);
       return env[key];
     },
     list() {

package/src/cli/image.js

@@ -12,24 +12,63 @@ const logger = loggerFactory(import.meta);
 class UnderpostImage {
   static API = {
     dockerfile: {
+      /**
+       * @method pullBaseImages
+       * @description Pulls base images and builds a 'rockylinux9-underpost' image,
+       * then loads it into the specified Kubernetes cluster type (Kind, Kubeadm, or K3s).
+       * @param {object} options - Options for pulling and loading images.
+       * @param {boolean} [options.kindLoad=false] - If true, load image into Kind cluster.
+       * @param {boolean} [options.kubeadmLoad=false] - If true, load image into Kubeadm cluster.
+       * @param {boolean} [options.k3sLoad=false] - If true, load image into K3s cluster.
+       * @param {string} [options.path=false] - Path to the Dockerfile context.
+       * @param {string} [options.version=''] - Version tag for the image.
+       */
       pullBaseImages(
         options = {
           kindLoad: false,
           kubeadmLoad: false,
+          k3sLoad: false,
           path: false,
           version: '',
         },
       ) {
-        shellExec(`sudo podman pull docker.io/library/debian:buster`);
-        const IMAGE_NAME = `debian-underpost`;
+        // shellExec(`sudo podman pull docker.io/library/debian:buster`);
+        shellExec(`sudo podman pull docker.io/library/rockylinux:9`);
+        const IMAGE_NAME = `rockylinux9-underpost`;
         const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ?? Underpost.version}`;
-        const LOAD_TYPE = options.kindLoad === true ? `--kin-load` : `--kubeadm-load`;
+        let LOAD_TYPE = '';
+        if (options.kindLoad === true) {
+          LOAD_TYPE = `--kind-load`;
+        } else if (options.kubeadmLoad === true) {
+          LOAD_TYPE = `--kubeadm-load`;
+        } else if (options.k3sLoad === true) {
+          // Handle K3s load type
+          LOAD_TYPE = `--k3s-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}`,
         );
       },
+      /**
+       * @method build
+       * @description Builds a Docker image using Podman, optionally saves it as a tar archive,
+       * and loads it into a specified Kubernetes cluster (Kind, Kubeadm, or K3s).
+       * @param {object} options - Options for building and loading images.
+       * @param {string} [options.path=''] - The path to the directory containing the Dockerfile.
+       * @param {string} [options.imageName=''] - The name and tag for the image (e.g., 'my-app:latest').
+       * @param {string} [options.imagePath=''] - Directory to save the image tar file.
+       * @param {string} [options.dockerfileName=''] - Name of the Dockerfile (defaults to 'Dockerfile').
+       * @param {boolean} [options.podmanSave=false] - If true, save the image as a tar archive using Podman.
+       * @param {boolean} [options.kindLoad=false] - If true, load the image archive into a Kind cluster.
+       * @param {boolean} [options.kubeadmLoad=false] - If true, load the image archive into a Kubeadm cluster (uses 'ctr').
+       * @param {boolean} [options.k3sLoad=false] - If true, load the image archive into a K3s cluster (uses 'k3s ctr').
+       * @param {boolean} [options.secrets=false] - If true, load secrets from the .env file for the build.
+       * @param {string} [options.secretsPath=''] - Custom path to the .env file for secrets.
+       * @param {boolean} [options.reset=false] - If true, perform a no-cache build.
+       */
       build(
         options = {
           path: '',
@@ -39,9 +78,10 @@ class UnderpostImage {
           podmanSave: false,
           kindLoad: false,
           kubeadmLoad: false,
+          k3sLoad: false,
           secrets: false,
           secretsPath: '',
-          noCache: false,
+          reset: false,
         },
       ) {
         const {
@@ -53,8 +93,9 @@ class UnderpostImage {
           secrets,
           secretsPath,
           kindLoad,
-          noCache,
           kubeadmLoad,
+          k3sLoad,
+          reset,
         } = options;
         const podManImg = `localhost/${imageName}`;
         if (imagePath && typeof imagePath === 'string' && !fs.existsSync(imagePath))
@@ -71,11 +112,11 @@ class UnderpostImage {
             ),
           );
           for (const key of Object.keys(envObj)) {
-            secretsInput += ` && export ${key}="${envObj[key]}" `; // $(cat gitlab-token.txt)
+            secretsInput += ` && export ${key}="${envObj[key]}" `; // Example: $(cat gitlab-token.txt)
             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 ./${
@@ -85,7 +126,14 @@ class UnderpostImage {
 
         if (podmanSave === true) shellExec(`podman save -o ${tarFile} ${podManImg}`);
         if (kindLoad === true) shellExec(`sudo kind load image-archive ${tarFile}`);
-        if (kubeadmLoad === true) shellExec(`sudo ctr -n k8s.io images import ${tarFile}`);
+        if (kubeadmLoad === true) {
+          // Use 'ctr' for Kubeadm
+          shellExec(`sudo ctr -n k8s.io images import ${tarFile}`);
+        }
+        if (k3sLoad === true) {
+          // Use 'k3s ctr' for K3s
+          shellExec(`sudo k3s ctr images import ${tarFile}`);
+        }
       },
     },
   };