Skip to content

Commit e07a261

Browse files
authored
Merge pull request #1676 from defenestration/add-podMonitor.honorLabels
Helm - Add podMonitor.honor labels
2 parents 9fcb6e9 + c09a61a commit e07a261

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

charts/flagger/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ The following tables lists the configurable parameters of the Flagger chart and
157157
| `podMonitor.namespace` | Namespace where the PodMonitor is created | the same namespace |
158158
| `podMonitor.interval` | Interval at which metrics should be scraped | `15s` |
159159
| `podMonitor.podMonitor` | Additional labels to add to the PodMonitor | `{}` |
160+
| `podMonitor.honorLabels` | If `true`, label conflicts are resolved by keeping label values from the scraped data and ignoring the conflicting server-side labels | `false` |
160161
| `leaderElection.enabled` | If `true`, Flagger will run in HA mode | `false` |
161162
| `leaderElection.replicaCount` | Number of replicas | `1` |
162163
| `serviceAccount.create` | If `true`, Flagger will create service account | `true` |

charts/flagger/templates/podmonitor.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
- interval: {{ .Values.podMonitor.interval }}
1818
path: /metrics
1919
port: http
20+
honorLabels: {{ .Values.podMonitor.honorLabels }}
2021
namespaceSelector:
2122
matchNames:
2223
- {{ .Release.Namespace }}

charts/flagger/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ podMonitor:
8282
namespace:
8383
interval: 15s
8484
additionalLabels: {}
85+
honorLabels: false
8586

8687
#env:
8788
#- name: SLACK_URL

0 commit comments

Comments
 (0)