Merge pull request #711 from bunkerity/dev

Merge branch "dev" into branch "staging"

.github/workflows/staging-create-infra.yml

@@ -29,6 +29,8 @@ jobs:
       - name: Install kubectl
         uses: azure/setup-kubectl@901a10e89ea615cf61f57ac05cecdf23e7de06d8 # v3.2
         if: inputs.TYPE == 'k8s'
+        with:
+          version: 'v1.28.2'
       - name: Set up Python 3.11
         uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
         if: inputs.TYPE != 'k8s'

.github/workflows/staging-delete-infra.yml

@@ -36,6 +36,8 @@ jobs:
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
       - uses: azure/setup-kubectl@901a10e89ea615cf61f57ac05cecdf23e7de06d8 # v3.2
         if: inputs.TYPE == 'k8s'
+        with:
+          version: 'v1.28.2'
       # Remove infra
       - run: kubectl delete daemonsets,replicasets,services,deployments,pods,rc,ingress,statefulsets --all --all-namespaces --timeout=60s ; kubectl delete pvc --all --timeout=60s ; kubectl delete pv --all --timeout=60s
         if: inputs.TYPE == 'k8s'

.github/workflows/staging-tests.yml

@@ -68,6 +68,8 @@ jobs:
         if: inputs.TYPE == 'k8s'
       - uses: azure/setup-kubectl@901a10e89ea615cf61f57ac05cecdf23e7de06d8 # v3.2
         if: inputs.TYPE == 'k8s'
+        with:
+          version: 'v1.28.2'
       - uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
         if: inputs.TYPE == 'k8s'
       - name: Pull BW linux ubuntu test image

src/autoconf/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac AS builder
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c AS builder
 
 # Copy python requirements
 COPY src/deps/requirements.txt /tmp/requirements-deps.txt
@@ -34,7 +34,7 @@ COPY src/common/helpers helpers
 COPY src/common/settings.json settings.json
 COPY src/common/utils utils
 
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027

src/scheduler/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac AS builder
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c AS builder
 
 # Install python dependencies
 RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev
@@ -38,7 +38,7 @@ COPY src/common/utils utils
 COPY src/scheduler scheduler
 COPY src/VERSION VERSION
 
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027

src/ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac AS builder
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c AS builder
 
 # Install python dependencies
 RUN apk add --no-cache --virtual .build-deps g++ gcc musl-dev jpeg-dev zlib-dev libffi-dev cairo-dev pango-dev gdk-pixbuf-dev openssl-dev cargo postgresql-dev file make
@@ -36,7 +36,7 @@ COPY src/common/helpers helpers
 COPY src/ui ui
 COPY src/VERSION VERSION
 
-FROM python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac
+FROM python:3.12.0-alpine@sha256:a4029bd4a6ccfc9d23099f7c7fd808b7fe82ed8a625814ac524fc00017c9af6c
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027

src/ui/main.py

@@ -481,6 +481,7 @@ def services():
 
             # Edit check fields and remove already existing ones
             config = app.config["CONFIG"].get_config(methods=False)
+            server_name = variables["SERVER_NAME"].split(" ")[0]
             for variable, value in deepcopy(variables).items():
                 if variable.endswith("SCHEMA"):
                     del variables[variable]
@@ -491,7 +492,7 @@ def services():
                 elif value == "off":
                     value = "no"
 
-                if variable in variables and variable != "SERVER_NAME" and value == config.get(variable, None):
+                if variable in variables and variable != "SERVER_NAME" and value == config.get(f"{server_name}_{variable}" if request.form["operation"] == "edit" else variable, None):
                     del variables[variable]
 
             if request.form["operation"] == "edit" and len(variables) == 1 and "SERVER_NAME" in variables and variables["SERVER_NAME"] == request.form.get("OLD_SERVER_NAME", ""):
@@ -500,6 +501,9 @@ def services():
                     "error",
                 )
                 return redirect(url_for("loading", next=url_for("services")))
+            elif request.form["operation"] == "new" and not variables:
+                flash("The service was not created because all values had the default value.", "error")
+                return redirect(url_for("loading", next=url_for("services")))
 
             error = app.config["CONFIG"].check_variables(variables)
 

src/ui/src/Config.py

@@ -218,7 +218,7 @@ class Config:
         old_server_name_splitted = old_server_name.split(" ")
         for i, service in enumerate(deepcopy(services)):
             if service["SERVER_NAME"] == variables["SERVER_NAME"] or service["SERVER_NAME"] in server_name_splitted:
-                if changed_server_name:
+                if changed_server_name and service["SERVER_NAME"].split(" ")[0] != old_server_name_splitted[0]:
                     return (
                         f"Service {service['SERVER_NAME'].split(' ')[0]} already exists.",
                         1,