iperf3. Support arm64. Add option to override args (#52)

Gradiant · Jun 28, 2022 · 68640e7 · 68640e7
1 parent d001ac1
commit 68640e7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/charts/iperf3/Chart.yaml b/charts/iperf3/Chart.yaml
@@ -22,4 +22,4 @@ maintainers:
 name: iperf3
 sources:
   - https://iperf.fr/
-version: 0.1.1
+version: 0.1.2
diff --git a/charts/iperf3/templates/deployment.yaml b/charts/iperf3/templates/deployment.yaml
@@ -52,11 +52,22 @@ spec:
           {{- if .Values.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
+          {{- if .Values.command }}
+          command: {{- include "common.tplvalues.render" ( dict "value" .Values.command "context" $) | nindent 12 }}
+          {{- else }}
+          command: ["iperf3"]
+          {{- end }}
+          {{- if .Values.args }}
+          args: {{- include "common.tplvalues.render" ( dict "value" .Values.args "context" $) | nindent 12 }}        
+          {{- else }}
           args:
+            {{- if .Values.config.json }}
             - --json
+            {{- end }}
             - -s
-            - -i {{ .Values.interval }}
-            - --format {{ .Values.format }}
+            - --interval={{ .Values.config.interval }}
+            - --format={{ .Values.config.format }}
+          {{- end }}
           {{- if .Values.resources }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           {{- end }}

diff --git a/charts/iperf3/values.yaml b/charts/iperf3/values.yaml
@@ -1,8 +1,12 @@
+## Configuration
+# set of configurable values. For advanced configuration override args with .Values.args.
 ## [kmgtKMGT] format to report: Kbits, Mbits, Gbits, Tbits
-format: M
-## interval  #         seconds between periodic throughput reports
-interval: 1
-
+config:
+  format: M
+   ## interval  #  seconds between periodic throughput reports
+  interval: 1
+  ## -J, --json   output in JSON format
+  json: false
 ## @section Global parameters
 ## Global Docker image parameters
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
@@ -47,7 +51,7 @@ extraDeploy: []
 
 image:
   registry: docker.io
-  repository: networkstatic/iperf3
+  repository: openverso/iperf3
   tag: latest
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -66,6 +70,13 @@ image:
   ##
   debug: false
 
+## @param command Override default container command (useful when using custom images)
+##
+command: []
+## @param args Override default container args (useful when using custom images)
+##
+args: []
+
 replicaCount: 1
 ##  resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/