From 89f39c34ceac9c3bc6632459278cf88e6dac8afc Mon Sep 17 00:00:00 2001 From: Calvinaud Date: Mon, 16 Dec 2024 10:31:20 +0100 Subject: [PATCH] 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 * Add pod-annotations to agent job Signed-off-by: Calvin Audier * Running helm-docs Signed-off-by: Calvin Audier --------- Signed-off-by: Calvin Audier Signed-off-by: Calvinaud Co-authored-by: Vedant Shrotria --- charts/litmus-agent/Chart.yaml | 12 ++++++------ charts/litmus-agent/README.md | 13 +++++++------ .../litmus-agent/charts/chaos-exporter/Chart.yaml | 2 +- charts/litmus-agent/charts/chaos-exporter/README.md | 2 +- .../charts/chaos-exporter/templates/_helpers.tpl | 12 ++++++++++++ .../charts/chaos-exporter/templates/deployment.yaml | 4 ++-- .../litmus-agent/charts/chaos-operator/Chart.yaml | 2 +- charts/litmus-agent/charts/chaos-operator/README.md | 2 +- .../charts/chaos-operator/templates/_helpers.tpl | 12 ++++++++++++ .../charts/chaos-operator/templates/deployment.yaml | 4 ++-- charts/litmus-agent/charts/event-tracker/Chart.yaml | 2 +- charts/litmus-agent/charts/event-tracker/README.md | 2 +- .../charts/event-tracker/templates/_helpers.tpl | 12 ++++++++++++ .../charts/event-tracker/templates/deployment.yaml | 4 ++-- charts/litmus-agent/charts/subscriber/Chart.yaml | 2 +- charts/litmus-agent/charts/subscriber/README.md | 2 +- .../charts/subscriber/templates/_helpers.tpl | 12 ++++++++++++ .../charts/subscriber/templates/deployment.yaml | 4 ++-- .../charts/workflow-controller/Chart.yaml | 2 +- .../charts/workflow-controller/README.md | 2 +- .../workflow-controller/templates/_helpers.tpl | 12 ++++++++++++ .../workflow-controller/templates/deployment.yaml | 4 ++-- charts/litmus-agent/templates/_helpers.tpl | 13 +++++++++++++ .../templates/hook-pre-install-job.yaml | 4 ++++ charts/litmus-agent/values.yaml | 2 ++ 25 files changed, 112 insertions(+), 32 deletions(-) diff --git a/charts/litmus-agent/Chart.yaml b/charts/litmus-agent/Chart.yaml index 40b9bac5..074ca047 100644 --- 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 index d352368a..6b5d8cfe 100644 --- 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 index 8a6488ec..aefd511e 100644 --- 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 index 99d0069c..8ddafc92 100644 --- 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 index c31f9e54..2c9fc301 100644 --- 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 index de4c5fdd..d87d48c2 100644 --- 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 index b279a191..836a6225 100644 --- 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 index f928a7df..3c6d01c6 100644 --- 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 index f8ce529d..b447fb6b 100644 --- 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 index 5214597d..fe9726be 100644 --- 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 index b4dde9c9..2c60dde2 100644 --- 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 index fa65d834..baff72ab 100644 --- 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 index fd4baaf9..cad9ff42 100644 --- 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 index f04efb28..e6040ce7 100644 --- 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 index cee2f204..4735cb33 100644 --- 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 index c14f6ff5..886f5c5a 100644 --- 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 index c530e2a9..8114ef5b 100644 --- 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 index 0c92a2c5..ac795710 100644 --- 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 index 4a4c8f55..cef23e1f 100644 --- 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 index d0566c38..242710a9 100644 --- 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 index 72b5c0df..77784d69 100644 --- 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 index 235f534a..920da3ea 100644 --- 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 index e6c34bd3..811ea3b7 100644 --- 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 index 1f8ab77e..4389ec55 100644 --- 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 index 7125eae0..4e93881d 100644 --- 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