Skip to content

Commit

Permalink
Install efs-utils from github
Browse files Browse the repository at this point in the history
  • Loading branch information
Karthik Basavaraj committed May 5, 2021
1 parent 61e2d92 commit 32ae075
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ ENV EFS_CLIENT_SOURCE=$client_source
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} make aws-efs-csi-driver

FROM amazonlinux:2.0.20210219.0
RUN yum install amazon-efs-utils-1.30.1-1.amzn2.noarch -y
#RUN yum install amazon-efs-utils-1.30.1-1.amzn2.noarch -y
# Install efs-utils from github
RUN yum -y install git rpm-build make
RUN git clone https://github.com/aws/efs-utils
RUN cd efs-utils && make rpm && yum -y install build/amazon-efs-utils*rpm

# At image build time, static files installed by efs-utils in the config directory, i.e. CAs file, need
# to be saved in another place so that the other stateful files created at runtime, i.e. private key for
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/efs_watch_dog.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func (w *execWatchdog) runLoop(stopCh <-chan struct{}) {
for {
select {
case <-stopCh:
//klog.Info("stopping...")
klog.Info("stopping...")
break
default:
err := w.exec()
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ var _ = ginkgo.Describe("[efs-csi] EFS CSI", func() {
select {
case <-done:
framework.Logf("verified exec in pod succeeded")
case <-time.After(30 * time.Second):
case <-time.After(180 * time.Second):
framework.Failf("timed out verifying exec in pod succeeded")
}
})
Expand Down

0 comments on commit 32ae075

Please sign in to comment.