New alert service

infrastructure/kubernetes/base/components/alert-processor/alert-processor-service.yaml

@@ -1,175 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: alert-processor-service
-  namespace: bakery-ia
-  labels:
-    app.kubernetes.io/name: alert-processor-service
-    app.kubernetes.io/component: worker
-    app.kubernetes.io/part-of: bakery-ia
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: alert-processor-service
-      app.kubernetes.io/component: worker
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: alert-processor-service
-        app.kubernetes.io/component: worker
-    spec:
-      initContainers:
-      # Wait for Redis to be ready
-      - name: wait-for-redis
-        image: redis:7.4-alpine
-        command:
-        - sh
-        - -c
-        - |
-          echo "Waiting for Redis to be ready..."
-          until redis-cli -h $REDIS_HOST -p $REDIS_PORT --tls --cert /tls/redis-cert.pem --key /tls/redis-key.pem --cacert /tls/ca-cert.pem -a "$REDIS_PASSWORD" ping | grep -q PONG; do
-            echo "Redis not ready yet, waiting..."
-            sleep 2
-          done
-          echo "Redis is ready!"
-        env:
-        - name: REDIS_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: REDIS_HOST
-        - name: REDIS_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: REDIS_PORT
-        - name: REDIS_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: redis-secrets
-              key: REDIS_PASSWORD
-        volumeMounts:
-        - name: redis-tls
-          mountPath: /tls
-          readOnly: true
-      # Wait for RabbitMQ to be ready
-      - name: wait-for-rabbitmq
-        image: curlimages/curl:latest
-        command:
-        - sh
-        - -c
-        - |
-          echo "Waiting for RabbitMQ to be ready..."
-          until curl -f -u "$RABBITMQ_USER:$RABBITMQ_PASSWORD" http://$RABBITMQ_HOST:15672/api/healthchecks/node > /dev/null 2>&1; do
-            echo "RabbitMQ not ready yet, waiting..."
-            sleep 2
-          done
-          echo "RabbitMQ is ready!"
-        env:
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-      - name: wait-for-migration
-        image: postgres:17-alpine
-        command:
-        - sh
-        - -c
-        - |
-          echo "Waiting for alert-processor database and migrations to be ready..."
-          # Wait for database to be accessible
-          until pg_isready -h $ALERT_PROCESSOR_DB_HOST -p $ALERT_PROCESSOR_DB_PORT -U $ALERT_PROCESSOR_DB_USER; do
-            echo "Database not ready yet, waiting..."
-            sleep 2
-          done
-          echo "Database is ready!"
-          # Give migrations extra time to complete after DB is ready
-          echo "Waiting for migrations to complete..."
-          sleep 10
-          echo "Ready to start service"
-        env:
-        - name: ALERT_PROCESSOR_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ALERT_PROCESSOR_DB_HOST
-        - name: ALERT_PROCESSOR_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: ALERT_PROCESSOR_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: ALERT_PROCESSOR_DB_USER
-      containers:
-      - name: alert-processor-service
-        image: bakery/alert-processor:f246381-dirty
-        envFrom:
-        - configMapRef:
-            name: bakery-config
-        - secretRef:
-            name: database-secrets
-        - secretRef:
-            name: redis-secrets
-        - secretRef:
-            name: rabbitmq-secrets
-        - secretRef:
-            name: jwt-secrets
-        - secretRef:
-            name: external-api-secrets
-        - secretRef:
-            name: payment-secrets
-        - secretRef:
-            name: email-secrets
-        - secretRef:
-            name: monitoring-secrets
-        - secretRef:
-            name: pos-integration-secrets
-        - secretRef:
-            name: whatsapp-secrets
-        resources:
-          requests:
-            memory: "128Mi"
-            cpu: "50m"
-          limits:
-            memory: "256Mi"
-            cpu: "200m"
-        readinessProbe:
-          exec:
-            command:
-            - python
-            - -c
-            - "import sys; sys.exit(0)"
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          timeoutSeconds: 5
-          failureThreshold: 3
-        livenessProbe:
-          exec:
-            command:
-            - python
-            - -c
-            - "import sys; sys.exit(0)"
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          timeoutSeconds: 5
-          failureThreshold: 3
-      volumes:
-      - name: redis-tls
-        secret:
-          secretName: redis-tls-secret
-          defaultMode: 0400

infrastructure/kubernetes/base/components/alert-processor/alert-processor.yaml

@@ -1,25 +1,54 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: alert-processor-api
+  name: alert-processor
   namespace: bakery-ia
   labels:
-    app.kubernetes.io/name: alert-processor-api
-    app.kubernetes.io/component: api
+    app.kubernetes.io/name: alert-processor
+    app.kubernetes.io/component: service
     app.kubernetes.io/part-of: bakery-ia
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app.kubernetes.io/name: alert-processor-api
-      app.kubernetes.io/component: api
+      app.kubernetes.io/name: alert-processor
+      app.kubernetes.io/component: service
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: alert-processor-api
-        app.kubernetes.io/component: api
+        app.kubernetes.io/name: alert-processor
+        app.kubernetes.io/component: service
     spec:
       initContainers:
+      # Wait for RabbitMQ to be ready
+      - name: wait-for-rabbitmq
+        image: curlimages/curl:latest
+        command:
+        - sh
+        - -c
+        - |
+          echo "Waiting for RabbitMQ to be ready..."
+          until curl -f -u "$RABBITMQ_USER:$RABBITMQ_PASSWORD" http://$RABBITMQ_HOST:15672/api/healthchecks/node > /dev/null 2>&1; do
+            echo "RabbitMQ not ready yet, waiting..."
+            sleep 2
+          done
+          echo "RabbitMQ is ready!"
+        env:
+        - name: RABBITMQ_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: bakery-config
+              key: RABBITMQ_HOST
+        - name: RABBITMQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-secrets
+              key: RABBITMQ_USER
+        - name: RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-secrets
+              key: RABBITMQ_PASSWORD
       - name: wait-for-migration
         image: postgres:17-alpine
         command:
@@ -34,7 +63,7 @@ spec:
           echo "Database is ready!"
           echo "Waiting for migrations to complete..."
           sleep 10
-          echo "Ready to start API service"
+          echo "Ready to start service"
         env:
         - name: ALERT_PROCESSOR_DB_HOST
           valueFrom:
@@ -52,11 +81,11 @@ spec:
               name: database-secrets
               key: ALERT_PROCESSOR_DB_USER
       containers:
-      - name: alert-processor-api
+      - name: alert-processor
         image: bakery/alert-processor:latest
-        command: ["python", "-m", "uvicorn", "app.api_server:app", "--host", "0.0.0.0", "--port", "8010"]
+        command: ["python", "-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
         ports:
-        - containerPort: 8010
+        - containerPort: 8000
           name: http
         envFrom:
         - configMapRef:
@@ -65,6 +94,8 @@ spec:
             name: database-secrets
         - secretRef:
             name: redis-secrets
+        - secretRef:
+            name: rabbitmq-secrets
         - secretRef:
             name: jwt-secrets
         resources:
@@ -77,7 +108,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /health
-            port: 8010
+            port: 8000
           initialDelaySeconds: 10
           periodSeconds: 10
           timeoutSeconds: 5
@@ -85,7 +116,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /health
-            port: 8010
+            port: 8000
           initialDelaySeconds: 30
           periodSeconds: 10
           timeoutSeconds: 5
@@ -94,19 +125,19 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: alert-processor-api
+  name: alert-processor
   namespace: bakery-ia
   labels:
-    app.kubernetes.io/name: alert-processor-api
-    app.kubernetes.io/component: api
+    app.kubernetes.io/name: alert-processor
+    app.kubernetes.io/component: service
     app.kubernetes.io/part-of: bakery-ia
 spec:
   selector:
-    app.kubernetes.io/name: alert-processor-api
-    app.kubernetes.io/component: api
+    app.kubernetes.io/name: alert-processor
+    app.kubernetes.io/component: service
   ports:
   - name: http
-    port: 8010
-    targetPort: 8010
+    port: 8000
+    targetPort: 8000
     protocol: TCP
   type: ClusterIP