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.

Sign up for GitHub

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

Jump to bottom

Add x-AZ mount support for efs-csi-driver #425

Merged
merged 1 commit into from
Apr 28, 2021
Merged

Add x-AZ mount support for efs-csi-driver #425

merged 1 commit into from
Apr 28, 2021

Conversation

kbasv
Copy link

@kbasv kbasv commented Apr 27, 2021

Is this a bug fix or adding new feature?
New feature.

What is this PR about? / Why do we need it?
Bump efs-utils to 1.30.1. This adds support for x-AZ mounts. Users can pass desired AZ under mountOptions either in PV or Storage class. For example, to mount file system with a mount target in the AZ us-east-1a, add az=us-east-1a under mount options.

What testing is done?
Tested on my EKS cluster

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 27, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @kbasv. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 27, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 27, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 27, 2021
@kbasv kbasv changed the title Add x-AZ support for efs-csi-driver Add x-AZ mount support for efs-csi-driver Apr 27, 2021
@wongma7
Copy link
Contributor

wongma7 commented Apr 27, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 27, 2021
@wongma7
Copy link
Contributor

wongma7 commented Apr 28, 2021

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kbasv, wongma7

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 03c239e into kubernetes-sigs:master Apr 28, 2021
@wongma7
Copy link
Contributor

wongma7 commented Apr 28, 2021

BTW I want to do a stress test of some kind before we make another release #428.

Cappuccinuo
Cappuccinuo reviewed Apr 29, 2021
View reviewed changes
pkg/driver/efs_watch_dog.go
@@ -26,9 +26,17 @@ import (
"k8s.io/klog"
)

// https://github.com/aws/efs-utils/blob/v1.28.2/dist/efs-utils.conf
// https://github.com/aws/efs-utils/blob/v1.30.2/dist/efs-utils.conf
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the v1.30.2 config file, any reason we don't keep the consistency with the version in DockerFile?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Planning to bump efs-utils to 1.30.2 when it is available in linux repo. There isn't too much difference between conf files for 1.30.1 & 1.30.2 so decided to copy over the content of 1.30.2

Cappuccinuo
Cappuccinuo reviewed Apr 29, 2021
View reviewed changes
pkg/driver/efs_watch_dog.go
@@ -248,7 +264,7 @@ func (w *execWatchdog) runLoop(stopCh <-chan struct{}) {
for {
select {
case <-stopCh:
klog.Info("stopping...")
//klog.Info("stopping...")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why comment this out?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah this sneaked in when I was running tests locally, will revert in next commit.

Cappuccinuo
Cappuccinuo reviewed Apr 29, 2021
View reviewed changes
Copy link

@Cappuccinuo Cappuccinuo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just bump the version? The csi-driver will take care of the option parsing, right? Also why the config file is separate in the efs_watch_dog.go file?

@kbasv
Copy link
Author

kbasv commented May 3, 2021 •
edited
Loading

Just bump the version? The csi-driver will take care of the option parsing, right? Also why the config file is separate in the efs_watch_dog.go file?

@Cappuccinuo
Yup bumping efs-utils version is enough for x-AZ. CSI driver will pass the option to efs-utils.

Regarding separate config file, I believe it was a side effect of trying the preserve the static config files between driver restarts to ensure mounts continue to work on driver restarts.

@kbasv kbasv deleted the x-AZ branch May 12, 2021 19:49
@spanktar
Copy link

spanktar commented Jun 17, 2021 •
edited
Loading

@kbasv How would one utilize this in the Helm chart?
https://github.com/kubernetes-sigs/aws-efs-csi-driver/blob/master/charts/aws-efs-csi-driver/values.yaml#L81-L89
and
https://github.com/kubernetes-sigs/aws-efs-csi-driver/blob/master/charts/aws-efs-csi-driver/templates/node-daemonset.yaml#L24-L31

New ticket: #496

@spanktar spanktar mentioned this pull request Jun 17, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cappuccinuo Cappuccinuo Cappuccinuo left review comments

@wongma7 wongma7 wongma7 left review comments

@anonymint anonymint anonymint left review comments

@jqmichael jqmichael Awaiting requested review from jqmichael

@justinsb justinsb Awaiting requested review from justinsb

Assignees

@wongma7 wongma7

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@kbasv @k8s-ci-robot @wongma7 @spanktar @anonymint @Cappuccinuo