Merge pull request #84 from mohammadll/remove-db

Remove db from docker-compose and Helm chart

Author: mohammadll

docker-compose.yml

@@ -1,12 +1,6 @@
 version: '3.6'
 
-x-common-variables: &common-variables
-    MONGO_INITDB_DATABASE: testdb
-    MONGO_INITDB_ROOT_USERNAME: admin
-    MONGO_INITDB_ROOT_PASSWORD: admin
-
 services:
-        
   web:
     build: .
     image: 81318131/fastapi_gpt
@@ -15,23 +9,7 @@ services:
     volumes:
       - './app:/code/app'
     environment:
-      <<: *common-variables
       OPENAI_API_KEY: ${KEY:-}
       TEST: ${TEST:-}
-      MONGO_HOST: mongo_gpt
-      MONGO_PORT: 27017
-
     ports:
       - "80:80"
-   
-   
-  
-  mongo:
-    image: mongo
-    container_name: mongo_gpt
-    restart: always
-    volumes:
-      - './data:/data/db'
-    ports:
-      - "27017:27017"
-    environment: *common-variables

helm/templates/app/_helpers.tpl

@@ -0,0 +1,17 @@
+{{- define "app.labels" -}}
+app: {{ .Chart.Name }}
+component: gpt-app
+release: {{ .Release.Name }}
+{{- end -}}
+
+{{- define "app.deploymentName" -}}
+{{ .Release.Name }}-app-deployment
+{{- end -}}
+
+{{- define "app.serviceName" -}}
+{{ .Release.Name }}-app-service
+{{- end -}}
+
+{{- define "app.secretName" -}}
+{{ .Release.Name }}-app-secret
+{{- end -}}

helm/templates/app/deployment.yaml

@@ -0,0 +1,32 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "app.deploymentName" . }}
+  labels:
+    {{- include "app.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.app.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "app.labels" . | nindent 8 }}
+  template:
+    metadata:
+      labels:
+        {{- include "app.labels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: {{ include "app.deploymentName" . }}
+          image: {{ .Values.app.image.repository }}:{{ .Values.app.image.tag }}
+          command: ["fastapi", "run", "app/main.py", "--port", "8080"]
+          ports:
+            - containerPort: {{ .Values.app.service.targetPort }}
+          envFrom:
+            - secretRef:
+                name: {{ include "app.secretName" . }}
+      {{- if .Values.app.nodeSelector }}
+      nodeSelector: {{ .Values.app.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
+
+      {{- if .Values.app.affinity }}
+      affinity: {{ .Values.app.affinity | toYaml | nindent 8 }}
+      {{- end }}

helm/templates/app/secret.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "app.secretName" . }}
+  labels:
+    {{- include "app.labels" . | nindent 4 }}
+type: Opaque
+data:
+{{- range $key, $value := .Values.app.environment }}
+  {{ $key }}: {{ $value | b64enc | quote }}
+{{- end }}

helm/templates/app/service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "app.serviceName" . }}
+  labels:
+    {{- include "app.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.app.service.type }}
+  ports:
+    - port: {{ .Values.app.service.port }}
+      targetPort: {{ .Values.app.service.targetPort }}
+      protocol: {{ .Values.app.service.protocol }}
+      {{- if eq .Values.app.service.type "NodePort" }}
+      nodePort: {{ .Values.app.service.nodePort }}
+      {{- end }}
+  selector:
+    {{- include "app.labels" . | nindent 4 }}