Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update EFS Driver Version to v1.5.4 #664

Merged
merged 18 commits into from
Apr 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions deployments/cognito-rds-s3/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions deployments/cognito/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions deployments/rds-s3/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions deployments/vanilla/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/fixtures/storage_efs_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand All @@ -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}"]

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/utils/auto-efs-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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!")
Expand Down
6 changes: 3 additions & 3 deletions website/content/en/docs/add-ons/storage/efs/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down