diff --git a/deployments/cognito-rds-s3/terraform/main.tf b/deployments/cognito-rds-s3/terraform/main.tf index c9fa394fc7..6565650d01 100644 --- a/deployments/cognito-rds-s3/terraform/main.tf +++ b/deployments/cognito-rds-s3/terraform/main.tf @@ -145,6 +145,12 @@ module "eks_blueprints_kubernetes_addons" { # EKS Blueprints Add-ons enable_cert_manager = true enable_aws_load_balancer_controller = true + + aws_efs_csi_driver_helm_config = { + namespace = "kube-system" + version = "2.4.1" + } + enable_aws_efs_csi_driver = true enable_aws_fsx_csi_driver = true diff --git a/deployments/cognito/terraform/main.tf b/deployments/cognito/terraform/main.tf index 5bd19e5ef5..ac820250b7 100644 --- a/deployments/cognito/terraform/main.tf +++ b/deployments/cognito/terraform/main.tf @@ -146,6 +146,12 @@ module "eks_blueprints_kubernetes_addons" { # EKS Blueprints Add-ons enable_cert_manager = true enable_aws_load_balancer_controller = true + + aws_efs_csi_driver_helm_config = { + namespace = "kube-system" + version = "2.4.1" + } + enable_aws_efs_csi_driver = true enable_aws_fsx_csi_driver = true diff --git a/deployments/rds-s3/terraform/main.tf b/deployments/rds-s3/terraform/main.tf index 41fd313442..9fd01127bb 100644 --- a/deployments/rds-s3/terraform/main.tf +++ b/deployments/rds-s3/terraform/main.tf @@ -138,6 +138,12 @@ module "eks_blueprints_kubernetes_addons" { # EKS Blueprints Add-ons enable_cert_manager = true enable_aws_load_balancer_controller = true + + aws_efs_csi_driver_helm_config = { + namespace = "kube-system" + version = "2.4.1" + } + enable_aws_efs_csi_driver = true enable_aws_fsx_csi_driver = true diff --git a/deployments/vanilla/terraform/main.tf b/deployments/vanilla/terraform/main.tf index 54ea0d4093..b7630cc351 100644 --- a/deployments/vanilla/terraform/main.tf +++ b/deployments/vanilla/terraform/main.tf @@ -137,6 +137,12 @@ module "eks_blueprints_kubernetes_addons" { # EKS Blueprints Add-ons enable_cert_manager = true enable_aws_load_balancer_controller = true + + aws_efs_csi_driver_helm_config = { + namespace = "kube-system" + version = "2.4.1" + } + enable_aws_efs_csi_driver = true enable_aws_fsx_csi_driver = true @@ -146,6 +152,7 @@ module "eks_blueprints_kubernetes_addons" { } + # todo: update the blueprints repo code to export the desired values as outputs module "eks_blueprints_outputs" { source = "../../../iaac/terraform/utils/blueprints-extended-outputs" diff --git a/tests/e2e/fixtures/storage_efs_dependencies.py b/tests/e2e/fixtures/storage_efs_dependencies.py index 97ea1969d5..0bca63c8c3 100644 --- a/tests/e2e/fixtures/storage_efs_dependencies.py +++ b/tests/e2e/fixtures/storage_efs_dependencies.py @@ -99,7 +99,7 @@ def callback(): @pytest.fixture(scope="class") def install_efs_csi_driver(metadata, region, request, cluster, installation): efs_driver = {} - EFS_DRIVER_VERSION = "v1.3.4" + EFS_DRIVER_VERSION = "v1.5.4" EFS_CSI_DRIVER = f"github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=tags/{EFS_DRIVER_VERSION}" def on_create(): @@ -122,7 +122,7 @@ def create_efs_driver_sa( efs_deps = {} iam_client = boto3.client("iam") - EFS_IAM_POLICY = "https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.3.4/docs/iam-policy-example.json" + EFS_IAM_POLICY = "https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.5.4/docs/iam-policy-example.json" policy_name = rand_name("efs-iam-policy-") policy_arn = [f"arn:aws:iam::{account_id}:policy/{policy_name}"] diff --git a/tests/e2e/utils/auto-efs-setup.py b/tests/e2e/utils/auto-efs-setup.py index 61844ea4bc..1386653597 100755 --- a/tests/e2e/utils/auto-efs-setup.py +++ b/tests/e2e/utils/auto-efs-setup.py @@ -136,7 +136,7 @@ def create_efs_iam_policy(): def get_efs_iam_policy_document(): - url = "https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.4.0/docs/iam-policy-example.json" + url = "https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.5.4/docs/iam-policy-example.json" response = urllib.request.urlopen(url) data = response.read() return data.decode("utf-8") @@ -184,7 +184,7 @@ def install_efs_driver(): print("Installing EFS driver...") kubectl_kustomize_apply( - "https://github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=tags/v1.4.0" + "https://github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=tags/v1.5.4" ) print("EFS driver installed!") diff --git a/website/content/en/docs/add-ons/storage/efs/guide.md b/website/content/en/docs/add-ons/storage/efs/guide.md index 0e2030ef3c..af786c951a 100644 --- a/website/content/en/docs/add-ons/storage/efs/guide.md +++ b/website/content/en/docs/add-ons/storage/efs/guide.md @@ -81,10 +81,10 @@ export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output t ``` #### 1. Install the EFS CSI driver -We recommend installing the EFS CSI Driver v1.3.4 directly from the [the aws-efs-csi-driver github repo](https://github.com/kubernetes-sigs/aws-efs-csi-driver) as follows: +We recommend installing the EFS CSI Driver v1.5.4 directly from the [the aws-efs-csi-driver github repo](https://github.com/kubernetes-sigs/aws-efs-csi-driver) as follows: ```bash -kubectl apply -k "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=tags/v1.3.4" +kubectl apply -k "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=tags/v1.5.4" ``` You can confirm that EFS CSI Driver was installed into the default kube-system namespace for you. You can check using the following command: @@ -101,7 +101,7 @@ The CSI driver's service account (created during installation) requires IAM perm 1. Download the IAM policy document from GitHub as follows. ```bash -curl -o iam-policy-example.json https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.3.4/docs/iam-policy-example.json +curl -o iam-policy-example.json https://raw.githubusercontent.com/kubernetes-sigs/aws-efs-csi-driver/v1.5.4/docs/iam-policy-example.json ``` 2. Create the policy.