Merge branch 'main' into release

particuleio · Apr 29, 2022 · 34844ca · 34844ca
2 parents 573dbbc + 360b886
commit 34844ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -12,7 +12,7 @@ dependencies:
     version: 2.6.6
     repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   - name: aws-efs-csi-driver
-    version: 2.2.5
+    version: 2.2.6
     repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
   - name: aws-for-fluent-bit
     version: 0.1.16
@@ -63,7 +63,7 @@ dependencies:
     version: 2.8.0
     repository: https://charts.konghq.com
   - name: kube-prometheus-stack
-    version: 35.0.2
+    version: 35.0.3
     repository: https://prometheus-community.github.io/helm-charts
   - name: kyverno
     version: v2.3.3
@@ -111,7 +111,7 @@ dependencies:
     version: v0.0.1
     repository: https://particuleio.github.io/charts
   - name: sealed-secrets
-    version: 2.1.6
+    version: 2.1.7
     repository: https://bitnami-labs.github.io/sealed-secrets
   - name: strimzi-kafka-operator
     version: 0.28.0

diff --git a/modules/aws/aws-ebs-csi-driver.tf b/modules/aws/aws-ebs-csi-driver.tf
@@ -209,7 +209,7 @@ resource "aws_kms_key" "aws-ebs-csi-driver" {
 
 resource "aws_kms_alias" "aws-ebs-csi-driver" {
   count         = local.aws-ebs-csi-driver.enabled && local.aws-ebs-csi-driver.use_kms && local.aws-ebs-csi-driver.create_kms_key ? 1 : 0
-  name          = "alias/aws-ebs-csi-driver-${local.aws-ebs-csi-driver.override_kms_alias != null ? local.aws-ebs-csi-driver.override_kms_alias : var.cluster-name}"
+  name          = "alias/ebs-csi-driver-${local.aws-ebs-csi-driver.override_kms_alias != null ? local.aws-ebs-csi-driver.override_kms_alias : var.cluster-name}"
   target_key_id = aws_kms_key.aws-ebs-csi-driver.0.id
 }