From 3558be06c5f48d2529f9efc408b75a6ec3fdcbb8 Mon Sep 17 00:00:00 2001 From: Calvinaud Date: Thu, 12 Oct 2023 15:54:18 +0200 Subject: [PATCH] Add labels in openshift route resource (#337) * Add labels in openshift route resource - Add common and custom labels to the route resource - Upgrade chart version to 2.15.12 - Regenerate doc with helm-docs Signed-off-by: Calvin Audier * Update charts/litmus/README.md Co-authored-by: gdsoumya <44349253+gdsoumya@users.noreply.github.com> Signed-off-by: Calvinaud --------- Signed-off-by: Calvin Audier Signed-off-by: Calvinaud Co-authored-by: Calvin Audier Co-authored-by: gdsoumya <44349253+gdsoumya@users.noreply.github.com> --- charts/litmus/Chart.yaml | 2 +- charts/litmus/README.md | 3 ++- charts/litmus/templates/frontend-route.yaml | 4 ++++ charts/litmus/values.yaml | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 4f67301c..d8a298a6 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.0.0" description: A Helm chart to install ChaosCenter name: litmus -version: 3.0.0 +version: 3.0.1 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 99f64311..390adb97 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) A Helm chart to install ChaosCenter @@ -76,6 +76,7 @@ We separated service configuration from `portal.server.service` to `portal.serve | mongodb.auth.existingSecret | string | `""` | existingSecret Existing secret with MongoDB(®) credentials (keys: `mongodb-passwords`, `mongodb-root-password`, `mongodb-metrics-password`, ` mongodb-replica-set-key`) | | nameOverride | string | `""` | | | openshift.route.annotations | object | `{}` | | +| openshift.route.customLabels | object | `{}` | | | openshift.route.enabled | bool | `false` | | | openshift.route.host | string | `""` | | | openshift.route.name | string | `"litmus-portal"` | | diff --git a/charts/litmus/templates/frontend-route.yaml b/charts/litmus/templates/frontend-route.yaml index 86ebc0fa..881ac259 100644 --- a/charts/litmus/templates/frontend-route.yaml +++ b/charts/litmus/templates/frontend-route.yaml @@ -8,6 +8,10 @@ metadata: labels: app.kubernetes.io/part-of: {{ $fullName }}-server app.kubernetes.io/part-of: {{ $fullName }}-frontend + {{- include "litmus-portal.labels" . | nindent 4 }} + {{- if .Values.openshift.route.customLabels }} + {{ toYaml .Values.openshift.route.customLabels | nindent 4 }} + {{- end }} {{- with .Values.openshift.route.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index be102b90..bc5e6507 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -325,6 +325,7 @@ openshift: route: enabled: false name: litmus-portal + customLabels: {} annotations: {} host: ""