Merge branch 'main' into lula-threshold-update

defenseunicorns · Aug 16, 2024 · 8bc5837 · 8bc5837
2 parents ccd5943 + eff9a82
commit 8bc5837
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 4 deletions.
diff --git a/src/velero/README.md b/src/velero/README.md
@@ -8,9 +8,9 @@ https://velero.io/
 
 - k3d installed on machine
 
-#### Object Storage
+#### S3 Compatible Object Storage
 
-S3 compatible object storage must be available in order to use this package. Bucket information and access credentials can be provided via configuration values / env vars:
+Bucket information and access credentials can be provided via configuration values / env vars:
 
 - Bucket ID: `ZARF_VAR_VELERO_BUCKET`
 - Bucket Region: `ZARF_VAR_VELERO_BUCKET_REGION`
@@ -44,9 +44,34 @@ By overriding the velero values in the bundle as follows:
               value: "velero-bucket-credentials"
 ```
 
-## Plugin Compatibility
+#### Azure Blob Storage
 
-This package currently assumes the availability of S3 API compatible object storage. As such, only the AWS specific plugin image is included, in addition to the CSI plugin which is baked into Velero by default. More information about all available plugins [can be found in the upstream docs](https://velero.io/plugins/). Ironbank includes images for the Azure plugin, but it is currently excluded from this package. We may revisit package defaults at some point in the future depending on usage and user requests.
+Blob information and access credentials can be provided by overriding bundle values:
+```
+  - name: core
+    overrides:
+      velero:
+        velero:
+          values:
+            - path: credentials.secretContents.cloud
+              value: |       
+                AZURE_STORAGE_ACCOUNT_ACCESS_KEY=${VELERO_STORAGE_ACCOUNT_ACCESS_KEY}
+                AZURE_CLOUD_NAME=${VELERO_CLOUD_NAME}
+            - path: configuration.backupStorageLocation
+              value:
+                - name: default
+                  provider: azure
+                  bucket: ${VERLERO_BUCKET_NAME}
+                  config: 
+                    storageAccount:${VELERO_STORAGE_ACCOUNT}
+                    resourceGroup:${VELERO_RESOURCE_GROUP}
+                    storageAccountKeyEnvVar:VELERO_STORAGE_ACCOUNT_ACCESS_KEY
+                    subscriptionId:${AZ_SUBSCRIPTION_ID}
+```
+
+## Plugin Compatability
+
+This package currently assumes the availability of S3 API compatible object storage, Azure blob storage or use of the CSI plugin which is baked into Velero by default. More information about all available plugins can be found in the upstream docs**[can be found in the upstream docs](https://velero.io/plugins/). 
 
 ## Deploy
 

diff --git a/src/velero/values/registry1-values.yaml b/src/velero/values/registry1-values.yaml
@@ -14,3 +14,9 @@ initContainers:
     volumeMounts:
       - mountPath: /target
         name: plugins
+  - name: velero-plugin-for-azure
+    image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-microsoft-azure:v1.10.0
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
diff --git a/src/velero/values/unicorn-values.yaml b/src/velero/values/unicorn-values.yaml
@@ -14,3 +14,9 @@ initContainers:
     volumeMounts:
       - mountPath: /target
         name: plugins
+  - name: velero-plugin-for-azure
+    image: velero/velero-plugin-for-microsoft-azure:v1.10.0
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
diff --git a/src/velero/values/upstream-values.yaml b/src/velero/values/upstream-values.yaml
@@ -14,3 +14,9 @@ initContainers:
     volumeMounts:
       - mountPath: /target
         name: plugins
+  - name: velero-plugin-for-azure
+    image: velero/velero-plugin-for-microsoft-azure:v1.10.0
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
diff --git a/src/velero/zarf.yaml b/src/velero/zarf.yaml
@@ -19,6 +19,7 @@ components:
       - velero/velero:v1.14.0
       - velero/velero-plugin-for-aws:v1.10.0
       - docker.io/bitnami/kubectl:1.31.0
+      - velero/velero-plugin-for-microsoft-azure:v1.10.0
 
   - name: velero
     required: true
@@ -34,6 +35,7 @@ components:
       - registry1.dso.mil/ironbank/opensource/velero/velero:v1.14.0
       - registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.10.0
       - registry1.dso.mil/ironbank/big-bang/base:2.1.0
+      - registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-microsoft-azure:v1.10.0
 
   - name: velero
     required: true
@@ -49,3 +51,4 @@ components:
       - cgr.dev/du-uds-defenseunicorns/velero-fips:1.14.0-dev
       - cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.10.0
       - cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.29.7-dev
+      - velero/velero-plugin-for-microsoft-azure:v1.10.0