Merge branch 'master' into salka1988/add_update

# Conflicts: # helm/fuel-subgraph/templates/pvc.yaml
FuelLabs · Apr 22, 2024 · 81d3ab1 · 81d3ab1
2 parents 6674747 + 52fe08d
commit 81d3ab1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/helm/fuel-subgraph/templates/deployment.yaml b/helm/fuel-subgraph/templates/deployment.yaml
@@ -45,13 +45,13 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
-            - name: firehose_port1
+            - name: firehose-port-1
               containerPort: {{ .Values.firehose.port1 }}
               protocol: TCP
-            - name: firehose_port2
+            - name: firehose-port-2
               containerPort: {{ .Values.firehose.port2 }}
               protocol: TCP
-            - name: firehose_port3
+            - name: firehose-port-3
               containerPort: {{ .Values.firehose.port3 }}
               protocol: TCP
           livenessProbe:
@@ -62,7 +62,7 @@ spec:
             periodSeconds: 5
             timeoutSeconds: 10
           volumeMounts:
-            - name: {{ include "fuel-subgraph.fullname" . }}
+            - name: fuel-subgraph-vol
               mountPath: "/mnt/db"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
@@ -81,4 +81,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/helm/fuel-subgraph/templates/pvc.yaml b/helm/fuel-subgraph/templates/pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "fuel-subgraph.fullname" . }}
+  labels: {{- include "fuel-subgraph.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - {{ .Values.app.volume.accessmodes }}
+  resources:
+    requests:
+      storage: {{ .Values.app.volume.storagerequests }}
+  storageClassName: {{ .Values.app.volume.storageclass }}
diff --git a/helm/fuel-subgraph/templates/service.yaml b/helm/fuel-subgraph/templates/service.yaml
@@ -1,25 +1,25 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: { { include "fuel-subgraph.fullname" . } }
-  labels: { { - include "fuel-subgraph.labels" . | nindent 4 } }
+  name: {{ include "fuel-subgraph.fullname" . }}
+  labels: {{- include "fuel-subgraph.labels" . | nindent 4 }}
 spec:
-  type: { { .Values.service.type } }
+  type: {{ .Values.service.type }}
   ports:
-    - port: { { .Values.service.port } }
+    - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
-    - port: { { .Values.firehose.port1 } }
-      targetPort: firehose_port1
+    - port: {{ .Values.firehose.port1 }}
+      targetPort: firehose-port-1
       protocol: TCP
-      name: firehose_port1
-    - port: { { .Values.firehose.port2 } }
-      targetPort: firehose_port2
+      name: firehose-port-1
+    - port: {{ .Values.firehose.port2 }}
+      targetPort: firehose-port-2
       protocol: TCP
-      name: firehose_port2
-    - port: { { .Values.firehose.port3 } }
-      targetPort: firehose_port3
+      name: firehose-port-2
+    - port: {{ .Values.firehose.port3 }}
+      targetPort: firehose-port-3
       protocol: TCP
-      name: firehose_port3
-  selector: { { - include "fuel-subgraph.selectorLabels" . | nindent 4 } }
+      name: firehose-port-3
+  selector: {{- include "fuel-subgraph.selectorLabels" . | nindent 4 }}