Add base kubernetes support final fix 2

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

@@ -69,92 +69,29 @@ spec:
       containers:
       - name: alert-processor-service
         image: bakery/alert-processor:f246381-dirty
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - 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_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ALERT_PROCESSOR_DB_NAME
-        - name: ALERT_PROCESSOR_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: ALERT_PROCESSOR_DB_USER
-        - name: ALERT_PROCESSOR_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: ALERT_PROCESSOR_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: RABBITMQ_VHOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_VHOST
-        - name: NOTIFICATION_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: NOTIFICATION_SERVICE_URL
+        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"
@@ -181,4 +118,4 @@ spec:
           initialDelaySeconds: 30
           periodSeconds: 10
           timeoutSeconds: 5
-          failureThreshold: 3
+          failureThreshold: 3

infrastructure/kubernetes/base/components/auth/auth-service.yaml

@@ -25,92 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: AUTH_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_DB_HOST
-        - name: AUTH_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: AUTH_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_DB_NAME
-        - name: AUTH_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: AUTH_DB_USER
-        - name: AUTH_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: AUTH_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: JWT_SECRET_KEY
-          valueFrom:
-            secretKeyRef:
-              name: jwt-secrets
-              key: JWT_SECRET_KEY
-        - name: JWT_REFRESH_SECRET_KEY
-          valueFrom:
-            secretKeyRef:
-              name: jwt-secrets
-              key: JWT_REFRESH_SECRET_KEY
+        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: "256Mi"
@@ -153,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: auth-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/external/external-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: EXTERNAL_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: EXTERNAL_DB_HOST
-        - name: EXTERNAL_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: EXTERNAL_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: EXTERNAL_DB_NAME
-        - name: EXTERNAL_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: EXTERNAL_DB_USER
-        - name: EXTERNAL_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: EXTERNAL_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: external-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/forecasting/forecasting-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: FORECASTING_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: FORECASTING_DB_HOST
-        - name: FORECASTING_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: FORECASTING_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: FORECASTING_DB_NAME
-        - name: FORECASTING_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: FORECASTING_DB_USER
-        - name: FORECASTING_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: FORECASTING_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: forecasting-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/frontend/frontend-service.yaml

@@ -29,26 +29,9 @@ spec:
         env:
         - name: NODE_ENV
           value: "production"
-        - name: VITE_APP_TITLE
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: VITE_APP_TITLE
-        - name: VITE_APP_VERSION
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: VITE_APP_VERSION
-        - name: VITE_API_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: VITE_API_URL
-        - name: VITE_ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: VITE_ENVIRONMENT
+        envFrom:
+        - configMapRef:
+            name: bakery-config
         resources:
           requests:
             memory: "512Mi"
@@ -91,4 +74,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: frontend
-    app.kubernetes.io/component: frontend
+    app.kubernetes.io/component: frontend

infrastructure/kubernetes/base/components/infrastructure/gateway-service.yaml

@@ -25,62 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -123,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: gateway
-    app.kubernetes.io/component: gateway
+    app.kubernetes.io/component: gateway

infrastructure/kubernetes/base/components/inventory/inventory-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: INVENTORY_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: INVENTORY_DB_HOST
-        - name: INVENTORY_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: INVENTORY_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: INVENTORY_DB_NAME
-        - name: INVENTORY_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: INVENTORY_DB_USER
-        - name: INVENTORY_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: INVENTORY_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: inventory-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/notification/notification-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: NOTIFICATION_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: NOTIFICATION_DB_HOST
-        - name: NOTIFICATION_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: NOTIFICATION_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: NOTIFICATION_DB_NAME
-        - name: NOTIFICATION_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: NOTIFICATION_DB_USER
-        - name: NOTIFICATION_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: NOTIFICATION_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: notification-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/orders/orders-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: ORDERS_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ORDERS_DB_HOST
-        - name: ORDERS_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: ORDERS_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ORDERS_DB_NAME
-        - name: ORDERS_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: ORDERS_DB_USER
-        - name: ORDERS_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: ORDERS_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: orders-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/pos/pos-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: POS_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: POS_DB_HOST
-        - name: POS_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: POS_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: POS_DB_NAME
-        - name: POS_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: POS_DB_USER
-        - name: POS_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: POS_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: pos-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/production/production-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: PRODUCTION_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: PRODUCTION_DB_HOST
-        - name: PRODUCTION_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: PRODUCTION_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: PRODUCTION_DB_NAME
-        - name: PRODUCTION_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: PRODUCTION_DB_USER
-        - name: PRODUCTION_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: PRODUCTION_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: production-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/recipes/recipes-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: RECIPES_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RECIPES_DB_HOST
-        - name: RECIPES_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: RECIPES_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RECIPES_DB_NAME
-        - name: RECIPES_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: RECIPES_DB_USER
-        - name: RECIPES_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: RECIPES_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: recipes-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/sales/sales-service.yaml

@@ -25,92 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: SALES_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: SALES_DB_HOST
-        - name: SALES_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: SALES_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: SALES_DB_NAME
-        - name: SALES_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: SALES_DB_USER
-        - name: SALES_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: SALES_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
-        - name: GATEWAY_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: GATEWAY_URL
+        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: "256Mi"
@@ -153,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: sales-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/suppliers/suppliers-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: SUPPLIERS_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: SUPPLIERS_DB_HOST
-        - name: SUPPLIERS_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: SUPPLIERS_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: SUPPLIERS_DB_NAME
-        - name: SUPPLIERS_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: SUPPLIERS_DB_USER
-        - name: SUPPLIERS_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: SUPPLIERS_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: suppliers-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/tenant/tenant-service.yaml

@@ -25,87 +25,29 @@ spec:
         ports:
         - containerPort: 8000
           name: http
-        env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: TENANT_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: TENANT_DB_HOST
-        - name: TENANT_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: TENANT_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: TENANT_DB_NAME
-        - name: TENANT_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: TENANT_DB_USER
-        - name: TENANT_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: TENANT_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
+        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: "256Mi"
@@ -148,4 +90,4 @@ spec:
     name: http
   selector:
     app.kubernetes.io/name: tenant-service
-    app.kubernetes.io/component: microservice
+    app.kubernetes.io/component: microservice

infrastructure/kubernetes/base/components/training/training-service.yaml

@@ -25,92 +25,30 @@ spec:
         ports:
         - containerPort: 8000
           name: http
+        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
         env:
-        - name: ENVIRONMENT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: ENVIRONMENT
-        - name: DEBUG
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DEBUG
-        - name: LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: LOG_LEVEL
-        - name: TRAINING_DB_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: TRAINING_DB_HOST
-        - name: TRAINING_DB_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: DB_PORT
-        - name: TRAINING_DB_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: TRAINING_DB_NAME
-        - name: TRAINING_DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: TRAINING_DB_USER
-        - name: TRAINING_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: database-secrets
-              key: TRAINING_DB_PASSWORD
-        - 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
-        - name: RABBITMQ_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_HOST
-        - name: RABBITMQ_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: RABBITMQ_PORT
-        - name: RABBITMQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_USER
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: rabbitmq-secrets
-              key: RABBITMQ_PASSWORD
-        - name: AUTH_SERVICE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: AUTH_SERVICE_URL
-        - name: GATEWAY_URL
-          valueFrom:
-            configMapKeyRef:
-              name: bakery-config
-              key: GATEWAY_URL
         - name: TRAINING_PERSISTENCE_PATH
           value: "/app/training_state"
         volumeMounts:
@@ -184,4 +122,4 @@ spec:
   resources:
     requests:
       storage: 5Gi
-  storageClassName: standard
+  storageClassName: standard

infrastructure/kubernetes/base/ingress.yaml

@@ -1,93 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: bakery-ingress
-  namespace: bakery-ia
-  labels:
-    app.kubernetes.io/name: bakery-ia
-    app.kubernetes.io/component: ingress
-  annotations:
-    # Kind-specific nginx ingress controller annotations
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-    nginx.ingress.kubernetes.io/proxy-connect-timeout: "600"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
-    # CORS configuration for local development
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000,http://bakery-ia.local,http://127.0.0.1:3000"
-    nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, PUT, DELETE, OPTIONS, PATCH"
-    nginx.ingress.kubernetes.io/cors-allow-headers: "Content-Type, Authorization, X-Requested-With, Accept, Origin"
-    nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: bakery-ia.local
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: frontend-service
-            port:
-              number: 3000
-      - path: /api
-        pathType: Prefix
-        backend:
-          service:
-            name: gateway-service
-            port:
-              number: 8000
-      - path: /auth
-        pathType: Prefix
-        backend:
-          service:
-            name: auth-service
-            port:
-              number: 8000
-  - host: api.bakery-ia.local
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: gateway-service
-            port:
-              number: 8000
-  - host: monitoring.bakery-ia.local
-    http:
-      paths:
-      - path: /grafana
-        pathType: Prefix
-        backend:
-          service:
-            name: grafana-service
-            port:
-              number: 3000
-      - path: /prometheus
-        pathType: Prefix
-        backend:
-          service:
-            name: prometheus-service
-            port:
-              number: 9090
-  - host: localhost
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: frontend-service
-            port:
-              number: 3000
-      - path: /api
-        pathType: Prefix
-        backend:
-          service:
-            name: gateway-service
-            port:
-              number: 8000

infrastructure/kubernetes/base/kustomization.yaml

@@ -9,7 +9,7 @@ resources:
   - namespace.yaml
   - configmap.yaml
   - secrets.yaml
-  - ingress.yaml
+  - ingress-https.yaml
 
   # Infrastructure components
   - components/databases/redis.yaml