From a6dbe760e2780b085d0896d04e802ba75c66aa7f Mon Sep 17 00:00:00 2001
From: Piotr Biernat <keedosn@gmail.com>
Date: Tue, 21 Oct 2025 15:58:59 +0200
Subject: [PATCH] Fixes in catalog-svc deployment

---
 deploy/k8s/catalog-svc.yml | 66 +++++++++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/deploy/k8s/catalog-svc.yml b/deploy/k8s/catalog-svc.yml
index 5c98294..ce3c05f 100644
--- a/deploy/k8s/catalog-svc.yml
+++ b/deploy/k8s/catalog-svc.yml
@@ -3,6 +3,9 @@ kind: Service
 metadata:
   name: catalog-svc
   namespace: egommerce
+  annotations:
+    haproxy.org/check: "true"
+    # haproxy.org/server-ca: "egommerce/ca-root"
   labels:
     app: catalog-svc
 spec:
@@ -11,9 +14,11 @@ spec:
     app: catalog-svc
   ports:
   - name: catalog-svc
-    protocol: TCP
     port: 443
-    nodePort: 31830
+    nodePort: 31820
+  # - name: catalog-svc-metrics
+  #   port: 9090
+  #   nodePort: 31811
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -22,6 +27,11 @@ metadata:
   namespace: egommerce
 spec:
   replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1           # Number of extra pods that can be created during update
+      maxUnavailable: 1     # Max number of pods that can be unavailable during update
   selector:
     matchLabels:
       app: catalog-svc
@@ -30,17 +40,18 @@ spec:
       labels:
         app: catalog-svc
     spec:
+      # initContainers:
+      # - name: catalog-svc-init
+      #   image: busybox:1.28
+      #   command: [
+      #     'sh',
+      #     '-c',
+      #     '/bin/migrate'
+      #   ]
       containers:
       - name: catalog-svc
         image: git.ego.freeddns.org/egommerce/catalog-svc:dev
         imagePullPolicy: Always
-        command: [
-          "sh"
-        ]
-        args: [
-          "-c",
-          "/app"
-        ]
         env:
           - name: APP_NAME
             value: catalog-svc
@@ -50,20 +61,20 @@ spec:
             value: /catalog
           - name: API_EVENTBUS_URL
             value: amqp://guest:guest@api-eventbus:5672
-          # - name: API_MONGODB_URL
-          #   value: mongodb://mongodb:12345678@mongo-db:27017
+          - name: API_MONGODB_URL
+            value: mongodb://mongodb:12345678@mongo-db:27017
         readinessProbe:
           httpGet:
             scheme: HTTPS
-            port: 443
+            port: catalog-svc
             path: /health
           initialDelaySeconds: 5
           periodSeconds: 5
-          failureThreshold: 5
+          failureThreshold: 1
         livenessProbe:
           httpGet:
             scheme: HTTPS
-            port: 443
+            port: catalog-svc
             path: /health
           initialDelaySeconds: 5
           periodSeconds: 5
@@ -74,12 +85,27 @@ spec:
             readOnly: true
           - name: catalog-key
             mountPath: /certs/catalog-svc.key
+            readOnly: true
+          - name: catalog-migrations
+            mountPath: /migrations
+            readOnly: true
         resources:
           limits:
-            cpu: "1"
-            memory: 512M
+            cpu: 100m
+            memory: 512Mi
+          requests:
+            cpu: 50m
+            memory: 256Mi
         ports:
-        - containerPort: 443
+        - name: catalog-svc
+          containerPort: 443
+      # - name: catalog-svc-metrics
+      #   image: prom/prometheus-exporter:latest
+      #   ports:
+      #     - containerPort: 9090
+      #   args:
+      #     - --web.listen-address=:9090
+      #     - --web.telemetry-path=/metrics
       volumes:
       - name: catalog-cert
         hostPath:
@@ -88,4 +114,8 @@ spec:
       - name: catalog-key
         hostPath:
           path: /egommerce/stack/deploy/certs/catalog-svc/catalog-svc.key
-          type: File
\ No newline at end of file
+          type: File
+      - name: catalog-migrations
+        hostPath:
+          path: /egommerce/stack/deploy/db_migrations/catalog-svc
+          type: Directory
\ No newline at end of file