Merge pull request #13 from biersoeckli/canary

25-02-07 Merging features from canary to main branch

Author: biersoeckli

.github/workflows/build-release.yml

@@ -52,7 +52,7 @@ jobs:
         with:
           context: ./
           push: true
-          platforms: linux/amd64 #,linux/arm64
+          platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION_ARG=${{ github.ref_name }}
           tags: |

.github/workflows/canary-release.yml

@@ -52,7 +52,7 @@ jobs:
         with:
           context: ./
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64 #,linux/arm64
           build-args: |
             VERSION_ARG=canary-${{ github.run_number }}
           tags: |

Dockerfile

@@ -1,31 +1,25 @@
 FROM node:18-alpine AS base
 
 ARG VERSION_ARG
-
 RUN apk add --no-cache openssl
 
-# Install dependencies only when needed
 FROM base AS deps
-# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat openssl
+
+# Install necessary packages for building
+RUN apk add --no-cache libc6-compat python3 make g++
+
 WORKDIR /app
 
-# Install dependencies based on the preferred package manager
+# Install dependencies
 COPY yarn.lock package.json ./
 RUN yarn install
 
-
 # Rebuild the source code only when needed
 FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-# Next.js collects completely anonymous telemetry data about general usage.
-# Learn more here: https://nextjs.org/telemetry
-# Uncomment the following line in case you want to disable telemetry during the build.
-# ENV NEXT_TELEMETRY_DISABLED 1
-
 RUN yarn run prisma-generate-build
 RUN yarn run build
 RUN rm -rf ./next/standalone
@@ -34,36 +28,27 @@ RUN rm -rf ./next/standalone
 FROM base AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
-# Uncomment the following line in case you want to disable telemetry during runtime.
-# ENV NEXT_TELEMETRY_DISABLED 1
+ENV NODE_ENV=production
+ENV PYTHON=/usr/bin/python3
+ENV QS_VERSION=$VERSION_ARG
 
 RUN apk add --no-cache git
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
-RUN mkdir storage
-RUN chown nextjs:nodejs storage
-
-RUN mkdir tmp-storage
-RUN chown nextjs:nodejs tmp-storage
+RUN mkdir storage tmp-storage
+RUN chown nextjs:nodejs storage tmp-storage
 
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/prisma ./prisma
 COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
 COPY --from=builder --chown=nextjs:nodejs /app/dist ./dist
-COPY --from=builder --chown=nextjs:nodejs /app/dist ./dist
 COPY --from=builder --chown=nextjs:nodejs /app/package.json ./package.json
 COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
 
 USER nextjs
 
 ENV PORT=3000
-ENV QS_VERSION=$VERSION_ARG
 
-# server.js is created by next build from the standalone output
-# https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD HOSTNAME="0.0.0.0" npm run start-prod
+CMD HOSTNAME="0.0.0.0" npm run start-prod

setup/reset-password.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# curl -sfL https://get.quickstack.dev/reset-password.sh | sh -
+
+DEPLOYMENT="quickstack"
+NAMESPACE="quickstack"
+
+# Get the first pod name of the deployment
+POD_NAME=$(kubectl get pods -n "$NAMESPACE" -l app="$DEPLOYMENT" -o jsonpath="{.items[0].metadata.name}")
+
+if [ -z "$POD_NAME" ]; then
+    echo "Could not find a running QuickStack instance on your server/cluster."
+    exit 1
+fi
+
+echo "Found QuickStack instance: $POD_NAME"
+echo "Initializing password change..."
+
+# Patch the deployment to add or update START_MODE=reset-password
+kubectl patch deployment "$DEPLOYMENT" -n "$NAMESPACE" --type='json' -p='[
+    {
+        "op": "add",
+        "path": "/spec/template/spec/containers/0/env/-",
+        "value": { "name": "START_MODE", "value": "reset-password" }
+    }
+]'
+
+echo "Initialized password change successfully, please wait..."
+
+sleep 2
+
+echo "Waiting for the new pod to be in Running status..."
+kubectl wait --for=condition=Ready pod -l app="$DEPLOYMENT" -n "$NAMESPACE" --timeout=300s
+
+# Retreive the new pod name
+NEW_POD=""
+while [ -z "$NEW_POD" ] || [ "$NEW_POD" = "$OLD_POD" ]; do
+    sleep 2
+    NEW_POD=$(kubectl get pods -n "$NAMESPACE" -l app="$DEPLOYMENT" -o jsonpath="{.items[-1].metadata.name}")
+done
+
+kubectl logs -f "$NEW_POD" -n "$NAMESPACE"

setup/setup-canary.sh

@@ -0,0 +1,178 @@
+#!/bin/bash
+
+# curl -sfL https://get.quickstack.dev/setup-canary.sh | sh -
+
+select_network_interface() {
+  if [ -z "$INSTALL_K3S_INTERFACE" ]; then
+    interfaces_with_ips=$(ip -o -4 addr show | awk '!/^[0-9]*: lo:/ {print $2, $4}' | cut -d'/' -f1)
+
+    echo "Available network interfaces:"
+    echo "$interfaces_with_ips"
+    echo ""
+    echo "*******************************************************************************************************"
+    echo ""
+    echo "If you plan to use QuickStack in a cluster using multiple servers in multiple Networks (private/public),"
+    echo "choose the network Interface you want to use for the communication between the servers."
+    echo ""
+    echo "If you plan to use QuickStack in a single server setup, choose the network Interface with the public IP."
+    echo ""
+
+    i=1
+    echo "$interfaces_with_ips" | while read -r iface ip; do
+      printf "%d) %s (%s)\n" "$i" "$iface" "$ip"
+      i=$((i + 1))
+    done
+
+    printf "Please enter the number of the interface to use: "
+    # Change read to use /dev/tty explicitly
+    read -r choice </dev/tty
+
+    selected=$(echo "$interfaces_with_ips" | sed -n "${choice}p")
+    selected_iface=$(echo "$selected" | awk '{print $1}')
+    selected_ip=$(echo "$selected" | awk '{print $2}')
+
+    if [ -n "$selected" ]; then
+      echo "Selected interface: $selected_iface ($selected_ip)"
+    else
+      echo "Invalid selection. Exiting."
+      exit 1
+    fi
+  fi
+
+  echo "Using network interface: $selected_iface with IP address: $selected_ip"
+}
+
+wait_until_all_pods_running() {
+
+  # Waits another 5 seconds to make sure all pods are registered for the first time.
+  sleep 5
+
+  while true; do
+    OUTPUT=$(sudo k3s kubectl get pods -A --no-headers 2>&1)
+
+    # Checks if there are no resources found --> Kubernetes ist still starting up
+    if echo "$OUTPUT" | grep -q "No resources found"; then
+      echo "Kubernetes is still starting up..."
+    else
+      # Extracts the STATUS column from the kubectl output and filters out the values "Running" and "Completed".
+      STATUS=$(echo "$OUTPUT" | awk '{print $4}' | grep -vE '^(Running|Completed)$')
+
+      # If the STATUS variable is empty, all pods are running and the loop can be exited.
+      if [ -z "$STATUS" ]; then
+        echo "Pods started successfully."
+        break
+      else
+        echo "Waiting for all pods to come online..."
+      fi
+    fi
+
+    # Waits for X seconds before checking the pod status again.
+    sleep 10
+  done
+
+  # Waits another 5 seconds to make sure all pods are ready.
+  sleep 5
+
+  sudo kubectl get node
+  sudo kubectl get pods -A
+}
+
+# Prompt for network interface
+select_network_interface
+
+# install nfs-common and open-iscsi
+echo "Installing nfs-common..."
+sudo apt-get update
+sudo apt-get install open-iscsi nfs-common -y
+
+# Installation of k3s
+#curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--node-ip=192.168.1.2 --advertise-address=192.168.1.2 --node-external-ip=188.245.236.232 --flannel-iface=enp7s0" INSTALL_K3S_VERSION="v1.31.3+k3s1" sh -
+
+echo "Installing k3s with --flannel-iface=$selected_iface"
+curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--flannel-iface=$selected_iface" INSTALL_K3S_VERSION="v1.31.3+k3s1" sh -
+# Todo: Check for Ready node, takes ~30 seconds
+sudo k3s kubectl get node
+
+echo "Waiting for Kubernetes to start..."
+wait_until_all_pods_running
+
+# Installation of Longhorn
+sudo kubectl apply -f https://raw.githubusercontent.com/longhorn/longhorn/v1.7.2/deploy/longhorn.yaml
+echo "Waiting for Longhorn to start..."
+wait_until_all_pods_running
+
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# THIS MUST BE INSTALLED ON ALL NODES --> https://longhorn.io/docs/1.7.2/deploy/install/#installing-nfsv4-client
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+#sudo kubectl apply -f https://raw.githubusercontent.com/longhorn/longhorn/v1.6.0/deploy/prerequisite/longhorn-nfs-installation.yaml
+#wait_until_all_pods_running
+
+# Installation of Cert-Manager
+sudo kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.1/cert-manager.yaml
+echo "Waiting for Cert-Manager to start..."
+wait_until_all_pods_running
+sudo kubectl -n cert-manager get pod
+
+# Checking installation of Longhorn
+sudo apt-get install jq -y
+sudo curl -sSfL https://raw.githubusercontent.com/longhorn/longhorn/v1.7.2/scripts/environment_check.sh | bash
+
+joinTokenForOtherNodes=$(sudo cat /var/lib/rancher/k3s/server/node-token)
+
+# deploy QuickStack
+cat <<EOF >quickstack-setup-job.yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: quickstack
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: qs-service-account
+  namespace: quickstack
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: qs-role-binding
+subjects:
+  - kind: ServiceAccount
+    name: qs-service-account
+    namespace: quickstack
+roleRef:
+  kind: ClusterRole
+  name: cluster-admin
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: quickstack-setup-job
+  namespace: quickstack
+spec:
+  ttlSecondsAfterFinished: 3600
+  template:
+    spec:
+      serviceAccountName: qs-service-account
+      containers:
+      - name: quickstack-container
+        image: quickstack/quickstack:canary
+        env:
+        - name: START_MODE
+          value: "setup"
+        - name: K3S_JOIN_TOKEN
+          value: "$joinTokenForOtherNodes"
+        imagePullPolicy: Always
+      restartPolicy: Never
+  backoffLimit: 0
+EOF
+sudo kubectl apply -f quickstack-setup-job.yaml
+rm quickstack-setup-job.yaml
+wait_until_all_pods_running
+sudo kubectl logs -f job/quickstack-setup-job -n quickstack
+
+# evaluate url to add node to cluster
+# echo "To add an additional node to the cluster, run the following command on the worker node:"
+# echo "curl -sfL https://get.quickstack.dev/setup-worker.sh | K3S_URL=https://<IP-ADDRESS-OR-HOSTNAME-OF-MASTERNODE>:6443 JOIN_TOKEN=$joinTokenForOtherNodes sh -"

setup/setup-worker.sh

@@ -35,7 +35,7 @@ select_network_interface() {
             i=$((i + 1))
         done
 
-        printf "Please enter the number of the interface to use (1-%d): " "$((i-1))"
+        printf "Please enter the number of the interface to use: "
         # Change read to use /dev/tty explicitly
         read -r choice </dev/tty
 

setup/setup.sh

@@ -23,7 +23,7 @@ select_network_interface() {
       i=$((i + 1))
     done
 
-    printf "Please enter the number of the interface to use (1-%d): " "$((i - 1))"
+    printf "Please enter the number of the interface to use: "
     # Change read to use /dev/tty explicitly
     read -r choice </dev/tty
 

src/__tests__/shared/utils/date.utils.test.ts

@@ -0,0 +1,28 @@
+import { DateUtils } from '../../../shared/utils/date.utils';
+
+describe('DateUtils', () => {
+
+    test('should return true for the same day', () => {
+        const date1 = new Date(2023, 9, 10);
+        const date2 = new Date(2023, 9, 10);
+        expect(DateUtils.isSameDay(date1, date2)).toBe(true);
+    });
+
+    test('should return false for different days', () => {
+        const date1 = new Date(2023, 9, 10);
+        const date2 = new Date(2023, 9, 11);
+        expect(DateUtils.isSameDay(date1, date2)).toBe(false);
+    });
+
+    test('should return false for different months', () => {
+        const date1 = new Date(2023, 8, 10);
+        const date2 = new Date(2023, 9, 10);
+        expect(DateUtils.isSameDay(date1, date2)).toBe(false);
+    });
+
+    test('should return false for different years', () => {
+        const date1 = new Date(2022, 9, 10);
+        const date2 = new Date(2023, 9, 10);
+        expect(DateUtils.isSameDay(date1, date2)).toBe(false);
+    });
+});

src/__tests__/shared/utils/traefik-me.utils.test.ts

@@ -0,0 +1,25 @@
+import { TraefikMeUtils } from '../../../shared/utils/traefik-me.utils';
+
+describe('TraefikMeUtils', () => {
+    describe('isValidTraefikMeDomain', () => {
+        it('should return true for valid traefik.me domain', () => {
+            expect(TraefikMeUtils.isValidTraefikMeDomain('example.traefik.me')).toBe(true);
+        });
+
+        it('should return false for domain not ending with .traefik.me', () => {
+            expect(TraefikMeUtils.isValidTraefikMeDomain('example.com')).toBe(false);
+        });
+
+        it('should return false for domain with more than three parts', () => {
+            expect(TraefikMeUtils.isValidTraefikMeDomain('sub.example.traefik.me')).toBe(false);
+        });
+
+        it('should return false for domain with less than three parts', () => {
+            expect(TraefikMeUtils.isValidTraefikMeDomain('traefik.me')).toBe(false);
+        });
+
+        it('should return false for empty string', () => {
+            expect(TraefikMeUtils.isValidTraefikMeDomain('')).toBe(false);
+        });
+    });
+});