Merge branch 'main' into release

particuleio · May 1, 2022 · 0a52790 · 0a52790
2 parents 34844ca + fda6b27
commit 0a52790
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
@@ -57,7 +57,7 @@ dependencies:
     version: 2.6.2
     repository: https://kedacore.github.io/charts
   - name: keycloak
-    version: 18.1.0
+    version: 18.1.1
     repository: https://codecentric.github.io/helm-charts
   - name: kong
     version: 2.8.0
@@ -105,7 +105,7 @@ dependencies:
     version: 5.7.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: rabbitmq-cluster-operator
-    version: 2.6.0
+    version: 2.6.1
     repository: https://charts.bitnami.com/bitnami
   - name: scaleway-webhook
     version: v0.0.1
@@ -126,7 +126,7 @@ dependencies:
     version: 10.19.4
     repository: https://helm.traefik.io/traefik
   - name: memcached
-    version: 6.0.16
+    version: 6.0.17
     repository: https://charts.bitnami.com/bitnami
   - name: vault
     version: 0.19.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/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/aws-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
 }