From e5114884329b6a8256538070b6da4f62d52b4d6d Mon Sep 17 00:00:00 2001 From: "kristian.kanchev" Date: Thu, 20 May 2021 21:58:52 +0300 Subject: [PATCH 1/2] Added CSI provisioner check to func isEBSVolume --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index fa9421c..227e567 100644 --- a/main.go +++ b/main.go @@ -133,7 +133,7 @@ func main() { */ func isEBSVolume(volume *v1.PersistentVolumeClaim) bool { for k, v := range volume.Annotations { - if k == "volume.beta.kubernetes.io/storage-provisioner" && v == "kubernetes.io/aws-ebs" { + if k == "volume.beta.kubernetes.io/storage-provisioner" && v == "kubernetes.io/aws-ebs" || k == "volume.beta.kubernetes.io/storage-provisioner" && v == "kubernetes.io/ebs.csi.aws.com" { return true } } From 3e23af8549162d30d4e8388177f65f6088866ca4 Mon Sep 17 00:00:00 2001 From: "kristian.kanchev" Date: Thu, 20 May 2021 23:20:15 +0300 Subject: [PATCH 2/2] Fixed syntax as per request --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 227e567..bc0028b 100644 --- a/main.go +++ b/main.go @@ -133,7 +133,7 @@ func main() { */ func isEBSVolume(volume *v1.PersistentVolumeClaim) bool { for k, v := range volume.Annotations { - if k == "volume.beta.kubernetes.io/storage-provisioner" && v == "kubernetes.io/aws-ebs" || k == "volume.beta.kubernetes.io/storage-provisioner" && v == "kubernetes.io/ebs.csi.aws.com" { + if k == "volume.beta.kubernetes.io/storage-provisioner" && (v == "kubernetes.io/aws-ebs" || v == "kubernetes.io/ebs.csi.aws.com") { return true } }