Extra Containers / PVCs Support (#34)

* firefly-perfnode Chart and Extra Containers / PVCs Support Signed-off-by: hfuss <[email protected]> * comments Signed-off-by: hfuss <[email protected]> * headers Signed-off-by: hfuss <[email protected]> * moved firefly-perfnode chart to firefly-perf-cli repo Signed-off-by: hfuss <[email protected]>
hyperledger · Mar 24, 2022 · 1e2533d · 1e2533d
1 parent d3ce70b
commit 1e2533d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,12 @@
 # Created by https://www.toptal.com/developers/gitignore/api/helm,macos,linux,windows,visualstudiocode,intellij
 # Edit at https://www.toptal.com/developers/gitignore?templates=helm,macos,linux,windows,visualstudiocode,intellij
 
-local-values.yaml
+local-values*.yaml
 
 ### Helm ###
 # Chart dependencies
 **/charts/*.tgz
-**/local-values.yaml
+**/local-values*.yaml
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider

diff --git a/charts/firefly/Chart.yaml b/charts/firefly/Chart.yaml
@@ -19,7 +19,7 @@ name: firefly
 description: A Helm chart for deploying FireFly and FireFly HTTPS Dataexchange onto Kubernetes.
 type: application
 appVersion: "0.14.0"
-version: "0.4.0"
+version: "0.4.1"
 
 maintainers:
   - name: hfuss

diff --git a/charts/firefly/templates/core/statefulset.yaml b/charts/firefly/templates/core/statefulset.yaml
@@ -46,6 +46,10 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.core.podSecurityContext | nindent 8 }}
+      {{- if .Values.core.initContainers }}
+      initContainers:
+        {{- tpl .Values.core.initContainers . | nindent 8 }}
+      {{- end }}
       containers:
         - name: firefly
           securityContext:
@@ -95,6 +99,9 @@ spec:
               name: firefly-config
           resources:
             {{- toYaml .Values.core.resources | nindent 12 }}
+      {{- if .Values.core.extraContainers }}
+        {{- tpl .Values.core.extraContainers . | nindent 8 }}
+      {{- end }}
       {{- with .Values.core.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -111,3 +118,7 @@ spec:
         - name: firefly-config
           secret:
             secretName: {{ include "firefly.fullname" . }}-config
+  {{- if .Values.core.volumeClaimTemplates }}
+  volumeClaimTemplates:
+    {{- tpl .Values.core.volumeClaimTemplates . | nindent 4 }}
+  {{- end }}
diff --git a/charts/firefly/templates/ethconnect/statefulset.yaml b/charts/firefly/templates/ethconnect/statefulset.yaml
@@ -47,6 +47,10 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.ethconnect.podSecurityContext | nindent 8 }}
+      {{- if .Values.ethconnect.initContainers }}
+      initContainers:
+        {{- tpl .Values.ethconnect.initContainers . | nindent 8 }}
+      {{- end }}
       containers:
         - name: ethconnect
           securityContext:
@@ -89,6 +93,9 @@ spec:
             - mountPath: /etc/ethconnect/config.yaml
               name: config
               subPath: config.yaml
+      {{- if .Values.ethconnect.extraContainers }}
+        {{- tpl .Values.ethconnect.extraContainers . | nindent 8 }}
+      {{- end }}
       {{- with .Values.ethconnect.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -121,4 +128,7 @@ spec:
           requests:
             storage: {{ .size }}
       {{- end }}
+  {{- if .Values.ethconnect.extraVolumeClaimTemplates }}
+    {{- tpl .Values.ethconnect.extraVolumeClaimTemplates . | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml
@@ -181,6 +181,10 @@ core:
     # runAsNonRoot: true
     # runAsUser: 1000
 
+  initContainers: ""
+  extraContainers: ""
+  volumeClaimTemplates: ""
+
   service:
     type: ClusterIP
     httpPort: 5000
@@ -519,6 +523,10 @@ ethconnect:
     type: ClusterIP
     apiPort: 5102
 
+  initContainers: ""
+  extraContainers: ""
+  extraVolumeClaimTemplates: ""
+
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little