Fastapi

.gitignore

@@ -29,4 +29,5 @@ environment_variables.sh
 envars.sh
 test
 *.DS_Store
-deploy/
+deploy/
+*venv/

gwtm-helm/fastapi-README.md

@@ -0,0 +1,81 @@
+{{- /* This file is for documentation only and should not be processed as a template */ -}}
+# FastAPI Helm Templates
+
+These templates are used to deploy the FastAPI backend service of the GWTM application.
+
+## Templates
+
+- `deployment.yaml`: Defines the Kubernetes Deployment for the FastAPI service.
+- `service.yaml`: Defines the Kubernetes Service for the FastAPI service.
+- `configmap.yaml`: Contains configuration data for the FastAPI service.
+
+## Configuration
+
+Configuration for the FastAPI service is defined in the `values.yaml` file under the `fastapi` key:
+
+```yaml
+fastapi:
+  name: fastapi-backend
+  replicas: 2
+  image:
+    repository: gwtm-fastapi
+    tag: latest
+    pullPolicy: IfNotPresent
+  service:
+    port: 8000
+    targetPort: 8000
+  readinessProbe:
+    enabled: true
+    path: /docs
+    initialDelaySeconds: 10
+    periodSeconds: 5
+  livenessProbe:
+    enabled: true
+    path: /docs
+    initialDelaySeconds: 30
+    periodSeconds: 15
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 200m
+      memory: 256Mi
+```
+
+## Ingress Configuration
+
+The FastAPI service is exposed through the following routes in the Ingress:
+
+- `/api/v1/*`: API endpoints
+- `/docs`: Swagger UI documentation
+- `/redoc`: ReDoc documentation
+- `/openapi.json`: OpenAPI schema
+- `/health`: Health check endpoint
+
+## Environment Variables
+
+The FastAPI service uses environment variables from the `secrets.yaml` template, which includes:
+
+- Database credentials
+- Mail configuration
+- AWS/Azure credentials
+- Other application-specific settings
+
+## Usage
+
+To deploy the FastAPI service, include these templates in your Helm installation:
+
+```bash
+helm install gwtm ./gwtm-helm
+```
+
+You can customize the deployment by overriding values:
+
+```bash
+helm install gwtm ./gwtm-helm --set fastapi.replicas=3 --set fastapi.image.tag=v1.0.0
+```
+
+## Health Checks
+
+The FastAPI service includes readiness and liveness probes that check the `/docs` endpoint to verify that the service is running correctly.

gwtm-helm/restore-db

@@ -20,6 +20,7 @@ kubectl cp $DUMP_FILE $POSTGRES_POD:/tmp/dump.sql -n $NAMESPACE
 
 # Execute restore
 echo "Restoring database..."
+
 kubectl -n $NAMESPACE exec -it $POSTGRES_POD -- bash -c "PGPASSWORD=$DB_PASSWORD psql -U $DB_USER -f /tmp/dump.sql -a" 
 
 echo "Restore completed!"

gwtm-helm/skaffold.yaml

@@ -1,59 +1,82 @@
-apiVersion: skaffold/v2beta28
+apiVersion: skaffold/v4beta13
 kind: Config
 metadata:
   name: gwtm
 build:
+  artifacts:
+    - image: gwtm
+      context: ..
+      docker: {}
+    - image: gwtm-fastapi
+      context: ..
+      docker:
+        dockerfile: server/Dockerfile
   local:
     push: false
-  artifacts:
-  - image: gwtm
-    context: ..
-    docker:
-      dockerfile: Dockerfile
+manifests:
+  helm:
+    releases:
+      - name: gwtm
+        chartPath: .
+        valuesFiles:
+          - values-dev.yaml
+        setValues:
+          backend.image.repository: gwtm
+          backend.image.tag: latest
+          backend.livenessProbe.enabled: "true"
+          backend.readinessProbe.enabled: "true"
+          cache.livenessProbe.enabled: "true"
+          cache.persistence.enabled: "false"
+          cache.readinessProbe.enabled: "true"
+          database.initScripts.enabled: "true"
+          database.livenessProbe.enabled: "true"
+          database.persistence.enabled: "false"
+          database.readinessProbe.enabled: "true"
+          global.createNamespace: "true"
+          global.namespace: gwtm
+        createNamespace: true
+        wait: true
+        upgradeOnChange: true
 deploy:
   helm:
     releases:
-    - name: gwtm
-      chartPath: .
-      createNamespace: true
-      valuesFiles:
-      - values-dev.yaml
-      setValues:
-        global.namespace: gwtm
-        global.createNamespace: true
-
-        # Database values
-        database.initScripts.enabled: true
-        database.livenessProbe.enabled: true
-        database.readinessProbe.enabled: true
-        database.persistence.enabled: false
-
-        # Cache values
-        cache.livenessProbe.enabled: true
-        cache.readinessProbe.enabled: true
-        cache.persistence.enabled: false
-
-        # Backend values
-        backend.readinessProbe.enabled: true
-        backend.livenessProbe.enabled: true
-
-        # Image settings
-        backend.image.repository: gwtm
-        backend.image.tag: latest
-      wait: true
-      upgradeOnChange: true
+      - name: gwtm
+        chartPath: .
+        valuesFiles:
+          - values-dev.yaml
+        setValues:
+          backend.image.repository: gwtm
+          backend.image.tag: latest
+          backend.livenessProbe.enabled: "true"
+          backend.readinessProbe.enabled: "true"
+          cache.livenessProbe.enabled: "true"
+          cache.persistence.enabled: "false"
+          cache.readinessProbe.enabled: "true"
+          database.initScripts.enabled: "true"
+          database.livenessProbe.enabled: "true"
+          database.persistence.enabled: "false"
+          database.readinessProbe.enabled: "true"
+          global.createNamespace: "true"
+          global.namespace: gwtm
+        createNamespace: true
+        wait: true
+        upgradeOnChange: true
 portForward:
-# Direct backend access on local port 8080
-- resourceType: service
-  resourceName: flask-backend
-  namespace: gwtm
-  port: 8080
-  localPort: 8080
-  address: 0.0.0.0
-# Frontend on local port 8081  
-- resourceType: service
-  resourceName: frontend
-  namespace: gwtm
-  port: 80
-  localPort: 8081
-  address: 0.0.0.0
+  - resourceType: service
+    resourceName: flask-backend
+    namespace: gwtm
+    port: 8080
+    address: 0.0.0.0
+    localPort: 8080
+  - resourceType: service
+    resourceName: frontend
+    namespace: gwtm
+    port: 80
+    address: 0.0.0.0
+    localPort: 8081
+  - resourceType: service
+    resourceName: fastapi-backend
+    namespace: gwtm
+    port: 8000
+    address: 0.0.0.0
+    localPort: 8000

gwtm-helm/start-dev.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Remove namespace if it exists
+kubectl delete namespace gwtm
+
+# Create namespace if it doesn't exist
+#kubectl create namespace gwtm 2>/dev/null || true
+
+# Clean up any existing deployments
+kubectl delete deployment -n gwtm --all 2>/dev/null || true
+
+# Run skaffold with simple options
+echo "Starting skaffold development environment..."
+skaffold dev

gwtm-helm/templates/backend/create-database-tables.yaml

@@ -0,0 +1,72 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: database-setup
+  namespace: {{ .Values.global.namespace }}
+  labels:
+    {{- include "gwtm.labels" . | nindent 4 }}
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: wait-for-db
+        image: postgres:14-alpine
+        command: ['sh', '-c', 'echo "Waiting for database to be ready...";
+                 until pg_isready -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME}; do
+                 echo "$(date) - Waiting for database at ${DB_HOST}:${DB_PORT}...";
+                 sleep 5;
+                 done;
+                 echo "Database is ready!"']
+        env:
+        - name: DB_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-user
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-password
+        - name: DB_NAME
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-name
+        - name: DB_HOST
+          value: {{ .Values.database.name }}
+        - name: DB_PORT
+          value: "{{ .Values.database.service.port }}"
+        - name: PGPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-password
+      containers:
+      - name: db-setup
+        image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}"
+        command: ["python", "-c"]
+        args:
+          - |
+            from src.models import create_database_tables; create_database_tables()
+        env:
+        - name: DB_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-user
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-password
+        - name: DB_NAME
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.global.useGeneratedSecrets }}{{ .Release.Name }}-secrets{{ else }}gwtm-secrets{{ end }}
+              key: db-name
+        - name: DB_HOST
+          value: {{ .Values.database.name }}
+        - name: DB_PORT
+          value: "{{ .Values.database.service.port }}"
+      restartPolicy: OnFailure

gwtm-helm/templates/fastapi/configmap.yaml

@@ -0,0 +1,15 @@
+# templates/fastapi/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.fastapi.name }}-config
+  namespace: {{ .Values.global.namespace }}
+  labels:
+    {{- include "gwtm.labels" . | nindent 4 }}
+    app: {{ .Values.fastapi.name }}
+data:
+  APP_NAME: "GWTM FastAPI"
+  DEBUG: "{{ .Values.global.environment | eq "development" | ternary "True" "False" }}"
+  CORS_ORIGINS: "{{ .Values.ingress.host }}"
+  BASE_URL: "https://{{ .Values.ingress.host }}"
+  # Add any additional configuration for FastAPI here