From 654f754286422a73d0c21df7a81918d0173a4a1b Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Mon, 29 Apr 2024 17:43:44 +0200 Subject: [PATCH] Update KitchenOwl to v0.5.1 --- kubenix-modules/kitchenowl.nix | 91 +++++++--------------------------- 1 file changed, 19 insertions(+), 72 deletions(-) diff --git a/kubenix-modules/kitchenowl.nix b/kubenix-modules/kitchenowl.nix index b86876a..ffa3ae0 100644 --- a/kubenix-modules/kitchenowl.nix +++ b/kubenix-modules/kitchenowl.nix @@ -1,65 +1,29 @@ { kubernetes.resources = { - configMaps.kitchenowl.data = { - BACK_URL = "kitchenowl-backend.default.svc.cluster.local:5000"; - }; - secrets.kitchenowl.stringData.jwtSecretKey = "ref+sops://secrets/sops.yaml#/kitchenowl/jwtSecretKey"; deployments = { - # TODO: this is quite a lot of boilerplate to create these deployments - # Create custom nixos module for this? - kitchenowl-frontend = { - metadata.labels = { - app = "kitchenowl"; - component = "frontend"; - }; + + kitchenowl = { + metadata.labels.app = "kitchenowl"; spec = { - selector.matchLabels = { - app = "kitchenowl"; - component = "frontend"; - }; + selector.matchLabels.app = "kitchenowl"; template = { - metadata.labels = { - app = "kitchenowl"; - component = "frontend"; - }; - - spec.containers.kitchenowl-frontend = { - image = "tombursch/kitchenowl-web:v0.4.20"; - envFrom = [{ configMapRef.name = "kitchenowl"; }]; - ports.web.containerPort = 80; - }; - }; - }; - }; - - kitchenowl-backend = { - metadata.labels = { - app = "kitchenowl"; - component = "backend"; - }; - - spec = { - selector.matchLabels = { - app = "kitchenowl"; - component = "backend"; - }; - - template = { - metadata.labels = { - app = "kitchenowl"; - component = "backend"; - }; + metadata.labels.app = "kitchenowl"; spec = { volumes.data.persistentVolumeClaim.claimName = "kitchenowl"; - containers.kitchenowl-backend = { - image = "tombursch/kitchenowl:v92"; - ports.web.containerPort = 5000; + containers.kitchenowl = { + image = "tombursch/kitchenowl:v0.5.1"; + ports.web.containerPort = 8080; + + env.JWT_SECRET_KEY.valueFrom.secretKeyRef = { + name = "kitchenowl"; + key = "jwtSecretKey"; + }; volumeMounts = [{ name = "data"; @@ -72,29 +36,12 @@ }; }; - services = { - kitchenowl-web.spec = { - selector = { - app = "kitchenowl"; - component = "frontend"; - }; + services.kitchenowl.spec = { + selector.app = "kitchenowl"; - ports.web = { - port = 80; - targetPort = "web"; - }; - }; - - kitchenowl-backend.spec = { - selector = { - app = "kitchenowl"; - component = "backend"; - }; - - ports.web = { - port = 5000; - targetPort = "web"; - }; + ports.web = { + port = 80; + targetPort = "web"; }; }; }; @@ -106,7 +53,7 @@ host = "boodschappen.kun.is"; service = { - name = "kitchenowl-web"; + name = "kitchenowl"; portName = "web"; }; };