Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add labels in openshift route resource #337

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Add labels in openshift route resource #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57fc18f
Add labels in openshift route resource
Oct 2, 2023
091df04
Merge branch 'master' into add-customlabels-for-route
Calvinaud Oct 11, 2023
d84b684
Update charts/litmus/README.md
Calvinaud Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/litmus/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion charts/litmus/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"` | |
Expand Down
4 changes: 4 additions & 0 deletions charts/litmus/templates/frontend-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions charts/litmus/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ openshift:
route:
enabled: false
name: litmus-portal
customLabels: {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer additionalLabels more but if others are fine, then i doesn't matter much. approving for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the values.yaml all others resource are using customLabels (https://github.com/litmuschaos/litmus-helm/blob/master/charts/litmus/values.yaml#L10) that why I used the same name.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably okay then.

annotations: {}
host: ""

Expand Down