From 2ad04d6ba7b94a95e02f4aa2ed94a9051008c592 Mon Sep 17 00:00:00 2001 From: sipr-invivo <160140834+sipr-invivo@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:24:10 +0200 Subject: [PATCH] chore(k8s-metacollector): Add podLabels Signed-off-by: sipr-invivo <160140834+sipr-invivo@users.noreply.github.com> --- charts/k8s-metacollector/CHANGELOG.md | 8 ++++++-- charts/k8s-metacollector/Chart.yaml | 2 +- charts/k8s-metacollector/README.md | 3 ++- charts/k8s-metacollector/templates/deployment.yaml | 3 +++ charts/k8s-metacollector/values.yaml | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/charts/k8s-metacollector/CHANGELOG.md b/charts/k8s-metacollector/CHANGELOG.md index e01e1282..d4278a4b 100644 --- a/charts/k8s-metacollector/CHANGELOG.md +++ b/charts/k8s-metacollector/CHANGELOG.md @@ -4,6 +4,10 @@ This file documents all notable changes to `k8s-metacollector` Helm Chart. The release numbering uses [semantic versioning](http://semver.org). +## v0.1.9 + +* Add podLabels + ## v0.1.8 * Bump application version to 0.1.1. For more info see release notes: https://github.com/falcosecurity/k8s-metacollector/releases/tag/v0.1.1 @@ -23,7 +27,7 @@ numbering uses [semantic versioning](http://semver.org). ## v0.1.4 * Lower `interval` and `scrape_timeout` values for service monitor; -* + ## v0.1.3 * Bump application version to 0.1.3 @@ -45,4 +49,4 @@ numbering uses [semantic versioning](http://semver.org). ### Major Changes -* Initial release of k8s-metacollector Helm Chart. **Note:** the chart uses the `main` tag, since we don't have released the k8s-metacollector yet. \ No newline at end of file +* Initial release of k8s-metacollector Helm Chart. **Note:** the chart uses the `main` tag, since we don't have released the k8s-metacollector yet. diff --git a/charts/k8s-metacollector/Chart.yaml b/charts/k8s-metacollector/Chart.yaml index d0624156..1f2f6670 100644 --- a/charts/k8s-metacollector/Chart.yaml +++ b/charts/k8s-metacollector/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.8 +version: 0.1.9 # 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 diff --git a/charts/k8s-metacollector/README.md b/charts/k8s-metacollector/README.md index 6c258935..84a76ef7 100644 --- a/charts/k8s-metacollector/README.md +++ b/charts/k8s-metacollector/README.md @@ -66,7 +66,7 @@ The command removes all the Kubernetes resources associated with the chart and d ## Configuration -The following table lists the main configurable parameters of the k8s-metacollector chart v0.1.8 and their default values. See `values.yaml` for full list. +The following table lists the main configurable parameters of the k8s-metacollector chart v0.1.9 and their default values. See `values.yaml` for full list. ## Values @@ -110,6 +110,7 @@ The following table lists the main configurable parameters of the k8s-metacollec | namespaceOverride | string | `""` | namespaceOverride overrides the deployment namespace. It's useful for multi-namespace deployments in combined charts. | | nodeSelector | object | `{}` | nodeSelector specifies a set of key-value pairs that must match labels assigned to nodes for the Pod to be eligible for scheduling on that node. | | podAnnotations | object | `{}` | podAnnotations are custom annotations to be added to the pod. | +| podLabels | object | `{}` | podLabels are labels to be added to the pod. | | podSecurityContext | object | `{"fsGroup":1000,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` | These settings are override by the ones specified for the container when there is overlap. | | podSecurityContext.fsGroup | int | `1000` | fsGroup specifies the group ID (GID) that should be used for the volume mounted within a Pod. | | podSecurityContext.runAsGroup | int | `1000` | runAsGroup specifies the group ID (GID) that the containers inside the pod should run as. | diff --git a/charts/k8s-metacollector/templates/deployment.yaml b/charts/k8s-metacollector/templates/deployment.yaml index 896248ce..7688a215 100644 --- a/charts/k8s-metacollector/templates/deployment.yaml +++ b/charts/k8s-metacollector/templates/deployment.yaml @@ -18,6 +18,9 @@ spec: {{- end }} labels: {{- include "k8s-metacollector.selectorLabels" . | nindent 8 }} + {{- if .Values.podLabels }} + {{ toYaml .Values.podLabels | nindent 8 }} + {{- end }} spec: {{- with .Values.image.pullSecrets }} imagePullSecrets: diff --git a/charts/k8s-metacollector/values.yaml b/charts/k8s-metacollector/values.yaml index b6dcc256..98e1fa24 100644 --- a/charts/k8s-metacollector/values.yaml +++ b/charts/k8s-metacollector/values.yaml @@ -25,7 +25,6 @@ fullnameOverride: "" # -- namespaceOverride overrides the deployment namespace. It's useful for multi-namespace deployments in combined charts. namespaceOverride: "" - # -- serviceAccount is the configuration for the service account. serviceAccount: # -- create specifies whether a service account should be created. @@ -39,6 +38,9 @@ serviceAccount: # -- podAnnotations are custom annotations to be added to the pod. podAnnotations: {} +# -- podLabels are labels to be added to the pod. +podLabels: {} + # -- podSecurityContext holds the security settings for the pod. # -- These settings are override by the ones specified for the container when there is overlap. podSecurityContext: