From aba559b23daeb1db2a0fe601fdebf09d318b1ec4 Mon Sep 17 00:00:00 2001
From: mr-bot <project2872_bot1@noreply.repo1.dso.mil>
Date: Wed, 1 Feb 2023 16:00:36 +0000
Subject: [PATCH] Simplify/add Velero plugin values
---
chart/templates/velero/values.yaml | 59 ++++--------------------------
chart/values.yaml | 2 +-
2 files changed, 8 insertions(+), 53 deletions(-)
diff --git a/chart/templates/velero/values.yaml b/chart/templates/velero/values.yaml
index 662f4b3aa8..1b7e323e38 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 7ae05f13d2..8a6895a297 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: {}
--
GitLab