From 0dcd63aefcb2b0a86b5381137f751e61a469e4a6 Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Fri, 19 Apr 2024 21:54:42 -0400 Subject: [PATCH 1/4] Update pvc.yaml (#38) --- helm/fuel-subgraph/templates/pvc.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/fuel-subgraph/templates/pvc.yaml b/helm/fuel-subgraph/templates/pvc.yaml index aee7fb6..c7fb44b 100644 --- a/helm/fuel-subgraph/templates/pvc.yaml +++ b/helm/fuel-subgraph/templates/pvc.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolumeClaim 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: accessModes: - - { { .Values.app.volume.accessmodes } } + - {{ .Values.app.volume.accessmodes }} resources: requests: - storage: { { .Values.app.volume.storagerequests } } - storageClassName: { { .Values.app.volume.storageclass } } + storage: {{ .Values.app.volume.storagerequests }} + storageClassName: {{ .Values.app.volume.storageclass }} From 882c229330417de9d143eba8483dd87c5a9a1363 Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:53:03 -0400 Subject: [PATCH 2/4] fix more helm indentation issues (#39) --- helm/fuel-subgraph/templates/service.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/fuel-subgraph/templates/service.yaml b/helm/fuel-subgraph/templates/service.yaml index 7ab1517..f0ea4c5 100644 --- 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 } } + - port: {{ .Values.firehose.port1 }} targetPort: firehose_port1 protocol: TCP name: firehose_port1 - - port: { { .Values.firehose.port2 } } + - port: {{ .Values.firehose.port2 }} targetPort: firehose_port2 protocol: TCP name: firehose_port2 - - port: { { .Values.firehose.port3 } } + - port: {{ .Values.firehose.port3 }} targetPort: firehose_port3 protocol: TCP name: firehose_port3 - selector: { { - include "fuel-subgraph.selectorLabels" . | nindent 4 } } + selector: {{- include "fuel-subgraph.selectorLabels" . | nindent 4 }} From ebe88ee7299e288a869026d28ea7fd87bdc9f5fa Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Sat, 20 Apr 2024 00:39:18 -0400 Subject: [PATCH 3/4] update service port names (#40) --- helm/fuel-subgraph/templates/deployment.yaml | 8 ++++---- helm/fuel-subgraph/templates/service.yaml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/helm/fuel-subgraph/templates/deployment.yaml b/helm/fuel-subgraph/templates/deployment.yaml index be8272e..fe8d60b 100644 --- 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: @@ -81,4 +81,4 @@ spec: {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/helm/fuel-subgraph/templates/service.yaml b/helm/fuel-subgraph/templates/service.yaml index f0ea4c5..6fc80e7 100644 --- a/helm/fuel-subgraph/templates/service.yaml +++ b/helm/fuel-subgraph/templates/service.yaml @@ -11,15 +11,15 @@ spec: protocol: TCP name: http - port: {{ .Values.firehose.port1 }} - targetPort: firehose_port1 + targetPort: firehose-port-1 protocol: TCP - name: firehose_port1 + name: firehose-port-1 - port: {{ .Values.firehose.port2 }} - targetPort: firehose_port2 + targetPort: firehose-port-2 protocol: TCP - name: firehose_port2 + name: firehose-port-2 - port: {{ .Values.firehose.port3 }} - targetPort: firehose_port3 + targetPort: firehose-port-3 protocol: TCP - name: firehose_port3 + name: firehose-port-3 selector: {{- include "fuel-subgraph.selectorLabels" . | nindent 4 }} From 52fe08d33bb87c5905707678be95bf822ee7ae59 Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Sat, 20 Apr 2024 14:58:38 -0400 Subject: [PATCH 4/4] Update volumemount name in deployment (#41) --- helm/fuel-subgraph/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/fuel-subgraph/templates/deployment.yaml b/helm/fuel-subgraph/templates/deployment.yaml index fe8d60b..fcd6c83 100644 --- a/helm/fuel-subgraph/templates/deployment.yaml +++ b/helm/fuel-subgraph/templates/deployment.yaml @@ -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 }}