From b0e2d18af53caadcc2a08e00c5caf17be4a8e533 Mon Sep 17 00:00:00 2001 From: bakhtin Date: Tue, 13 Jun 2023 17:47:38 +0100 Subject: [PATCH] Allow configuring labels on Pods Signed-off-by: bakhtin --- chart/pyroscope-ebpf/Chart.yaml | 2 +- chart/pyroscope-ebpf/README.md | 3 ++- chart/pyroscope-ebpf/templates/daemonset.yaml | 3 +++ chart/pyroscope-ebpf/values.yaml | 3 +++ chart/pyroscope/Chart.yaml | 2 +- chart/pyroscope/README.md | 3 ++- chart/pyroscope/templates/deployment.yaml | 6 +++++- chart/pyroscope/values.yaml | 3 +++ 8 files changed, 20 insertions(+), 5 deletions(-) diff --git a/chart/pyroscope-ebpf/Chart.yaml b/chart/pyroscope-ebpf/Chart.yaml index e26a2c9..0ce31b8 100644 --- a/chart/pyroscope-ebpf/Chart.yaml +++ b/chart/pyroscope-ebpf/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: pyroscope-ebpf description: A Helm chart for Pyroscope eBPF type: application -version: 0.1.31 +version: 0.1.32 appVersion: "0.37.2" diff --git a/chart/pyroscope-ebpf/README.md b/chart/pyroscope-ebpf/README.md index c285cff..e678a2f 100644 --- a/chart/pyroscope-ebpf/README.md +++ b/chart/pyroscope-ebpf/README.md @@ -1,6 +1,6 @@ # pyroscope-ebpf -![Version: 0.1.31](https://img.shields.io/badge/Version-0.1.31-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.37.2](https://img.shields.io/badge/AppVersion-0.37.2-informational?style=flat-square) +![Version: 0.1.32](https://img.shields.io/badge/Version-0.1.32-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.37.2](https://img.shields.io/badge/AppVersion-0.37.2-informational?style=flat-square) A Helm chart for Pyroscope eBPF @@ -42,6 +42,7 @@ helm delete my-release | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"pyroscope/pyroscope"` | image to use for deploying | | image.tag | string | `"0.37.2"` | Tag for pyroscope image to use | +| podLabels | object | `{}` | Additional labels to add on pods | | serviceAccount.annotations | object | `{}` | ServiceAccount annotations | | serviceAccount.create | bool | `true` | Create service account | | serviceAccount.name | string | `""` | Service account name to use, when empty will be set to created account if serviceAccount.create is set else to default | diff --git a/chart/pyroscope-ebpf/templates/daemonset.yaml b/chart/pyroscope-ebpf/templates/daemonset.yaml index 1be092c..b685a48 100644 --- a/chart/pyroscope-ebpf/templates/daemonset.yaml +++ b/chart/pyroscope-ebpf/templates/daemonset.yaml @@ -14,6 +14,9 @@ spec: metadata: labels: {{- include "pyroscope-ebpf.selectorLabels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: {{- with .Values.tolerations }} tolerations: diff --git a/chart/pyroscope-ebpf/values.yaml b/chart/pyroscope-ebpf/values.yaml index bb8da53..6cea49a 100644 --- a/chart/pyroscope-ebpf/values.yaml +++ b/chart/pyroscope-ebpf/values.yaml @@ -31,5 +31,8 @@ args: - "--server-address" - "http://pyroscope-server:4040" +# -- Additional labels to add on pods +podLabels: {} + # -- Name of the secret that will load environment vars from # envFromSecret: "" diff --git a/chart/pyroscope/Chart.yaml b/chart/pyroscope/Chart.yaml index 8e823a8..f0dcfd8 100644 --- a/chart/pyroscope/Chart.yaml +++ b/chart/pyroscope/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: pyroscope description: A Helm chart for Pyroscope type: application -version: 0.2.92 +version: 0.2.93 appVersion: "0.37.2" diff --git a/chart/pyroscope/README.md b/chart/pyroscope/README.md index 3a82e92..37e2842 100644 --- a/chart/pyroscope/README.md +++ b/chart/pyroscope/README.md @@ -1,6 +1,6 @@ # pyroscope -![Version: 0.2.92](https://img.shields.io/badge/Version-0.2.92-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.37.2](https://img.shields.io/badge/AppVersion-0.37.2-informational?style=flat-square) +![Version: 0.2.93](https://img.shields.io/badge/Version-0.2.93-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.37.2](https://img.shields.io/badge/AppVersion-0.37.2-informational?style=flat-square) A Helm chart for Pyroscope @@ -83,6 +83,7 @@ Please refer to [the documentation](https://pyroscope.io/docs/server-configurati | persistence.finalizers | list | `["kubernetes.io/pvc-protection"]` | PersistentVolumeClaim finalizers | | persistence.size | string | `"10Gi"` | Size of persistent volume claim | | podAnnotations | object | `{}` | Pod annotations | +| podLabels | object | `{}` | Additional labels to add on pods | | podSecurityContext | object | `{"fsGroup":101}` | Pod securityContext | | pyroscopeConfigs | object | `{}` | Pyroscope server configuration. Please refer to https://pyroscope.io/docs/server-configuration | | rbac.clusterRole.annotations | object | `{}` | Cluster role annotations | diff --git a/chart/pyroscope/templates/deployment.yaml b/chart/pyroscope/templates/deployment.yaml index 03926c5..bb383e1 100644 --- a/chart/pyroscope/templates/deployment.yaml +++ b/chart/pyroscope/templates/deployment.yaml @@ -18,7 +18,11 @@ spec: {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} - labels: {{- include "pyroscope.selectorLabels" . | nindent 8 }} + labels: + {{- include "pyroscope.selectorLabels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/chart/pyroscope/values.yaml b/chart/pyroscope/values.yaml index 8760334..92da34e 100644 --- a/chart/pyroscope/values.yaml +++ b/chart/pyroscope/values.yaml @@ -220,3 +220,6 @@ rbac: name: "" # -- Cluster role binding annotations annotations: {} + +# -- Additional labels to add on pods +podLabels: {}