Fix the chart so that setting the error fraction for individual backe…

…nd elements works. Signed-off-by: Flynn <flynn@buoyant.io>
BuoyantIO · May 2, 2024 · 1324f43 · 1324f43
1 parent 7b328d8
commit 1324f43
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/faces-chart/templates/_helpers.tpl b/faces-chart/templates/_helpers.tpl
@@ -55,8 +55,9 @@
 
 {{- define "partials.select-errorFraction" -}}
   {{ $fraction := "" }}
-  {{- if .source.errorFraction -}}
-    {{- $fraction = .source.errorFraction -}}
+  {{ $srcFraction := .source.errorFraction }}
+  {{- if or ($srcFraction) (eq $srcFraction 0) -}}
+    {{- $fraction = $srcFraction -}}
   {{- else if (and .default .default.errorFraction) -}}
     {{- $fraction = .default.errorFraction -}}
   {{- end -}}

diff --git a/faces-chart/values.yaml b/faces-chart/values.yaml
@@ -33,39 +33,39 @@ backend:
   delayBuckets: "0,5,10,15,20,50,200,500,1500"
 
 smiley:
-  image: ""                     # If set, overrides the imageName/imageTag pair
-  imageName: ""                 # If not set, uses backend.imageName
-  imageTag: ""                  # If not set, uses backend.imageTag
-  imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
-  errorFraction: ""             # If not set, uses backend.errorFraction
-  delayBuckets: ""              # If not set, uses backend.delayBuckets
   smiley: ""                    # Override if desired
+  # image: ""                     # If set, overrides the imageName/imageTag pair
+  # imageName: ""                 # If not set, uses backend.imageName
+  # imageTag: ""                  # If not set, uses backend.imageTag
+  # imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
+  # errorFraction: ""             # If not set, uses backend.errorFraction
+  # delayBuckets: ""              # If not set, uses backend.delayBuckets
 
 smiley2:
   enabled: False                # If set to True, enables the second smiley workload
-  image: ""                     # If set, overrides the imageName/imageTag pair
-  imageName: ""                 # If not set, uses backend.imageName
-  imageTag: ""                  # If not set, uses backend.imageTag
-  imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
-  errorFraction: ""             # If not set, uses backend.errorFraction
-  delayBuckets: ""              # If not set, uses backend.delayBuckets
   smiley: "HeartEyes"           # Override if desired
+  # image: ""                     # If set, overrides the imageName/imageTag pair
+  # imageName: ""                 # If not set, uses backend.imageName
+  # imageTag: ""                  # If not set, uses backend.imageTag
+  # imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
+  # errorFraction: ""             # If not set, uses backend.errorFraction
+  # delayBuckets: ""              # If not set, uses backend.delayBuckets
 
 color:
-  image: ""                     # If set, overrides the imageName/imageTag pair
-  imageName: ""                 # If not set, uses backend.imageName
-  imageTag: ""                  # If not set, uses backend.imageTag
-  imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
-  errorFraction: ""             # If not set, uses backend.errorFraction
-  delayBuckets: ""              # If not set, uses backend.delayBuckets
   color: ""                     # Override if desired, defaults to colorblind-friendly light blue from the Tol palette
+  # image: ""                     # If set, overrides the imageName/imageTag pair
+  # imageName: ""                 # If not set, uses backend.imageName
+  # imageTag: ""                  # If not set, uses backend.imageTag
+  # imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
+  # errorFraction: ""             # If not set, uses backend.errorFraction
+  # delayBuckets: ""              # If not set, uses backend.delayBuckets
 
 color2:
   enabled: False                # If set to True, enables the second color workload
-  image: ""                     # If set, overrides the imageName/imageTag pair
-  imageName: ""                 # If not set, uses backend.imageName
-  imageTag: ""                  # If not set, uses backend.imageTag
-  imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
-  errorFraction: ""             # If not set, uses backend.errorFraction
-  delayBuckets: ""              # If not set, uses backend.delayBuckets
   color: "green"                # Override if desired, defaults to colorblind-friendly green from the Tol palette
+  # image: ""                     # If set, overrides the imageName/imageTag pair
+  # imageName: ""                 # If not set, uses backend.imageName
+  # imageTag: ""                  # If not set, uses backend.imageTag
+  # imagePullPolicy: ""           # If not set, uses backend.imagePullPolicy
+  # errorFraction: ""             # If not set, uses backend.errorFraction
+  # delayBuckets: ""              # If not set, uses backend.delayBuckets