From 0ad1568b4ca0699b3ad86609df5bff0bd91318e0 Mon Sep 17 00:00:00 2001 From: itninja-hue Date: Wed, 14 Sep 2022 18:26:11 +0200 Subject: [PATCH 1/3] feat(litmus): add pod annotaion support Signed-off-by: itninja-hue --- charts/litmus/templates/auth-server-deployment.yaml | 6 ++++++ charts/litmus/templates/frontend-deployment.yaml | 6 ++++++ charts/litmus/templates/server-deployment.yaml | 6 ++++++ charts/litmus/values.yaml | 3 +++ 4 files changed, 21 insertions(+) diff --git a/charts/litmus/templates/auth-server-deployment.yaml b/charts/litmus/templates/auth-server-deployment.yaml index c2f0f15d..c36018cf 100644 --- a/charts/litmus/templates/auth-server-deployment.yaml +++ b/charts/litmus/templates/auth-server-deployment.yaml @@ -26,6 +26,12 @@ spec: {{- if .Values.portal.server.customLabels }} {{ toYaml .Values.portal.server.customLabels | nindent 8 }} {{- end }} + {{- if .Values.portal.server.podAnnotations }} + annotations: + {{- range $key, $value := .Values.portal.server.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} spec: automountServiceAccountToken: {{ .Values.portal.server.authServer.automountServiceAccountToken }} serviceAccountName: {{ .Values.portal.server.serviceAccountName }} diff --git a/charts/litmus/templates/frontend-deployment.yaml b/charts/litmus/templates/frontend-deployment.yaml index e597de44..0f60980b 100644 --- a/charts/litmus/templates/frontend-deployment.yaml +++ b/charts/litmus/templates/frontend-deployment.yaml @@ -26,6 +26,12 @@ spec: {{- if .Values.portal.frontend.customLabels }} {{ toYaml .Values.portal.frontend.customLabels | nindent 8 }} {{- end }} + {{- if .Values.portal.frontend.podAnnotations }} + annotations: + {{- range $key, $value := .Values.portal.frontend.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} spec: automountServiceAccountToken: {{ .Values.portal.frontend.automountServiceAccountToken }} {{- if .Values.image.imagePullSecrets }} diff --git a/charts/litmus/templates/server-deployment.yaml b/charts/litmus/templates/server-deployment.yaml index 041d5eb9..48b36d32 100644 --- a/charts/litmus/templates/server-deployment.yaml +++ b/charts/litmus/templates/server-deployment.yaml @@ -26,6 +26,12 @@ spec: {{- if .Values.portal.server.customLabels }} {{ toYaml .Values.portal.server.customLabels | nindent 8 }} {{- end }} + {{- if .Values.portal.server.podAnnotations }} + annotations: + {{- range $key, $value := .Values.portal.server.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} spec: serviceAccountName: {{ .Values.portal.server.serviceAccountName }} {{- if .Values.image.imagePullSecrets }} diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index c162fa10..cb8b6973 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -63,6 +63,7 @@ upgradeAgent: tolerations: [] affinity: {} resources: {} + podAnnotations: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -100,6 +101,7 @@ portal: pullPolicy: "Always" containerPort: 8080 customLabels: {} + podAnnotations: {} # my.company.com/tier: "frontend" resources: @@ -296,6 +298,7 @@ portal: nodeSelector: {} tolerations: [] affinity: {} + podAnnotations: {} # OpenShift specific configuration openshift: From f759afae337e61cd7d90fbc17c014cf12f6359da Mon Sep 17 00:00:00 2001 From: itninja-hue Date: Wed, 14 Sep 2022 18:29:42 +0200 Subject: [PATCH 2/3] chore(litmus): bump chart version Signed-off-by: itninja-hue --- charts/litmus/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 4379c41a..4f41f36d 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.12.0" description: A Helm chart to install ChaosCenter name: litmus -version: 2.13.0 +version: 2.13.1 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: From 66c3de88686b788135edad88e7eb703756057a6e Mon Sep 17 00:00:00 2001 From: itninja-hue Date: Wed, 14 Sep 2022 18:31:26 +0200 Subject: [PATCH 3/3] chore(litmus): update docs Signed-off-by: itninja-hue --- charts/litmus/README.md | 4 +++- charts/litmus/values.yaml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/litmus/README.md b/charts/litmus/README.md index f07496dc..d8e5aa8e 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 2.13.0](https://img.shields.io/badge/Version-2.13.0-informational?style=flat-square) ![AppVersion: 2.12.0](https://img.shields.io/badge/AppVersion-2.12.0-informational?style=flat-square) +![Version: 2.13.1](https://img.shields.io/badge/Version-2.13.1-informational?style=flat-square) ![AppVersion: 2.12.0](https://img.shields.io/badge/AppVersion-2.12.0-informational?style=flat-square) A Helm chart to install ChaosCenter @@ -80,6 +80,7 @@ $ helm install litmus-portal litmuschaos/litmus | 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` | | @@ -181,6 +182,7 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.graphqlServer.volumes[1].emptyDir | object | `{}` | | | portal.server.graphqlServer.volumes[1].name | string | `"hub-storage"` | | | portal.server.nodeSelector | object | `{}` | | +| portal.server.podAnnotations | object | `{}` | | | portal.server.replicas | int | `1` | | | portal.server.service.annotations | object | `{}` | | | portal.server.service.authRpcServer.port | int | `3030` | | diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index cb8b6973..5f56bed9 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -63,7 +63,6 @@ upgradeAgent: tolerations: [] affinity: {} resources: {} - podAnnotations: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following