From 308fe7f2ea955069e539d4755f187eaa807ce2d8 Mon Sep 17 00:00:00 2001 From: hfuss Date: Thu, 9 Dec 2021 18:59:02 -0500 Subject: [PATCH 1/5] [helm] Adding Storage for DX Blobs Signed-off-by: hfuss --- .../charts/firefly/templates/dataexchange/statefulset.yaml | 5 +++++ deploy/charts/firefly/values.yaml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml index 89e3e3ae48..754ea404f9 100644 --- a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml +++ b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml @@ -82,6 +82,8 @@ spec: - mountPath: /data/ca.pem name: tls subPath: ca.crt + - mountPath: /data/blobs + name: blobs {{- with .Values.dataexchange.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -101,6 +103,9 @@ spec: - name: tls secret: secretName: {{ if and .Values.dataexchange.certificate.enabled (not .Values.dataexchange.tlsSecret.enabled) }}"{{ include "firefly.fullname" . }}-dx-tls"{{ else }}{{ .Values.dataexchange.tlsSecret.name }}{{ end }} + - name: blobs + emptyDir: + sizeLimit: {{ .Values.dataexchange.blobStorageSize }} volumeClaimTemplates: - metadata: name: {{ include "firefly.fullname" . }}-dx-peer-certs diff --git a/deploy/charts/firefly/values.yaml b/deploy/charts/firefly/values.yaml index d4ef7006e1..81c54d84cb 100644 --- a/deploy/charts/firefly/values.yaml +++ b/deploy/charts/firefly/values.yaml @@ -243,3 +243,5 @@ dataexchange: tolerations: [] affinity: {} + + blobStorageSize: 1Gi From b26a89f817e61200de2c22078d2fdb9e9e496804 Mon Sep 17 00:00:00 2001 From: hfuss Date: Thu, 9 Dec 2021 19:27:47 -0500 Subject: [PATCH 2/5] Refactoring volumeClaimTemplates for DX Signed-off-by: hfuss --- .../templates/dataexchange/statefulset.yaml | 52 +++++++++++++++---- deploy/charts/firefly/values.yaml | 18 ++++++- 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml index 754ea404f9..47ecc0f526 100644 --- a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml +++ b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml @@ -67,8 +67,10 @@ spec: {{- toYaml .Values.dataexchange.resources | nindent 12 }} volumeMounts: - mountPath: /data/peer-certs - name: {{ include "firefly.fullname" . }}-dx-peer-certs + subPath: peer-certs + name: {{ include "firefly.fullname" . }}-dx-peers - mountPath: /data/peers + subPath: peers name: {{ include "firefly.fullname" . }}-dx-peers - mountPath: /data/config.json name: config @@ -83,7 +85,10 @@ spec: name: tls subPath: ca.crt - mountPath: /data/blobs - name: blobs + {{- if and .Values.dataexchange.persistentVolumes.blobs.enabled .Values.dataexchange.persistentVolumes.blobs.subPath }} + subPath: {{ .Values.dataexchange.persistentVolumes.blobs.subPath | quote }} + {{- end }} + name: {{ include "firefly.fullname" . }}-dx-blobs {{- with .Values.dataexchange.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -103,24 +108,49 @@ spec: - name: tls secret: secretName: {{ if and .Values.dataexchange.certificate.enabled (not .Values.dataexchange.tlsSecret.enabled) }}"{{ include "firefly.fullname" . }}-dx-tls"{{ else }}{{ .Values.dataexchange.tlsSecret.name }}{{ end }} - - name: blobs - emptyDir: - sizeLimit: {{ .Values.dataexchange.blobStorageSize }} + {{- if not .Values.dataexchange.persistentVolumes.blobs.enabled }} + - name: {{ include "firefly.fullname" . }}-dx-blobs + emptyDir: {} + {{- end }} + {{- if not .Values.dataexchange.persistentVolumes.peers.enabled }} + - name: {{ include "firefly.fullname" . }}-dx-peers + emptyDir: {} + {{- end }} + {{- if or .Values.dataexchange.persistentVolumes.blobs.enabled .Values.dataexchange.persistentVolumes.peers.enabled }} volumeClaimTemplates: + {{- if .Values.dataexchange.persistentVolumes.blobs.enabled }} - metadata: - name: {{ include "firefly.fullname" . }}-dx-peer-certs + {{- with .Values.dataexchange.persistentVolumes.blobs }} + name: {{ include "firefly.fullname" . }}-dx-blobs + {{ with .annotations }} + annotations: + {{- toYaml . | nindent 10 }} + {{- end }} spec: accessModes: - - ReadWriteOnce + {{- toYaml .accessModes | nindent 10 }} + storageClassName: {{ .storageClass }} resources: requests: - storage: 1Gi - - metadata: + storage: {{ .size }} + {{- end }} + {{- end }} + {{- if .Values.dataexchange.persistentVolumes.peers.enabled }} + - metadata: + {{- with .Values.dataexchange.persistentVolumes.peers }} name: {{ include "firefly.fullname" . }}-dx-peers + {{ with .annotations }} + annotations: + {{- toYaml . | nindent 10 }} + {{- end }} spec: accessModes: - - ReadWriteOnce + {{- toYaml .accessModes | nindent 10 }} + storageClassName: {{ .storageClass }} resources: requests: - storage: 1Gi + storage: {{ .size }} + {{- end }} + {{- end }} + {{- end }} {{- end }} diff --git a/deploy/charts/firefly/values.yaml b/deploy/charts/firefly/values.yaml index 81c54d84cb..cb6f936ffd 100644 --- a/deploy/charts/firefly/values.yaml +++ b/deploy/charts/firefly/values.yaml @@ -244,4 +244,20 @@ dataexchange: affinity: {} - blobStorageSize: 1Gi + persistentVolumes: + # split into two mounts: /data/peers and /data/peer-certs + peers: + enabled: true + accessModes: + - ReadWriteOnce + annotations: {} + size: 1Gi + storageClass: "" + blobs: + enabled: true + accessModes: + - ReadWriteOnce + annotations: {} + subPath: "" + size: 2Gi + storageClass: "" From 4f98230678eb0e7c9e36b315043fa966a25c3fb1 Mon Sep 17 00:00:00 2001 From: hfuss Date: Thu, 9 Dec 2021 19:36:28 -0500 Subject: [PATCH 3/5] helm3 template works Signed-off-by: hfuss --- .../templates/dataexchange/statefulset.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml index 47ecc0f526..98648c1170 100644 --- a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml +++ b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml @@ -115,14 +115,14 @@ spec: {{- if not .Values.dataexchange.persistentVolumes.peers.enabled }} - name: {{ include "firefly.fullname" . }}-dx-peers emptyDir: {} - {{- end }} + {{- end }} {{- if or .Values.dataexchange.persistentVolumes.blobs.enabled .Values.dataexchange.persistentVolumes.peers.enabled }} volumeClaimTemplates: {{- if .Values.dataexchange.persistentVolumes.blobs.enabled }} - metadata: - {{- with .Values.dataexchange.persistentVolumes.blobs }} name: {{ include "firefly.fullname" . }}-dx-blobs - {{ with .annotations }} + {{- with .Values.dataexchange.persistentVolumes.blobs }} + {{- with .annotations }} annotations: {{- toYaml . | nindent 10 }} {{- end }} @@ -136,13 +136,13 @@ spec: {{- end }} {{- end }} {{- if .Values.dataexchange.persistentVolumes.peers.enabled }} - - metadata: - {{- with .Values.dataexchange.persistentVolumes.peers }} + - metadata: name: {{ include "firefly.fullname" . }}-dx-peers - {{ with .annotations }} + {{- with .Values.dataexchange.persistentVolumes.peers }} + {{- with .annotations }} annotations: - {{- toYaml . | nindent 10 }} - {{- end }} + {{- toYaml . | nindent 10 }} + {{- end }} spec: accessModes: {{- toYaml .accessModes | nindent 10 }} From 3628af9bee0091d181a73a085abb8c9e4adf671b Mon Sep 17 00:00:00 2001 From: hfuss Date: Mon, 13 Dec 2021 11:38:00 -0500 Subject: [PATCH 4/5] simplifying the PVC templating since peers must be persisted Signed-off-by: hfuss --- .../firefly/templates/dataexchange/statefulset.yaml | 10 +--------- deploy/charts/firefly/values.yaml | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml index 98648c1170..b7cd16d676 100644 --- a/deploy/charts/firefly/templates/dataexchange/statefulset.yaml +++ b/deploy/charts/firefly/templates/dataexchange/statefulset.yaml @@ -112,13 +112,8 @@ spec: - name: {{ include "firefly.fullname" . }}-dx-blobs emptyDir: {} {{- end }} - {{- if not .Values.dataexchange.persistentVolumes.peers.enabled }} - - name: {{ include "firefly.fullname" . }}-dx-peers - emptyDir: {} - {{- end }} {{- if or .Values.dataexchange.persistentVolumes.blobs.enabled .Values.dataexchange.persistentVolumes.peers.enabled }} volumeClaimTemplates: - {{- if .Values.dataexchange.persistentVolumes.blobs.enabled }} - metadata: name: {{ include "firefly.fullname" . }}-dx-blobs {{- with .Values.dataexchange.persistentVolumes.blobs }} @@ -135,7 +130,6 @@ spec: storage: {{ .size }} {{- end }} {{- end }} - {{- if .Values.dataexchange.persistentVolumes.peers.enabled }} - metadata: name: {{ include "firefly.fullname" . }}-dx-peers {{- with .Values.dataexchange.persistentVolumes.peers }} @@ -150,7 +144,5 @@ spec: resources: requests: storage: {{ .size }} - {{- end }} - {{- end }} - {{- end }} + {{- end }} {{- end }} diff --git a/deploy/charts/firefly/values.yaml b/deploy/charts/firefly/values.yaml index cb6f936ffd..97853bc806 100644 --- a/deploy/charts/firefly/values.yaml +++ b/deploy/charts/firefly/values.yaml @@ -247,7 +247,6 @@ dataexchange: persistentVolumes: # split into two mounts: /data/peers and /data/peer-certs peers: - enabled: true accessModes: - ReadWriteOnce annotations: {} From 26b9b48ea92e2c2c52b946637b76c1eab0ffd6a5 Mon Sep 17 00:00:00 2001 From: hfuss Date: Tue, 14 Dec 2021 13:06:57 -0500 Subject: [PATCH 5/5] latest dx image Signed-off-by: hfuss --- deploy/charts/firefly/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/charts/firefly/values.yaml b/deploy/charts/firefly/values.yaml index 97853bc806..599bff638d 100644 --- a/deploy/charts/firefly/values.yaml +++ b/deploy/charts/firefly/values.yaml @@ -189,8 +189,7 @@ dataexchange: image: repository: ghcr.io/hyperledger/firefly-dataexchange-https pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: v0.9.2 + tag: v0.9.3 imagePullSecrets: [] nameOverride: ""