Skip to content

Commit

Permalink
fix tags naming in chart config (#2036)
Browse files Browse the repository at this point in the history
* fix tags naming in chart config

* update test cases

* disable global values to respect tags

* fix pre-commit

* fix configs
  • Loading branch information
pgvishnuram committed Oct 19, 2023
1 parent 09cf628 commit e9953e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ dependencies:
tags:
- monitoring
- name: prometheus-blackbox-exporter
condition: global.blackboxExporter.Enabled
condition: global.blackboxExporterEnabled
tags:
- monitoring
- name: prometheus-node-exporter
condition: global.nodeExporter.Enabled
condition: global.nodeExporterEnabled
tags:
- monitoring
- name: prometheus-postgres-exporter
condition: global.prometheusPostgresExporter.Enabled
condition: global.prometheusPostgresExporterEnabled
tags:
- monitoring
- name: prometheus
Expand Down
2 changes: 1 addition & 1 deletion tests/chart_tests/test_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"charts/kube-state/templates",
"charts/prometheus-blackbox-exporter/templates",
"charts/prometheus-node-exporter/templates",
"charts/prometheus-postgres-exporter/templates",
"charts/prometheus/templates",
]

# Some charts have configs that are hard to test when parametrizing with get_all_features()
# eg: password vs passwordSecret
edge_cases = [
"charts/prometheus-postgres-exporter/templates/secret.yaml",
"charts/prometheus-postgres-exporter/templates",
]

show_only = [
Expand Down
2 changes: 1 addition & 1 deletion tests/enable_all_features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ global:
authSidecar:
enabled: true
baseDomain: foo.com
blackboxExporterEnabled: true
#blackboxExporterEnabled: true
customLogging:
awsSecretName: dummy
enabled: true
Expand Down
4 changes: 2 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ global:
postgresqlEnabled: false

# Enables a node exporter DaemonSet for node-level metrics
nodeExporterEnabled: true
#nodeExporterEnabled: true

prometheusPostgresExporterEnabled: false

# Enables blackbox exporter
blackboxExporterEnabled: false
#blackboxExporterEnabled: false

# make fluentd to gather logs from all available namespaces
manualNamespaceNamesEnabled: false
Expand Down

0 comments on commit e9953e0

Please sign in to comment.