Merge pull request #32 from trifork/fix/podmonitor-selector

Fix podmonitor selector

Makefile

@@ -1,5 +1,11 @@
-.PHONY: docs
+.PHONY: all docs lint
+
+all: docs lint
 
 docs:
 	@docker run --rm --volume "$(PWD):/helm-docs" -u $(shell id -u) \
 		jnorwood/helm-docs:v1.11.0 --sort-values-order file --chart-search-root charts/
+
+lint:
+	@docker run --rm --volume "$(PWD):/tmp" -u 1000 -w /tmp \
+		quay.io/helmpack/chart-testing:v3.7.1 ct lint --config .github/ct-config.yaml

charts/cheetah-flink-native/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.19
+version: 0.1.20
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/cheetah-flink-native/README.md

@@ -1,6 +1,6 @@
 # cheetah-flink-native
 
-![Version: 0.1.19](https://img.shields.io/badge/Version-0.1.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+![Version: 0.1.20](https://img.shields.io/badge/Version-0.1.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
 
 A Helm chart for handling Cheetah Data Platform Flink jobs
 
@@ -97,8 +97,7 @@ A Helm chart for handling Cheetah Data Platform Flink jobs
 | monitoring.podTargetLabels[0] | string | `"component"` |  |
 | monitoring.podTargetLabels[1] | string | `"cluster"` |  |
 | monitoring.flinkProperties | object | `{"metrics.reporter.prom.class":"org.apache.flink.metrics.prometheus.PrometheusReporter","metrics.reporter.prom.port":"9249","metrics.reporters":"prom"}` | Define which monitoring system to use, See more here: https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/metric_reporters/ |
-| monitoring.podMonitorSelectorLabels.prometheus | string | `"cluster-metrics"` |  |
-| monitoring.podMonitorSelectorLabels.cheetah-monitoring | string | `"true"` |  |
+| monitoring.podMonitorSelectorLabels | object | `{"cheetah-monitoring":"true","prometheus":"cluster-metrics"}` | Additional pod selector labels, which are also added to the PodMonitor labels. Include labels which are selected for in the Prometheus operator |
 | monitoring.podMetricsEndpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------

charts/cheetah-flink-native/templates/podmonitor.yaml

@@ -12,6 +12,7 @@ spec:
     {{- toYaml .Values.monitoring.podTargetLabels | nindent 4 }}
   selector:
     matchLabels:
+      {{- include "cheetah-flink-native.selectorLabels" . | nindent 6 }}
       {{- toYaml .Values.monitoring.podMonitorSelectorLabels | nindent 6 }}
   podMetricsEndpoints:
     {{- toYaml .Values.monitoring.podMetricsEndpoints | nindent 4 }}

charts/cheetah-flink-native/values.yaml

@@ -192,8 +192,8 @@ monitoring:
     metrics.reporter.prom.class: org.apache.flink.metrics.prometheus.PrometheusReporter
     metrics.reporter.prom.port: "9249"
 
-  # include the podMonitorSelectorLabel which you have set in your prometheus-operator
-  # set podMonitorSelectorLabels {} if your prometheus-operator is set to collect all podMonitors
+  # -- Additional pod selector labels, which are also added to the PodMonitor labels.
+  # Include labels which are selected for in the Prometheus operator
   podMonitorSelectorLabels:
     prometheus: cluster-metrics
     cheetah-monitoring: "true"