Fix agent global pod annotations (#408)

* Update the litmus-agent chart to use global podannotations - Add template in _helper to combiine global/local podAnnotation - Update deployment file - Bump version of chart and sub charts - Regenerate docs with helm-docs Signed-off-by: Calvin Audier <[email protected]> * Add pod-annotations to agent job Signed-off-by: Calvin Audier <[email protected]> * Running helm-docs Signed-off-by: Calvin Audier <[email protected]> --------- Signed-off-by: Calvin Audier <[email protected]> Signed-off-by: Calvinaud <[email protected]> Co-authored-by: Vedant Shrotria <[email protected]>
litmuschaos · Dec 16, 2024 · 89f39c3 · 89f39c3
1 parent 5a51725
commit 89f39c3
Show file tree

Hide file tree

Showing 25 changed files with 112 additions and 32 deletions.
diff --git a/charts/litmus-agent/Chart.yaml b/charts/litmus-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.13.0"
 description: A Helm chart to install litmus agent
 name: litmus-agent
-version: 3.13.0
+version: 3.13.1
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:
@@ -21,17 +21,17 @@ maintainers:
 icon: https://raw.githubusercontent.com/litmuschaos/icons/master/litmus.png
 dependencies:
   - name: chaos-operator
-    version: 3.13.0
+    version: 3.13.1
     condition: chaos-operator.enabled
   - name: chaos-exporter
-    version: 3.13.0
+    version: 3.13.1
     condition: chaos-exporter.enabled
   - name: event-tracker
-    version: 3.13.0
+    version: 3.13.1
     condition: event-tracker.enabled
   - name: subscriber
-    version: 3.13.0
+    version: 3.13.1
     condition: subscriber.enabled
   - name: workflow-controller
-    version: 0.2.1
+    version: 0.2.2
     condition: workflow-controller.enabled
diff --git a/charts/litmus-agent/README.md b/charts/litmus-agent/README.md
@@ -1,6 +1,6 @@
 # litmus-agent
 
-![Version: 3.13.0](https://img.shields.io/badge/Version-3.13.0-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
+![Version: 3.13.1](https://img.shields.io/badge/Version-3.13.1-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
 
 A Helm chart to install litmus agent
 
@@ -24,11 +24,11 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | chaos-exporter | 3.13.0 |
-|  | chaos-operator | 3.13.0 |
-|  | event-tracker | 3.13.0 |
-|  | subscriber | 3.13.0 |
-|  | workflow-controller | 0.2.1 |
+|  | chaos-exporter | 3.13.1 |
+|  | chaos-operator | 3.13.1 |
+|  | event-tracker | 3.13.1 |
+|  | subscriber | 3.13.1 |
+|  | workflow-controller | 0.2.2 |
 
 ## Installing the Chart
 
@@ -80,6 +80,7 @@ $ helm install litmus-agent litmuschaos/litmus-agent \
 | image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/litmus-helm-agent"` |  |
 | image.tag | string | `"latest"` |  |
+| podAnnotations | object | `{}` |  |
 | resources.limits.cpu | string | `"100m"` |  |
 | resources.limits.memory | string | `"128Mi"` |  |
 | resources.requests.cpu | string | `"100m"` |  |

diff --git a/charts/litmus-agent/charts/chaos-exporter/Chart.yaml b/charts/litmus-agent/charts/chaos-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.13.0"
 description:  A Helm chart to install chaos-exporter
 name: chaos-exporter
-version: 3.13.0
+version: 3.13.1
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus-agent/charts/chaos-exporter/README.md b/charts/litmus-agent/charts/chaos-exporter/README.md
@@ -1,6 +1,6 @@
 # chaos-exporter
 
-![Version: 3.13.0](https://img.shields.io/badge/Version-3.13.0-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
+![Version: 3.13.1](https://img.shields.io/badge/Version-3.13.1-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
 
 A Helm chart to install chaos-exporter
 

diff --git a/charts/litmus-agent/charts/chaos-exporter/templates/_helpers.tpl b/charts/litmus-agent/charts/chaos-exporter/templates/_helpers.tpl
@@ -57,6 +57,18 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 litmuschaos.io/app: {{ .Chart.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "chaos-exporter.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/charts/chaos-exporter/templates/deployment.yaml b/charts/litmus-agent/charts/chaos-exporter/templates/deployment.yaml
@@ -13,9 +13,9 @@ spec:
       {{- include "chaos-exporter.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with include "chaos-exporter.podAnnotations" . }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- . | indent 8 }}
       {{- end }}
       labels:
         {{- include "chaos-exporter.labels" . | nindent 8 }}

diff --git a/charts/litmus-agent/charts/chaos-operator/Chart.yaml b/charts/litmus-agent/charts/chaos-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.13.0"
 description:  A Helm chart to install chaos-operator
 name: chaos-operator
-version: 3.13.0
+version: 3.13.1
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus-agent/charts/chaos-operator/README.md b/charts/litmus-agent/charts/chaos-operator/README.md
@@ -1,6 +1,6 @@
 # chaos-operator
 
-![Version: 3.13.0](https://img.shields.io/badge/Version-3.13.0-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
+![Version: 3.13.1](https://img.shields.io/badge/Version-3.13.1-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
 
 A Helm chart to install chaos-operator
 

diff --git a/charts/litmus-agent/charts/chaos-operator/templates/_helpers.tpl b/charts/litmus-agent/charts/chaos-operator/templates/_helpers.tpl
@@ -57,6 +57,18 @@ app.kubernetes.io/name: {{ include "chaos-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "chaos-operator.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/charts/chaos-operator/templates/deployment.yaml b/charts/litmus-agent/charts/chaos-operator/templates/deployment.yaml
@@ -13,9 +13,9 @@ spec:
       {{- include "chaos-operator.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with include "chaos-operator.podAnnotations" . }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- . | indent 8 }}
       {{- end }}
       labels:
         {{- include "chaos-operator.labels" . | nindent 8 }}

diff --git a/charts/litmus-agent/charts/event-tracker/Chart.yaml b/charts/litmus-agent/charts/event-tracker/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.13.0"
 description:  A Helm chart to install event-tracker
 name: event-tracker
-version: 3.13.0
+version: 3.13.1
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus-agent/charts/event-tracker/README.md b/charts/litmus-agent/charts/event-tracker/README.md
@@ -1,6 +1,6 @@
 # event-tracker
 
-![Version: 3.13.0](https://img.shields.io/badge/Version-3.13.0-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
+![Version: 3.13.1](https://img.shields.io/badge/Version-3.13.1-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
 
 A Helm chart to install event-tracker
 

diff --git a/charts/litmus-agent/charts/event-tracker/templates/_helpers.tpl b/charts/litmus-agent/charts/event-tracker/templates/_helpers.tpl
@@ -57,6 +57,18 @@ app.kubernetes.io/name: {{ include "event-tracker.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "event-tracker.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/charts/event-tracker/templates/deployment.yaml b/charts/litmus-agent/charts/event-tracker/templates/deployment.yaml
@@ -13,9 +13,9 @@ spec:
       {{- include "event-tracker.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with include "event-tracker.podAnnotations" . }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- . | indent 8 }}
       {{- end }}
       labels:
         {{- include "event-tracker.labels" . | nindent 8 }}

diff --git a/charts/litmus-agent/charts/subscriber/Chart.yaml b/charts/litmus-agent/charts/subscriber/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.13.0"
 description:  A Helm chart to install subscriber
 name: subscriber
-version: 3.13.0
+version: 3.13.1
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus-agent/charts/subscriber/README.md b/charts/litmus-agent/charts/subscriber/README.md
@@ -1,6 +1,6 @@
 # subscriber
 
-![Version: 3.13.0](https://img.shields.io/badge/Version-3.13.0-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
+![Version: 3.13.1](https://img.shields.io/badge/Version-3.13.1-informational?style=flat-square) ![AppVersion: 3.13.0](https://img.shields.io/badge/AppVersion-3.13.0-informational?style=flat-square)
 
 A Helm chart to install subscriber
 

diff --git a/charts/litmus-agent/charts/subscriber/templates/_helpers.tpl b/charts/litmus-agent/charts/subscriber/templates/_helpers.tpl
@@ -58,6 +58,18 @@ app.kubernetes.io/name: {{ include "subscriber.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "subscriber.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/charts/subscriber/templates/deployment.yaml b/charts/litmus-agent/charts/subscriber/templates/deployment.yaml
@@ -11,9 +11,9 @@ spec:
       {{- include "subscriber.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with include "subscriber.podAnnotations" . }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- . | indent 8 }}
       {{- end }}
       labels:
         {{- include "subscriber.labels" . | nindent 8 }}

diff --git a/charts/litmus-agent/charts/workflow-controller/Chart.yaml b/charts/litmus-agent/charts/workflow-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v3.3.1"
 description:  A Helm chart to install workflow-controller
 name: workflow-controller
-version: 0.2.1
+version: 0.2.2
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus-agent/charts/workflow-controller/README.md b/charts/litmus-agent/charts/workflow-controller/README.md
@@ -1,6 +1,6 @@
 # workflow-controller
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: v3.3.1](https://img.shields.io/badge/AppVersion-v3.3.1-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![AppVersion: v3.3.1](https://img.shields.io/badge/AppVersion-v3.3.1-informational?style=flat-square)
 
 A Helm chart to install workflow-controller
 

diff --git a/charts/litmus-agent/charts/workflow-controller/templates/_helpers.tpl b/charts/litmus-agent/charts/workflow-controller/templates/_helpers.tpl
@@ -57,6 +57,18 @@ app.kubernetes.io/name: {{ include "workflow-controller.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "workflow-controller.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/charts/workflow-controller/templates/deployment.yaml b/charts/litmus-agent/charts/workflow-controller/templates/deployment.yaml
@@ -13,9 +13,9 @@ spec:
       {{- include "workflow-controller.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with include "workflow-controller.podAnnotations" . }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- . | indent 8 }}
       {{- end }}
       labels:
         {{- include "workflow-controller.labels" . | nindent 8 }}

diff --git a/charts/litmus-agent/templates/_helpers.tpl b/charts/litmus-agent/templates/_helpers.tpl
@@ -53,6 +53,19 @@ app.kubernetes.io/name: {{ include "litmus-agent.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Common pod annotations
+*/}}
+{{- define "litmus-agent.podAnnotations" -}}
+{{- if .Values.global.podAnnotations }}
+{{ toYaml .Values.global.podAnnotations }}
+{{- end }}
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/charts/litmus-agent/templates/hook-pre-install-job.yaml b/charts/litmus-agent/templates/hook-pre-install-job.yaml
@@ -15,6 +15,10 @@ spec:
   template:
     metadata:
       name: "{{ .Release.Name }}"
+      {{- with include "litmus-agent.podAnnotations" . }}
+      annotations:
+        {{- . | indent 8 }}
+      {{- end }}
       labels:
         {{- include "litmus-agent.labels" . | nindent 8 }}
     spec:

diff --git a/charts/litmus-agent/values.yaml b/charts/litmus-agent/values.yaml
@@ -40,6 +40,8 @@ image:
 crds:
   create: true
 
+podAnnotations: {}
+
 resources:
   limits:
     cpu: 100m