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] feat: add annotations for velero deployment and restic daemonset #217

Merged
merged 3 commits into from
Feb 24, 2021
Merged

[velero] feat: add annotations for velero deployment and restic daemonset #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f82959e
[velero] feat: add annotations for velero deployment and restic daemo…
cyril-corbon Feb 11, 2021
7303f02
fix: add annotation in metadata only if they are defined
cyril-corbon Feb 17, 2021
0cd8c70
add labels and annotation for service and apply review
cyril-corbon Feb 18, 2021
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 @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.5.3
description: A Helm chart for velero
name: velero
version: 2.14.10
version: 2.14.11
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
Expand Down
7 changes: 7 additions & 0 deletions charts/velero/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "velero.fullname" . }}
{{- with .Values.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "velero.chart" . }}
component: velero
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: 1
selector:
Expand Down
7 changes: 7 additions & 0 deletions charts/velero/templates/restic-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: restic
{{- with .Values.restic.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "velero.chart" . }}
{{- with .Values.restic.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
Expand Down
7 changes: 7 additions & 0 deletions charts/velero/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "velero.fullname" . }}
{{- with .Values.metrics.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "velero.chart" . }}
{{- with .Values.metrics.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: ClusterIP
ports:
Expand Down
20 changes: 20 additions & 0 deletions charts/velero/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ image:
imagePullSecrets: []
# - registrySecretName

# Annotations to add to the Velero deployment's. Optional.
#
# If you are using reloader use the following annotation with your VELERO_SECRET_NAME
annotations: {}
# secret.reloader.stakater.com/reload: "<VELERO_SECRET_NAME>"

# Labels to add to the Velero deployment's. Optional.
labels: {}

# Annotations to add to the Velero deployment's pod template. Optional.
#
# If using kube2iam or kiam, use the following annotation with your AWS_ACCOUNT_ID
Expand Down Expand Up @@ -72,6 +81,11 @@ metrics:
scrapeInterval: 30s
scrapeTimeout: 10s

# service metdata if metrics are enabled
service:
annotations: {}
labels: {}

# Pod annotations for Prometheus
podAnnotations:
prometheus.io/scrape: "true"
Expand Down Expand Up @@ -262,6 +276,12 @@ restic:
# Tolerations to use for the Restic daemonset. Optional.
tolerations: []

# Annotations to set for the Restic daemonset. Optional.
annotations: {}

# labels to set for the Restic daemonset. Optional.
labels: {}

# Extra volumes for the Restic daemonset. Optional.
extraVolumes: []

Expand Down