Default prometheusRules.rules should be an empty list (#886)
Support for prometheus-operator was added in https://github.com/hashicorp/vault-helm/pull/772 and a default empty set of rules was defined as an empty map `{}`. However, as evidenced by the commented out rule examples below that very same values.yaml, this is expected to be a list, so `rules:` value should be set to an empty list `[]`. Co-authored-by: Marc 'risson' Schmitt <marc.schmitt@risson.space> Co-authored-by: Vitaliy <vitaliyf@users.noreply.github.com>
This commit is contained in:
parent
b9096ee15b
commit
a276600b71
4 changed files with 30 additions and 8 deletions
|
@ -1,5 +1,8 @@
|
|||
## Unreleased
|
||||
|
||||
Bugs:
|
||||
* server: Set the default for `prometheusRules.rules` to an empty list [GH-886](https://github.com/hashicorp/vault-helm/pull/886)
|
||||
|
||||
## 0.24.1 (April 17, 2023)
|
||||
|
||||
Bugs:
|
||||
|
|
|
@ -6,7 +6,7 @@ load _helpers
|
|||
cd `chart_dir`
|
||||
local actual=$( (helm template \
|
||||
--show-only templates/prometheus-prometheusrules.yaml \
|
||||
--set 'serverTelemetry.prometheusRules.rules.foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.rules[0].foo=bar' \
|
||||
. || echo "---") | tee /dev/stderr |
|
||||
yq 'length > 0' | tee /dev/stderr)
|
||||
[ "${actual}" = "false" ]
|
||||
|
@ -26,16 +26,16 @@ load _helpers
|
|||
local output=$( (helm template \
|
||||
--show-only templates/prometheus-prometheusrules.yaml \
|
||||
--set 'serverTelemetry.prometheusRules.enabled=true' \
|
||||
--set 'serverTelemetry.prometheusRules.rules.foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.rules.baz=qux' \
|
||||
--set 'serverTelemetry.prometheusRules.rules[0].foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.rules[1].baz=qux' \
|
||||
.) | tee /dev/stderr )
|
||||
|
||||
[ "$(echo "$output" | yq -r '.spec.groups | length')" = "1" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0] | length')" = "2" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].name')" = "release-name-vault" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].rules | length')" = "2" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].rules.foo')" = "bar" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].rules.baz')" = "qux" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].rules[0].foo')" = "bar" ]
|
||||
[ "$(echo "$output" | yq -r '.spec.groups[0].rules[1].baz')" = "qux" ]
|
||||
}
|
||||
|
||||
@test "prometheus/PrometheusRules-server: assertSelectors default" {
|
||||
|
@ -43,7 +43,7 @@ load _helpers
|
|||
local output=$( (helm template \
|
||||
--show-only templates/prometheus-prometheusrules.yaml \
|
||||
--set 'serverTelemetry.prometheusRules.enabled=true' \
|
||||
--set 'serverTelemetry.prometheusRules.rules.foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.rules[0].foo=bar' \
|
||||
. ) | tee /dev/stderr)
|
||||
|
||||
[ "$(echo "$output" | yq -r '.metadata.labels | length')" = "5" ]
|
||||
|
@ -55,7 +55,7 @@ load _helpers
|
|||
local output=$( (helm template \
|
||||
--show-only templates/prometheus-prometheusrules.yaml \
|
||||
--set 'serverTelemetry.prometheusRules.enabled=true' \
|
||||
--set 'serverTelemetry.prometheusRules.rules.foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.rules[0].foo=bar' \
|
||||
--set 'serverTelemetry.prometheusRules.selectors.baz=qux' \
|
||||
--set 'serverTelemetry.prometheusRules.selectors.bar=foo' \
|
||||
. ) | tee /dev/stderr)
|
||||
|
|
|
@ -1066,6 +1066,25 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"serverTelemetry": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"prometheusRules": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"enabled": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"rules": {
|
||||
"type": "array"
|
||||
},
|
||||
"selectors": {
|
||||
"type": "object"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"ui": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
|
|
@ -1200,7 +1200,7 @@ serverTelemetry:
|
|||
selectors: {}
|
||||
|
||||
# Some example rules.
|
||||
rules: {}
|
||||
rules: []
|
||||
# - alert: vault-HighResponseTime
|
||||
# annotations:
|
||||
# message: The response time of Vault is over 500ms on average over the last 5 minutes.
|
||||
|
|
Loading…
Reference in a new issue