Merge branch 'update-velero-tag-3.1.0-bb.2' into 'master'

Simplify/add Velero plugin values

See merge request !2460

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 }}

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: {}