Merge branch 'main' into release

particuleio · Oct 27, 2021 · d09bb90 · d09bb90
2 parents b501bd8 + 3b306af
commit d09bb90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -117,7 +117,7 @@ dependencies:
     version: 0.17.1
     repository: https://helm.releases.hashicorp.com
   - name: velero
-    version: 2.24.0
+    version: 2.26.1
     repository: https://vmware-tanzu.github.io/helm-charts
   - name: victoria-metrics-k8s-stack
     version: 0.5.4

diff --git a/modules/aws/aws-ebs-csi-driver.tf b/modules/aws/aws-ebs-csi-driver.tf
@@ -215,4 +215,8 @@ resource "aws_kms_alias" "aws-ebs-csi-driver" {
 resource "kubernetes_manifest" "aws-ebs-csi-driver_vsc" {
   count    = local.aws-ebs-csi-driver.enabled && local.aws-ebs-csi-driver.volume_snapshot_class != null ? 1 : 0
   manifest = yamldecode(local.aws-ebs-csi-driver.volume_snapshot_class)
+
+  depends_on = [
+    kubectl_manifest.csi-external-snapshotter
+  ]
 }