diff --git a/README.md b/README.md index a130aaca1d223ff391f456ebbee7c9aa08c99642..a271c16fa70d1ab6925b6464e59316f4a902587a 100644 --- a/README.md +++ b/README.md @@ -575,7 +575,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + { ], selector: { matchLabels: { - app: 'myapp', + 'app.kubernetes.io/name': 'myapp', }, }, }, diff --git a/examples/additional-namespaces-servicemonitor.jsonnet b/examples/additional-namespaces-servicemonitor.jsonnet index ec978da7806e058fab93070d2547f558893798dd..31d4f7c3e8157e6294346b8ffb03b5a793f8282e 100644 --- a/examples/additional-namespaces-servicemonitor.jsonnet +++ b/examples/additional-namespaces-servicemonitor.jsonnet @@ -24,7 +24,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + { ], selector: { matchLabels: { - app: 'myapp', + 'app.kubernetes.io/name': 'myapp', }, }, }, diff --git a/examples/basic-auth/service-monitor.yaml b/examples/basic-auth/service-monitor.yaml index e62b9fa9c6705ba7075339bca37289dac68bedb6..82ac0b6557d235a635d7b04b61df3019f0d78bca 100644 --- a/examples/basic-auth/service-monitor.yaml +++ b/examples/basic-auth/service-monitor.yaml @@ -19,4 +19,4 @@ spec: - logging selector: matchLabels: - app: myapp \ No newline at end of file + app.kubernetes.io/name: myapp \ No newline at end of file diff --git a/examples/example-app/example-app.yaml b/examples/example-app/example-app.yaml index 69a2ab7e9cee86c940abc61c9dcf905f14849de1..71d9e5671c728d82498f42921a4e549d2e3e30d0 100644 --- a/examples/example-app/example-app.yaml +++ b/examples/example-app/example-app.yaml @@ -7,7 +7,7 @@ metadata: namespace: default spec: selector: - app: example-app + app.kubernetes.io/name: example-app ports: - name: web protocol: TCP @@ -22,17 +22,17 @@ metadata: spec: selector: matchLabels: - app: example-app + app.kubernetes.io/name: example-app version: 1.1.3 replicas: 4 template: metadata: labels: - app: example-app + app.kubernetes.io/name: example-app version: 1.1.3 spec: containers: - - name: example-app + - name: example-app image: quay.io/fabxc/prometheus_demo_service ports: - name: web diff --git a/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet b/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet index fa2caf0e8e87cf78f34f79fef0d404602f59a741..9573072c5da27bfd9c9636a5157498bb1dfa2043 100644 --- a/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet +++ b/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet @@ -81,7 +81,7 @@ }, deployment: - local podLabels = { app: 'ksm-autoscaler' }; + local podLabels = { 'app.kubernetes.io/name': 'ksm-autoscaler' }; local c = { name: 'ksm-autoscaler', image: $.values.clusterVerticalAutoscaler.image,