diff --git a/chart/templates/velero/values.yaml b/chart/templates/velero/values.yaml index 662f4b3aa83375fec9bc6ce32bf2760ee7674afc..1b7e323e38afb6f2f5a6e9798c8f9a8b570150d0 100644 --- a/chart/templates/velero/values.yaml +++ b/chart/templates/velero/values.yaml @@ -53,64 +53,19 @@ image: pullPolicy: {{ .Values.imagePullPolicy }} {{- if eq (len .Values.addons.velero.plugins) 0 }}{{- fail "At least one plugin in '.Values.addons.velero.plugins' required. Supported values: aws, azure, csi" }}{{- end }} -initContainers: +plugins: {{- range .Values.addons.velero.plugins }} {{- if eq . "aws" }} - - name: velero-plugin-for-aws - image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.6.0 - imagePullPolicy: {{ dig "image" "pullPolicy" "IfNotPresent" $.Values.addons.velero.values }} - volumeMounts: - - mountPath: /target - name: plugins - resources: - requests: - memory: 512Mi - cpu: 100m - limits: - memory: 512Mi - cpu: 100m - securityContext: - capabilities: - drop: - - ALL + aws: + enabled: true {{- end }} {{- if eq . "azure" }} - - name: velero-plugin-for-azure - image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-microsoft-azure:v1.6.0 - imagePullPolicy: {{ dig "image" "pullPolicy" "IfNotPresent" $.Values.addons.velero.values }} - volumeMounts: - - mountPath: /target - name: plugins - resources: - requests: - memory: 512Mi - cpu: 100m - limits: - memory: 512Mi - cpu: 100m - securityContext: - capabilities: - drop: - - ALL + azure: + enabled: true {{- end }} {{- if eq . "csi" }} - - name: velero-plugin-for-csi - image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-csi:v0.4.0 - imagePullPolicy: {{ dig "image" "pullPolicy" "IfNotPresent" $.Values.addons.velero.values }} - volumeMounts: - - mountPath: /target - name: plugins - resources: - requests: - memory: 512Mi - cpu: 100m - limits: - memory: 512Mi - cpu: 100m - securityContext: - capabilities: - drop: - - ALL + csi: + enabled: true configuration: features: EnableCSI {{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 7ae05f13d20a8190c2f65334a8cd49e76cd4d34e..8a6895a2976e777ba28d4f94787e91e52779bdda 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1375,7 +1375,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/cluster-utilities/velero.git path: "./chart" - tag: "3.1.0-bb.1" + tag: "3.1.0-bb.2" # -- Flux reconciliation overrides specifically for the Velero Package flux: {}