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

Jump to bottom

Add pod annotations support #407

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add pod annotations support #407

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
d285a93
Add pod annotations support
Calvinaud Oct 16, 2024
224ead2
Merge branch 'master' into custom-annotation-support
Calvinaud Oct 16, 2024
a7172b2
Fix if condition that was always true
Calvinaud Oct 16, 2024
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.11.0"
description: A Helm chart to install ChaosCenter
name: litmus
version: 3.11.0
version: 3.11.1
kubeVersion: ">=1.16.0-0"
home: https://litmuschaos.io
sources:
Expand Down
6 changes: 5 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.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square)
![Version: 3.11.1](https://img.shields.io/badge/Version-3.11.1-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square)

A Helm chart to install ChaosCenter

Expand Down Expand Up @@ -59,6 +59,7 @@ We separated service configuration from `portal.server.service` to `portal.serve
| adminConfig.VERSION | string | `"3.11.0"` | |
| allowedOrigins | string | `".*"` | |
| customLabels | object | `{}` | Additional labels |
| customPodAnnotations | object | `{}` | Additional annotations |
| existingSecret | string | `""` | Use existing secret (e.g., External Secrets) |
| image.imagePullSecrets | list | `[]` | |
| image.imageRegistryName | string | `"litmuschaos.docker.scarf.sh/litmuschaos"` | |
Expand Down Expand Up @@ -113,6 +114,7 @@ We separated service configuration from `portal.server.service` to `portal.serve
| portal.frontend.livenessProbe.successThreshold | int | `1` | |
| portal.frontend.livenessProbe.timeoutSeconds | int | `5` | |
| portal.frontend.nodeSelector | object | `{}` | |
| portal.frontend.podAnnotations | object | `{}` | |
| portal.frontend.readinessProbe.initialDelaySeconds | int | `5` | |
| portal.frontend.readinessProbe.periodSeconds | int | `10` | |
| portal.frontend.readinessProbe.successThreshold | int | `1` | |
Expand Down Expand Up @@ -145,6 +147,7 @@ We separated service configuration from `portal.server.service` to `portal.serve
| portal.server.authServer.image.pullPolicy | string | `"Always"` | |
| portal.server.authServer.image.repository | string | `"litmusportal-auth-server"` | |
| portal.server.authServer.image.tag | string | `"3.11.0"` | |
| portal.server.authServer.podAnnotations | object | `{}` | |
| portal.server.authServer.ports[0].containerPort | int | `3000` | |
| portal.server.authServer.ports[0].name | string | `"auth-server"` | |
| portal.server.authServer.ports[1].containerPort | int | `3030` | |
Expand Down Expand Up @@ -194,6 +197,7 @@ We separated service configuration from `portal.server.service` to `portal.serve
| portal.server.graphqlServer.livenessProbe.periodSeconds | int | `10` | |
| portal.server.graphqlServer.livenessProbe.successThreshold | int | `1` | |
| portal.server.graphqlServer.livenessProbe.timeoutSeconds | int | `5` | |
| portal.server.graphqlServer.podAnnotations | object | `{}` | |
| portal.server.graphqlServer.ports[0].containerPort | int | `8080` | |
| portal.server.graphqlServer.ports[0].name | string | `"gql-server"` | |
| portal.server.graphqlServer.ports[1].containerPort | int | `8000` | |
Expand Down
27 changes: 27 additions & 0 deletions charts/litmus/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,30 @@ mongodb://{{ trimSuffix "," $hosts }}/admin
{{- end -}}
{{- end -}}

{{/* section to define the podannotations for the different components */}}
{{- define "litmus-portal.podannotations.auth-server" -}}
{{- if .Values.customPodAnnotations }}
{{ toYaml .Values.customPodAnnotations }}
{{- end }}
{{- if .Values.portal.server.authServer.podAnnotations }}
{{ toYaml .Values.portal.server.authServer.podAnnotations }}
{{- end }}
{{- end -}}

{{- define "litmus-portal.podannotations.graphql-server" -}}
{{- if .Values.customPodAnnotations }}
{{ toYaml .Values.customPodAnnotations }}
{{- end }}
{{- if .Values.portal.server.graphqlServer.podAnnotations }}
{{ toYaml .Values.portal.server.graphqlServer.podAnnotations }}
{{- end }}
{{- end -}}

{{- define "litmus-portal.podannotations.frontend" -}}
{{- if .Values.customPodAnnotations }}
{{ toYaml .Values.customPodAnnotations }}
{{- end }}
{{- if .Values.portal.frontend.podAnnotations }}
{{ toYaml .Values.portal.frontend.podAnnotations }}
{{- end }}
{{- end -}}
4 changes: 4 additions & 0 deletions charts/litmus/templates/auth-server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ spec:
{{- if .Values.portal.server.customLabels }}
{{ toYaml .Values.portal.server.customLabels | nindent 8 }}
{{- end }}
{{- if include "litmus-portal.podannotations.auth-server" . }}
annotations:
{{- include "litmus-portal.podannotations.auth-server" . | indent 8 }}
{{- end}}
spec:
automountServiceAccountToken: {{ .Values.portal.server.authServer.automountServiceAccountToken }}
{{- if .Values.image.imagePullSecrets }}
Expand Down
4 changes: 4 additions & 0 deletions charts/litmus/templates/frontend-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ spec:
{{- if .Values.portal.frontend.customLabels }}
{{ toYaml .Values.portal.frontend.customLabels | nindent 8 }}
{{- end }}
{{- if include "litmus-portal.podannotations.frontend" . }}
annotations:
{{- include "litmus-portal.podannotations.frontend" . | indent 8 }}
{{- end}}
spec:
automountServiceAccountToken: {{ .Values.portal.frontend.automountServiceAccountToken }}
{{- if .Values.image.imagePullSecrets }}
Expand Down
4 changes: 4 additions & 0 deletions charts/litmus/templates/server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ spec:
{{- if .Values.portal.server.customLabels }}
{{ toYaml .Values.portal.server.customLabels | nindent 8 }}
{{- end }}
{{- if include "litmus-portal.podannotations.graphql-server" . }}
annotations:
{{- include "litmus-portal.podannotations.graphql-server" . | indent 8 }}
{{- end}}
spec:
automountServiceAccountToken: {{ .Values.portal.server.graphqlServer.automountServiceAccountToken }}
{{- if .Values.image.imagePullSecrets }}
Expand Down
6 changes: 5 additions & 1 deletion charts/litmus/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Declare variables to be passed into your templates.
nameOverride: ""

# -- Additional annotations
customPodAnnotations: {}
# -- Additional labels
customLabels: {}
# my.company.com/concourse-cd: 2
Expand Down Expand Up @@ -123,6 +125,7 @@ portal:
containerPort: 8185
customLabels: {}
# my.company.com/tier: "frontend"
podAnnotations: {}

resources:
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down Expand Up @@ -280,6 +283,7 @@ portal:
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
podAnnotations: {}
authServer:
replicas: 1
autoscaling:
Expand Down Expand Up @@ -328,7 +332,7 @@ portal:
ephemeral-storage: "1Gi"
volumeMounts: []
volumes: []

podAnnotations: {}
nodeSelector: {}
tolerations: []
affinity: {}
Expand Down