From 770222bcd7b9329b17456f56718ef64dba808609 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 14 Aug 2020 17:39:05 +0100 Subject: [PATCH] Add proper label for kiam servicemonitors --- charts/kubezero-kiam/Chart.yaml | 2 +- charts/kubezero-kiam/README.md | 4 +++- charts/kubezero-kiam/values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml index 7bc63b86..eba7e469 100644 --- a/charts/kubezero-kiam/Chart.yaml +++ b/charts/kubezero-kiam/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-kiam description: KubeZero Umbrella Chart for Kiam type: application -version: 0.2.7 +version: 0.2.8 appVersion: 3.6 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-kiam/README.md b/charts/kubezero-kiam/README.md index d45bbd75..223cc87f 100644 --- a/charts/kubezero-kiam/README.md +++ b/charts/kubezero-kiam/README.md @@ -2,7 +2,7 @@ kubezero-kiam ============= KubeZero Umbrella Chart for Kiam -Current chart version is `0.2.7` +Current chart version is `0.2.8` Source code can be found [here](https://kubezero.com) @@ -41,6 +41,7 @@ By default all access to the meta-data service is blocked, expect for: | kiam.agent.image.tag | string | `"v3.6"` | | | kiam.agent.log.level | string | `"warn"` | | | kiam.agent.prometheus.servicemonitor.enabled | bool | `false` | | +| kiam.agent.prometheus.servicemonitor.labels.release | string | `"metrics"` | | | kiam.agent.sslCertHostPath | string | `"/etc/ssl/certs"` | | | kiam.agent.tlsCerts.caFileName | string | `"ca.crt"` | | | kiam.agent.tlsCerts.certFileName | string | `"tls.crt"` | | @@ -57,6 +58,7 @@ By default all access to the meta-data service is blocked, expect for: | kiam.server.log.level | string | `"warn"` | | | kiam.server.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | | kiam.server.prometheus.servicemonitor.enabled | bool | `false` | | +| kiam.server.prometheus.servicemonitor.labels.release | string | `"metrics"` | | | kiam.server.service.port | int | `6444` | | | kiam.server.service.targetPort | int | `6444` | | | kiam.server.sslCertHostPath | string | `"/etc/ssl/certs"` | | diff --git a/charts/kubezero-kiam/values.yaml b/charts/kubezero-kiam/values.yaml index 4839a30e..d8d4ac6d 100644 --- a/charts/kubezero-kiam/values.yaml +++ b/charts/kubezero-kiam/values.yaml @@ -26,6 +26,8 @@ kiam: prometheus: servicemonitor: enabled: false + labels: + release: metrics log: level: warn @@ -51,6 +53,8 @@ kiam: prometheus: servicemonitor: enabled: false + labels: + release: metrics log: level: warn # extraEnv: