From 0723a47cfe37be4e185c7d17f7be33909d34d49e Mon Sep 17 00:00:00 2001 From: David Calvert Date: Mon, 18 Sep 2023 14:46:39 +0200 Subject: [PATCH] feat(pyrra): added extraKubernetesArgs and extraApiArgs (#129) * feat(pyrra): added extraKubernetesArgs and extraApiArgs Signed-off-by: David Calvert * doc(pyrra): updated README.md Signed-off-by: David Calvert * fix(doc): new options descriptions Signed-off-by: David Calvert --------- Signed-off-by: David Calvert --- charts/pyrra/Chart.yaml | 4 ++-- charts/pyrra/README.md | 4 +++- charts/pyrra/templates/deployment.yaml | 6 ++++++ charts/pyrra/values.yaml | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/charts/pyrra/Chart.yaml b/charts/pyrra/Chart.yaml index d595a9738..4703321fd 100644 --- a/charts/pyrra/Chart.yaml +++ b/charts/pyrra/Chart.yaml @@ -16,10 +16,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.9.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: v0.6.2 +appVersion: v0.6.4 diff --git a/charts/pyrra/README.md b/charts/pyrra/README.md index bce62d492..7b49a4f07 100644 --- a/charts/pyrra/README.md +++ b/charts/pyrra/README.md @@ -1,6 +1,6 @@ # pyrra -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.2](https://img.shields.io/badge/AppVersion-v0.6.2-informational?style=flat-square) +![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.4](https://img.shields.io/badge/AppVersion-v0.6.4-informational?style=flat-square) SLO manager and alert generator @@ -13,6 +13,8 @@ Additionaly, you (most likely) will need to specify prometheusExternalUrl with U | Key | Type | Default | Description | |-----|------|---------|-------------| | additionalLabels | object | `{}` | | +| extraApiArgs | list | `[]` | Extra args for Pyrra's API container | +| extraKubernetesArgs | list | `[]` | Extra args for Pyrra's Kubernetes container | | fullnameOverride | string | `""` | Overrides helm-generated chart fullname | | genericRules.enabled | bool | `false` | enables generate Pyrra generic recording rules. Pyrra generates metrics with the same name for each SLO. | | image.pullPolicy | string | `"IfNotPresent"` | Overrides pullpolicy | diff --git a/charts/pyrra/templates/deployment.yaml b/charts/pyrra/templates/deployment.yaml index ca917967c..cf6fb77cd 100644 --- a/charts/pyrra/templates/deployment.yaml +++ b/charts/pyrra/templates/deployment.yaml @@ -35,6 +35,9 @@ spec: {{- if .Values.genericRules.enabled }} - --generic-rules {{- end }} + {{- with .Values.extraKubernetesArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} - name: {{ .Chart.Name }} @@ -49,6 +52,9 @@ spec: {{- if .Values.prometheusExternalUrl }} - --prometheus-external-url={{ .Values.prometheusExternalUrl }} {{- end }} + {{- with .Values.extraApiArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} ports: - name: http containerPort: 9099 diff --git a/charts/pyrra/values.yaml b/charts/pyrra/values.yaml index 158fe8b43..e9f7c7241 100644 --- a/charts/pyrra/values.yaml +++ b/charts/pyrra/values.yaml @@ -16,6 +16,11 @@ image: additionalLabels: {} # app: pyrra +# -- Extra args for Pyrra's API container +extraApiArgs: [] +# -- Extra args for Pyrra's Kubernetes container +extraKubernetesArgs: [] + serviceAccount: # -- Specifies whether a service account should be created create: true