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.

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: ensure that the plugin is installed #382

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 1.9.0
kubeVersion: ">=1.16.0-0"
description: A Helm chart for velero
name: velero
version: 2.30.1
version: 2.30.3
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
Expand Down
32 changes: 29 additions & 3 deletions charts/velero/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,36 @@ spec:
dnsPolicy: {{ .Values.dnsPolicy }}
{{- if .Values.initContainers }}
initContainers:
{{- if eq (typeOf .Values.initContainers) "string" }}
{{- tpl .Values.initContainers . | nindent 8 }}
{{- if eq $provider "aws" }}
- name: {{ .Values.initContainers.name | default "velero-plugin-for-aws" | quote }}
image: {{ .Values.initContainers.name | default "velero/velero-plugin-for-aws:v1.4.1" | quote }}
{{- else if eq $provider "csi"}}
- name: {{ .Values.initContainers.name | default "velero-velero-plugin-for-csi" | quote }}
image: {{ .Values.initContainers.name | default "velero/velero-plugin-for-csi:v0.2.0" | quote }}
{{- else if eq $provider "gcp"}}
- name: {{ .Values.initContainers.name | default "velero-velero-plugin-for-gcp" | quote }}
image: {{ .Values.initContainers.name | default "velero/velero-plugin-for-gcp:v1.4.1" | quote }}
{{- else if eq $provider "azure" }}
- name: {{ .Values.initContainers.name | default "velero-velero-plugin-for-microsoft-azure" | quote }}
image: {{ .Values.initContainers.name | default "velero/velero-plugin-for-microsoft-azure:v1.4.1" | quote }}
{{- else if eq $provider "alibabacloud" }}
- name: {{ .Values.initContainers.name | default "velero-velero-plugin-for-alibabacloud" | quote }}
image: {{ .Values.initContainers.name | default "registry.cn-hangzhou.aliyuncs.com/acs/velero-plugin-alibabacloud:v1.0.0" | quote }}
{{- else }}
{{- toYaml .Values.initContainers | nindent 8 }}
- name: {{ .Values.initContainers.name }}
image: {{ .Values.initContainers.image }}
{{- end }}
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
name: plugins
{{- with .Values.initContainers.resources }}
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.initContainers.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
volumes:
Expand Down
18 changes: 5 additions & 13 deletions charts/velero/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,12 @@ resources:
dnsPolicy: ClusterFirst

# Init containers to add to the Velero deployment's pod spec. At least one plugin provider image is required.
# If the value is a string then it is evaluated as a template.
# see .Values.configuration.provider
initContainers:
# - name: velero-plugin-for-csi
# image: velero/velero-plugin-for-csi:v0.3.0
# imagePullPolicy: IfNotPresent
# volumeMounts:
# - mountPath: /target
# name: plugins
# - name: velero-plugin-for-aws
# image: velero/velero-plugin-for-aws:v1.5.0
# imagePullPolicy: IfNotPresent
# volumeMounts:
# - mountPath: /target
# name: plugins
name:
image:
containerSecurityContext: {}
resources: {}

# SecurityContext to use for the Velero deployment. Optional.
# Set fsGroup for `AWS IAM Roles for Service Accounts`
Expand Down