Skip to content

Commit

Permalink
Merge pull request #1676 from defenestration/add-podMonitor.honorLabels
Browse files Browse the repository at this point in the history
Helm - Add podMonitor.honor labels
  • Loading branch information
stefanprodan authored Jul 29, 2024
2 parents 9fcb6e9 + c09a61a commit e07a261
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions charts/flagger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ The following tables lists the configurable parameters of the Flagger chart and
| `podMonitor.namespace` | Namespace where the PodMonitor is created | the same namespace |
| `podMonitor.interval` | Interval at which metrics should be scraped | `15s` |
| `podMonitor.podMonitor` | Additional labels to add to the PodMonitor | `{}` |
| `podMonitor.honorLabels` | If `true`, label conflicts are resolved by keeping label values from the scraped data and ignoring the conflicting server-side labels | `false` |
| `leaderElection.enabled` | If `true`, Flagger will run in HA mode | `false` |
| `leaderElection.replicaCount` | Number of replicas | `1` |
| `serviceAccount.create` | If `true`, Flagger will create service account | `true` |
Expand Down
1 change: 1 addition & 0 deletions charts/flagger/templates/podmonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spec:
- interval: {{ .Values.podMonitor.interval }}
path: /metrics
port: http
honorLabels: {{ .Values.podMonitor.honorLabels }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
Expand Down
1 change: 1 addition & 0 deletions charts/flagger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ podMonitor:
namespace:
interval: 15s
additionalLabels: {}
honorLabels: false

#env:
#- name: SLACK_URL
Expand Down

0 comments on commit e07a261

Please sign in to comment.