Skip to content

Commit

Permalink
fix mandatory param
Browse files Browse the repository at this point in the history
  • Loading branch information
andreiionutdamian committed Feb 8, 2024
1 parent ca91609 commit c2eb01c
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 63 deletions.
10 changes: 10 additions & 0 deletions demo-ai-app/.secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#secret for pg
apiVersion: v1
kind: Secret
metadata:
name: demo-ai-app-secrets
namespace: demo-ai-app
type: Opaque
data:
postgres-password:
redis-password:
13 changes: 13 additions & 0 deletions demo-ai-app/configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
#configs for pg
apiVersion: v1
kind: ConfigMap
metadata:
name: demo-ai-app-config
namespace: demo-ai-app
data:
POSTGRES_DB: postgresdb
POSTGRES_USER: pguser
redis.conf: |
maxmemory 256mb
maxmemory-policy allkeys-lru
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: demo-ecosystem
name: demo-ai-app
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: PersistentVolume
metadata:
name: pg-pv-nfs
namespace: demo-ecosystem
namespace: demo-ai-app
spec:
capacity:
storage: 3Gi
Expand All @@ -21,7 +21,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: pg-pvc
namespace: demo-ecosystem
namespace: demo-ai-app
spec:
storageClassName: nfs
accessModes:
Expand All @@ -31,34 +31,12 @@ spec:
storage: 3Gi
volumeName: pg-pv-nfs
---
#secret for pg
apiVersion: v1
kind: Secret
metadata:
name: pg-secret
namespace: demo-ecosystem
type: Opaque
data:
POSTGRES_PASSWORD: cGdwYXNzd29yZA==
---
#configs for pg
apiVersion: v1
kind: ConfigMap
metadata:
name: pg-config
namespace: demo-ecosystem
labels:
app: postgres
data:
POSTGRES_DB: postgresdb
POSTGRES_USER: pguser
---
# pg deployment
apiVersion: apps/v1
kind: Deployment
metadata:
name: postgres
namespace: demo-ecosystem
namespace: demo-ai-app
spec:
replicas: 1
selector:
Expand All @@ -81,25 +59,25 @@ spec:
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: pg-secret
key: POSTGRES_PASSWORD
name: demo-ai-app-secrets
key: postgres-password
- name: POSTGRES_DB
valueFrom:
configMapKeyRef:
name: pg-config
name: demo-ai-app-config
key: POSTGRES_DB
- name: POSTGRES_USER
valueFrom:
configMapKeyRef:
name: pg-config
name: demo-ai-app-config
key: POSTGRES_USER
volumeMounts:
- mountPath: /var/lib/postgresql/data
subPath: pg
readOnly: false
name: pg-storage
name: pg-volume
volumes:
- name: pg-storage
- name: pg-volume
persistentVolumeClaim:
claimName: pg-pvc
---
Expand All @@ -108,7 +86,7 @@ apiVersion: v1
kind: Service
metadata:
name: postgres
namespace: demo-ecosystem
namespace: demo-ai-app
labels:
app: postgres
spec:
Expand Down
32 changes: 8 additions & 24 deletions demo-ecosystem/deploy_redis.yaml → demo-ai-app/deploy_redis.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
#secret for redis
apiVersion: v1
kind: Secret
metadata:
name: redis-secret
namespace: demo-ecosystem
type: Opaque
data:
redis-password: cmVkaXNwYXNzd29yZA==
---
#config for redis
apiVersion: v1
kind: ConfigMap
metadata:
name: redis-config
namespace: demo-ecosystem
data:
redis.conf: |
maxmemory 256mb
maxmemory-policy allkeys-lru
---
#redis deployment
apiVersion: apps/v1
kind: Deployment
Expand All @@ -38,26 +17,31 @@ spec:
containers:
- name: redis
image: redis:alpine
command: ["redis-server", "/conf/redis.conf", "--requirepass", "$(REDIS_PASSWORD)"]
ports:
- containerPort: 6379
env:
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: redis-secret
key: redis-password
command: ["redis-server", "/conf/redis.conf", "--requirepass", "$(REDIS_PASSWORD)"]
ports:
- containerPort: 6379
volumeMounts:
- name: config
mountPath: /conf
readOnly: true
- name: redis-data
mountPath: /data
readOnly: false
volumes:
- name: config
configMap:
name: redis-config
items:
- key: redis.conf
path: redis.conf
- name: redis-data
emptyDir: {}
---
#redis service
apiVersion: v1
Expand Down
16 changes: 10 additions & 6 deletions demo-basic-fastapi/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@

ROUTE1 = AppPaths.PATH_ROOT['PATH']
@router1.get(ROUTE1)
async def root(parameter: str = Query(...)):
return engine.handle_request(ROUTE1, parameter=parameter)
# async def root(data: str = Query(...)): # this makes the `data` parameter mandatory
async def root(data: str = None):
print("Received request for root with params: ", data)
return engine.handle_request(ROUTE1, parameter=data)

ROUTE2 = AppPaths.PATH_STAT['PATH']
@router1.get(ROUTE2)
async def stat(parameter: str = Query(...)):
return engine.handle_request(ROUTE2, parameter=parameter)
async def stat(data: str = None):
print("Received request for stat with params: ", data)
return engine.handle_request(ROUTE2, parameter=data)

# note: this is a catch-all route, so it should be the last route in the router
@router1.get("/{full_path:path}", include_in_schema=False)
async def catch_all(full_path: str, parameter: str = Query(...)):
return engine.handle_request(full_path, parameter=parameter)
async def catch_all(full_path: str, data: str = None):
print("Received request for catch-all with params: ", data)
return engine.handle_request(full_path, parameter=data)


app.include_router(router1)

0 comments on commit c2eb01c

Please sign in to comment.