Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes #870

yuhongsun96 · 2023-12-24T21:07:03Z

sweep-ai · 2023-12-24T21:07:11Z

🚀 Here's the PR! #871

See Sweep's progress at the progress dashboard!

⚡ Sweep Basic Tier: I'm using GPT-4. You have 5 GPT-4 tickets left for the month and 3 for the day. (tracking ID: c1cac6620b)

For more GPT-4 tickets, visit our payment portal. For a one week free trial, try Sweep Pro (unlimited GPT-4 tickets).

Install Sweep Configs: Pull Request

Actions (click)

↻ Restart Sweep

Sandbox Execution ✓

Here are the sandbox execution logs prior to making any changes:

Sandbox logs for 00c1f93

Checking deployment/kubernetes/api_server-service-deployment.yaml for syntax errors... ✅ deployment/kubernetes/api_server-service-deployment.yaml has no syntax errors! 1/1 ✓
Checking deployment/kubernetes/api_server-service-deployment.yaml for syntax errors...
✅ deployment/kubernetes/api_server-service-deployment.yaml has no syntax errors!

Sandbox passed on the latest main, so sandbox checks will be enabled for this issue.

Step 1: 🔎 Searching

I found the following snippets in your repository. I will now analyze these snippets and come up with a plan.

Some code snippets I think are relevant in decreasing order of relevance (click to expand). If some file is missing from here, you can mention the path in the ticket description.

Step 2: ⌨️ Coding

Create deployment/kubernetes/Chart.yaml ✓ 4e94a7b Edit

Create deployment/kubernetes/Chart.yaml with contents:
• Create a new file named `Chart.yaml` in the `deployment/kubernetes` directory.
• This file will contain metadata about the chart such as the name, description, version, and appVersion.
• The name will be `danswer`, description will be `A Helm chart for Kubernetes`, version and appVersion will be `1.0.0`.

Running GitHub Actions for deployment/kubernetes/Chart.yaml ✓ Edit

Check deployment/kubernetes/Chart.yaml with contents:
Ran GitHub Actions for 4e94a7bf15cd2725bbe07558af5a4ad41255da2c:
• Vercel Preview Comments: ✓

Create deployment/kubernetes/values.yaml ✓ eb72bb6 Edit

Create deployment/kubernetes/values.yaml with contents:
• Create a new file named `values.yaml` in the `deployment/kubernetes` directory.
• This file will contain default configuration values for this chart. It will include values for each service/deployment such as replica count, image, service type, port, etc.
• The values will be extracted from the existing Kubernetes yaml files.

Running GitHub Actions for deployment/kubernetes/values.yaml ✓ Edit

Check deployment/kubernetes/values.yaml with contents:
Ran GitHub Actions for eb72bb6ae9ff81046393f78013c63f4929494a5c:
• Vercel Preview Comments: ✓

Create deployment/kubernetes/templates ✓ 1a40e68 Edit

Create deployment/kubernetes/templates with contents:
• Create a new directory named `templates` in the `deployment/kubernetes` directory.
• This directory will contain the Kubernetes yaml files, each representing a different service/deployment.

Running GitHub Actions for deployment/kubernetes/templates ✓ Edit

Check deployment/kubernetes/templates with contents:
Ran GitHub Actions for 1a40e68b2e6b14453ca6fe51d74a19af8ccc1861:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/api_server-service-deployment.yaml ✓ 2f97e5d Edit

Modify deployment/kubernetes/api_server-service-deployment.yaml with contents:
• Move the `api_server-service-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,23 +1,23 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: api-server-service
+  name: {{ include "danswer.fullname" . }}-api-server
 spec:
   selector:
     app: api-server
   ports:
-    - name: api-server-port
+    - name: http
       protocol: TCP
-      port: 80
-      targetPort: 8080
-  type: ClusterIP
+      port: {{ .Values.apiServer.service.port }}
+      targetPort: {{ .Values.apiServer.containerPort }}
+  type: {{ .Values.apiServer.service.type }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: api-server-deployment
+  name: {{ include "danswer.fullname" . }}-api-server
 spec:
-  replicas: 1
+  replicas: {{ .Values.apiServer.replicaCount }}
   selector:
     matchLabels:
       app: api-server
@@ -28,8 +28,8 @@
     spec:
       containers:
       - name: api-server
-        image: danswer/danswer-backend:latest
-        imagePullPolicy: IfNotPresent
+        image: "{{ .Values.apiServer.image.repository }}:{{ .Values.apiServer.image.tag }}"
+        imagePullPolicy: {{ .Values.apiServer.image.pullPolicy }}
         command:
           - "/bin/sh"
           - "-c"
@@ -38,7 +38,7 @@
             echo "Starting Danswer Api Server" &&
             uvicorn danswer.main:app --host 0.0.0.0 --port 8080
         ports:
-        - containerPort: 8080
+        - containerPort: {{ .Values.apiServer.containerPort }}
         # There are some extra values since this is shared between services
         # There are no conflicts though, extra env variables are simply ignored
         envFrom:

Running GitHub Actions for deployment/kubernetes/api_server-service-deployment.yaml ✓ Edit

Check deployment/kubernetes/api_server-service-deployment.yaml with contents:
Ran GitHub Actions for 2f97e5dc258c1e7121687e4a23b23369f81bef74:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/background-deployment.yaml ✓ 3bb7504 Edit

Modify deployment/kubernetes/background-deployment.yaml with contents:
• Move the `background-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,9 +1,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: background-deployment
+  name: {{ include "danswer.fullname" . }}-background
 spec:
-  replicas: 1
+  replicas: {{ .Values.background.replicaCount }}
   selector:
     matchLabels:
       app: background
@@ -14,14 +14,14 @@
     spec:
       containers:
       - name: background
-        image: danswer/danswer-backend:latest
-        imagePullPolicy: IfNotPresent
+        image: "{{ .Values.background.image.repository }}:{{ .Values.background.image.tag }}"
+        imagePullPolicy: {{ .Values.background.image.pullPolicy }}
         command: ["/usr/bin/supervisord"]
         # There are some extra values since this is shared between services
         # There are no conflicts though, extra env variables are simply ignored
         envFrom:
         - configMapRef:
-            name: env-configmap
+            name: {{ include "danswer.configmapName" . }}
         volumeMounts:
         - name: dynamic-storage
           mountPath: /home/storage
@@ -30,7 +30,7 @@
       volumes:
       - name: dynamic-storage
         persistentVolumeClaim:
-          claimName: dynamic-pvc
+          claimName: {{ .Values.dynamicStorage.claimName }}
       - name: file-connector-storage
         persistentVolumeClaim:
-          claimName: file-connector-pvc
+          claimName: {{ .Values.fileConnectorStorage.claimName }}

Running GitHub Actions for deployment/kubernetes/background-deployment.yaml ✓ Edit

Check deployment/kubernetes/background-deployment.yaml with contents:
Ran GitHub Actions for 3bb750455209cca5d7a8824b7f0c5055bfcd6552:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/nginx-service-deployment.yaml ✓ eb5407a Edit

Modify deployment/kubernetes/nginx-service-deployment.yaml with contents:
• Move the `nginx-service-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,27 +1,27 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: nginx-service
+  name: {{ include "danswer.fullname" . }}-nginx
 spec:
   selector:
     app: nginx
   ports:
     - name: http
       protocol: TCP
-      port: 80
-      targetPort: 80
+      port: {{ .Values.nginx.service.port }}
+      targetPort: {{ .Values.nginx.service.port }}
     - name: danswer
       protocol: TCP
       port: 3000
       targetPort: 80
-  type: LoadBalancer
+  type: {{ .Values.nginx.service.type }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: nginx-deployment
+  name: {{ include "danswer.fullname" . }}-nginx
 spec:
-  replicas: 1
+  replicas: {{ .Values.nginx.replicaCount }}
   selector:
     matchLabels:
       app: nginx
@@ -32,14 +32,14 @@
     spec:
       containers:
       - name: nginx
-        image: nginx:1.23.4-alpine
+        image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}"
         ports:
         - containerPort: 80
         env:
         - name: DOMAIN
           valueFrom:
             configMapKeyRef:
-              name: env-configmap
+              name: {{ include "danswer.configmapName" . }}
               key: DOMAIN
         volumeMounts:
         - name: nginx-conf
@@ -52,4 +52,4 @@
       volumes:
       - name: nginx-conf
         configMap:
-          name: nginx-configmap
+          name: {{ include "danswer.configmapName" . }}

Running GitHub Actions for deployment/kubernetes/nginx-service-deployment.yaml ✓ Edit

Check deployment/kubernetes/nginx-service-deployment.yaml with contents:
Ran GitHub Actions for eb5407a599f7b16e5b060cb000b71440051c07b5:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/postgres-service-deployment.yaml ✓ bc07344 Edit

Modify deployment/kubernetes/postgres-service-deployment.yaml with contents:
• Move the `postgres-service-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,23 +1,23 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: relational-db-service
+  name: {{ include "danswer.fullname" . }}-postgres
 spec:
   selector:
     app: relational-db
   ports:
     - protocol: TCP
-      port: 5432
-      targetPort: 5432
+      port: {{ .Values.postgres.service.port }}
+      targetPort: {{ .Values.postgres.service.targetPort }}
   clusterIP: None
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: relational-db-statefulset
+  name: {{ include "danswer.fullname" . }}-postgres
 spec:
-  serviceName: relational-db-service
-  replicas: 1
+  serviceName: {{ include "danswer.fullname" . }}-postgres
+  replicas: {{ .Values.postgres.replicaCount }}
   selector:
     matchLabels:
       app: relational-db
@@ -28,7 +28,7 @@
     spec:
       containers:
       - name: relational-db
-        image: postgres:15.2-alpine
+        image: "{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}"
         env:
         - name: POSTGRES_USER
           valueFrom:
@@ -41,7 +41,7 @@
               name: danswer-secrets
               key: postgres_password
         ports:
-        - containerPort: 5432
+        - containerPort: {{ .Values.postgres.containerPort }}
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
           name: db-storage
@@ -54,4 +54,4 @@
       resources:
         requests:
           # Adjust the storage request size as needed.
-          storage: 1Gi
+          storage: {{ .Values.postgres.persistence.size }}

Running GitHub Actions for deployment/kubernetes/postgres-service-deployment.yaml ✓ Edit

Check deployment/kubernetes/postgres-service-deployment.yaml with contents:
Ran GitHub Actions for bc07344e545dd4d5a3dfeb6b6e6097cfbdab82ea:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/vespa-service-deployment.yaml ✓ e98ecd4 Edit

Modify deployment/kubernetes/vespa-service-deployment.yaml with contents:
• Move the `vespa-service-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: document-index-service
+  name: {{ include "danswer.fullname" . }}-vespa
 spec:
   selector:
     app: vespa
   ports:
     - name: vespa-tenant-port
       protocol: TCP
-      port: 19071
-      targetPort: 19071
+      port: {{ .Values.vespa.service.port }}
+      targetPort: {{ .Values.vespa.service.targetPort }}
     - name: vespa-port
       protocol: TCP
       port: 8081
@@ -23,7 +23,7 @@
   labels:
     app: vespa
 spec:
-  replicas: 1
+  replicas: {{ .Values.vespa.replicaCount }}
   serviceName: vespa
   selector:
     matchLabels:
@@ -35,14 +35,14 @@
     spec:
       containers:
       - name: vespa
-        image: vespaengine/vespa:8.277.17
+        image: "{{ .Values.vespa.image.repository }}:{{ .Values.vespa.image.tag }}"
         imagePullPolicy: IfNotPresent
         securityContext:
           privileged: true
           runAsUser: 0
         ports:
-        - containerPort: 19071
-        - containerPort: 8081
+        - containerPort: {{ .Values.vespa.containerPort }}
+        - containerPort: {{ .Values.vespa.secondContainerPort }}
         readinessProbe:
           httpGet:
             path: /state/v1/health
@@ -60,4 +60,4 @@
       resources:
         requests:
           # Adjust the storage request size as needed.
-          storage: 1Gi
+          storage: {{ .Values.vespa.persistence.size }}

Running GitHub Actions for deployment/kubernetes/vespa-service-deployment.yaml ✓ Edit

Check deployment/kubernetes/vespa-service-deployment.yaml with contents:
Ran GitHub Actions for e98ecd429d9a81df37ca1e43955d1901e8ac89f4:
• Vercel Preview Comments: ✓

Modify deployment/kubernetes/web_server-service-deployment.yaml ✓ 4bb237b Edit

Modify deployment/kubernetes/web_server-service-deployment.yaml with contents:
• Move the `web_server-service-deployment.yaml` file to the `templates` directory.
• Modify the file to use the values from `values.yaml` instead of hard-coded values.

--- 
+++ 
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: web-server-service
+  name: {{ include "danswer.fullname" . }}-web-server
 spec:
   selector:
     app: web-server
   ports:
     - protocol: TCP
-      port: 80
-      targetPort: 3000
-  type: ClusterIP
+      port: {{ .Values.webServer.service.port }}
+      targetPort: {{ .Values.webServer.containerPort }}
+  type: {{ .Values.webServer.service.type }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: web-server-deployment
+  name: {{ include "danswer.fullname" . }}-web-server
 spec:
-  replicas: 1
+  replicas: {{ .Values.webServer.replicaCount }}
   selector:
     matchLabels:
       app: web-server
@@ -27,12 +27,12 @@
     spec:
       containers:
       - name: web-server
-        image: danswer/danswer-web-server:latest
-        imagePullPolicy: IfNotPresent
+        image: "{{ .Values.webServer.image.repository }}:{{ .Values.webServer.image.tag }}"
+        imagePullPolicy: {{ .Values.webServer.image.pullPolicy }}
         ports:
-        - containerPort: 3000
+        - containerPort: {{ .Values.webServer.containerPort }}
         # There are some extra values since this is shared between services
         # There are no conflicts though, extra env variables are simply ignored
         envFrom:
         - configMapRef:
-            name: env-configmap
+            name: {{ include "danswer.configmapName" . }}

Running GitHub Actions for deployment/kubernetes/web_server-service-deployment.yaml ✓ Edit

Check deployment/kubernetes/web_server-service-deployment.yaml with contents:
Ran GitHub Actions for 4bb237b536a6bdd659ae3d38b2366a8a4f4bafbb:
• Vercel Preview Comments: ✓

Create deployment/kubernetes/NOTES.txt ✓ 49fc6b3 Edit

Create deployment/kubernetes/NOTES.txt with contents:
• Create a new file named `NOTES.txt` in the `deployment/kubernetes` directory.
• This file will contain short, plain text "getting started" instructions for the user after the chart is installed.

Running GitHub Actions for deployment/kubernetes/NOTES.txt ✓ Edit

Check deployment/kubernetes/NOTES.txt with contents:
Ran GitHub Actions for 49fc6b339b0c711fb3762771ada861b5d8eeeeb8:
• Vercel Preview Comments: ✓

Step 3: 🔁 Code Review

I have finished reviewing the code for completeness. I did not find errors for sweep/write_a_helm_chart_for_all_of_the_kubern.

🎉 Latest improvements to Sweep:

We just released a dashboard to track Sweep's progress on your issue in real-time, showing every stage of the process – from search to planning and coding.
Sweep uses OpenAI's latest Assistant API to plan code changes and modify code! This is 3x faster and significantly more reliable as it allows Sweep to edit code and validate the changes in tight iterations, the same way as a human would.
Try using the GitHub issues extension to create Sweep issues directly from your editor! GitHub Issues and Pull Requests.

💡 To recreate the pull request edit the issue title or description. To tweak the pull request, leave a comment on the pull request.
^{Join Our Discord}

sweep-ai bot added the sweep label Dec 24, 2023

sweep-ai bot mentioned this issue Dec 24, 2023

Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes (✓ Sandbox Passed) #871

Closed

2 tasks

yuhongsun96 closed this as completed Jan 8, 2024

sebracs mentioned this issue Jan 22, 2024

Feature: Support danswer releases through helm charts #971

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes #870

Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes #870

yuhongsun96 commented Dec 24, 2023 •

edited by sweep-ai bot

Loading

sweep-ai bot commented Dec 24, 2023 •

edited

Loading

🚀 Here's the PR! #871

Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes #870

Sweep: write a helm chart for all of the kubernetes files in deployment/kubernetes #870

Comments

yuhongsun96 commented Dec 24, 2023 • edited by sweep-ai bot Loading

sweep-ai bot commented Dec 24, 2023 • edited Loading

🚀 Here's the PR! #871

Actions (click)

Sandbox Execution ✓

Step 1: 🔎 Searching

Step 2: ⌨️ Coding

Step 3: 🔁 Code Review

🎉 Latest improvements to Sweep:

yuhongsun96 commented Dec 24, 2023 •

edited by sweep-ai bot

Loading

sweep-ai bot commented Dec 24, 2023 •

edited

Loading