Merge pull request #1676 from defenestration/add-podMonitor.honorLabels

Helm - Add podMonitor.honor labels

Author: stefanprodan

charts/flagger/README.md

@@ -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`                                |

charts/flagger/templates/podmonitor.yaml

@@ -17,6 +17,7 @@ spec:
   - interval: {{ .Values.podMonitor.interval }}
     path: /metrics
     port: http
+    honorLabels: {{ .Values.podMonitor.honorLabels }}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

charts/flagger/values.yaml

@@ -82,6 +82,7 @@ podMonitor:
   namespace:
   interval: 15s
   additionalLabels: {}
+  honorLabels: false
 
 #env:
 #- name: SLACK_URL