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

[velero] fix: consistent node-agent podLabels #623

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[velero] fix: consistent node-agent podLabels #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/velero/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 1.14.1
kubeVersion: ">=1.16.0-0"
description: A Helm chart for velero
name: velero
version: 7.2.1
version: 7.2.2
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
Expand Down
4 changes: 2 additions & 2 deletions charts/velero/templates/node-agent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "velero.chart" . }}
{{- if .Values.podLabels }}
{{- toYaml .Values.podLabels | nindent 8 }}
{{- if .Values.nodeAgent.podLabels }}
{{- toYaml .Values.nodeAgent.podLabels | nindent 8 }}
{{- end }}
{{- if or .Values.podAnnotations .Values.metrics.enabled (and .Values.credentials.useSecret (not .Values.credentials.existingSecret)) }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion charts/velero/templates/podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app.kubernetes.io/name: {{ include "velero.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
name: node-agent
{{- with .Values.nodeAgent.labels }}
{{- with .Values.nodeAgent.podLabels }}
{{- toYaml . | nindent 6 }}
{{- end }}
podMetricsEndpoints:
Expand Down
4 changes: 4 additions & 0 deletions charts/velero/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,10 @@ nodeAgent:
# labels to set for the node-agent daemonset. Optional.
labels: {}

# Additional pod labels for the node-agent daemonset. Optional
# ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
podLabels: {}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there is the label for the node-agent?

helm-charts/charts/velero/values.yaml

Lines 557 to 558 in f0f07de

# labels to set for the node-agent daemonset. Optional.
labels: {}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello,

Yes this is where the labels for the node-agent DaemonSet are defined. Meanwhile the PodMonitor will not match the labels of the DaemonSet but the labels of the pods created by the DaemonSet.

The labels of the pods of the node-agent DaemonSet are defined as ".Values.podLabels", hence they will be the same as the labels of the Velero Deployment. But the PodMonitor will try to match the labels defined in ".Values.nodeAgent.labels".

So with the current chart it is impossible to have different labels between the Velero Deployment and the Velero node-agent.

Best Regards.


# will map /scratch to emptyDir. Set to false and specify your own volume
# via extraVolumes and extraVolumeMounts that maps to /scratch
# if you don't want to use emptyDir.
Expand Down
Loading