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

Fix agent global pod annotations #408

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

Fix agent global pod annotations #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f990824
Update the litmus-agent chart to use global podannotations
Calvinaud Oct 16, 2024
061f093
Add pod-annotations to agent job
Calvinaud Oct 16, 2024
b011a3e
Merge branch 'master' into fix-agent-global-pod-annotations
Calvinaud Oct 16, 2024
0c23a65
Merge branch 'master' into fix-agent-global-pod-annotations
Calvinaud Nov 20, 2024
6cd622f
Running helm-docs
Calvinaud Nov 20, 2024
5f279de
Merge branch 'master' into fix-agent-global-pod-annotations
Calvinaud Nov 26, 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
12 changes: 6 additions & 6 deletions charts/litmus-agent/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.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:
Expand All @@ -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
13 changes: 7 additions & 6 deletions charts/litmus-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-exporter/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.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:
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-exporter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 12 additions & 0 deletions charts/litmus-agent/charts/chaos-exporter/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/litmus-agent/charts/chaos-exporter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-operator/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.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:
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 12 additions & 0 deletions charts/litmus-agent/charts/chaos-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/litmus-agent/charts/chaos-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/event-tracker/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.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:
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/event-tracker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 12 additions & 0 deletions charts/litmus-agent/charts/event-tracker/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/litmus-agent/charts/event-tracker/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/subscriber/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.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:
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/subscriber/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 12 additions & 0 deletions charts/litmus-agent/charts/subscriber/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/litmus-agent/charts/subscriber/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/workflow-controller/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: "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:
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/workflow-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 12 additions & 0 deletions charts/litmus-agent/charts/workflow-controller/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 2 additions & 2 deletions charts/litmus-agent/charts/workflow-controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
13 changes: 13 additions & 0 deletions charts/litmus-agent/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
4 changes: 4 additions & 0 deletions charts/litmus-agent/templates/hook-pre-install-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions charts/litmus-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ image:
crds:
create: true

podAnnotations: {}

resources:
limits:
cpu: 100m
Expand Down