Merge pull request #21 from jacobwolfaws/main

add sanity testing

Author: k8s-ci-robot

CHANGELOG-0.x.md

@@ -1,6 +1,4 @@
 # v0.1.0
-
-[//]: # (TODO: Create v0.1.0 branch)
 [Documentation](https://github.com/kubernetes-sigs/aws-file-cache-csi-driver/blob/v0.1.0/docs/README.md)
 
 ### Notable changes

Makefile

@@ -79,6 +79,7 @@ sub-image-%:
 .PHONY: test
 test:
 	go test -v -race ./pkg/...
+	go test -v ./tests/sanity/...
 
 .PHONY: clean
 clean:

examples/kubernetes/dynamic_provisioning/specs/storageclass.yaml

@@ -4,8 +4,8 @@ metadata:
   name: fc-sc
 provisioner: filecache.csi.aws.com
 parameters:
-  subnetId: subnet-074ea3b7386e4802b
-  securityGroupIds: sg-046ad64768e4cf756
+  subnetId: subnet-0980aa7d25bc5fbf6
+  securityGroupIds: sg-0ce0ae50c693cdf88
   dataRepositoryAssociations: "FileCachePath=/ns1/,DataRepositoryPath=nfs://10.0.92.69/,NFS={Version=NFS3},DataRepositorySubdirectories=[subdir1,subdir2,subdir3]"
   fileCacheType: "LUSTRE"
   fileCacheTypeVersion: "2.12"

examples/kubernetes/static_provisioning/README.md

@@ -16,7 +16,7 @@ spec:
     - ReadWriteMany
   mountOptions:
     - flock
-  persistentVolumeReclaimPolicy: Recycle
+  persistentVolumeReclaimPolicy: Retain
   csi:
     driver: filecache.csi.aws.com
     volumeHandle: [FileCacheId]

examples/kubernetes/static_provisioning/specs/pv.yaml

@@ -13,7 +13,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: filecache.csi.aws.com
-    volumeHandle: fc-0ef97ba968aaae830
+    volumeHandle: fc-052e0e05e02430ef2
     volumeAttributes:
-      dnsname: fc-0ef97ba968aaae830.fsx.us-east-1.amazonaws.com
-      mountname: uvh2hbev
+      dnsname: fc-052e0e05e02430ef2.fsx.us-east-1.amazonaws.com
+      mountname: r473jbev

go.mod

@@ -3,25 +3,34 @@ module sigs.k8s.io/aws-file-cache-csi-driver
 go 1.19
 
 require (
-	github.com/aws/aws-sdk-go v1.44.181
+	github.com/aws/aws-sdk-go v1.44.225
 	github.com/container-storage-interface/spec v1.7.0
 	github.com/golang/mock v1.6.0
+	github.com/kubernetes-csi/csi-test v2.0.1+incompatible
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.23.0
 	google.golang.org/grpc v1.27.0
 	k8s.io/apimachinery v0.26.1
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/mount-utils v0.26.0
 )
 
 require (
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
 	golang.org/x/sys v0.3.0 // indirect
 	golang.org/x/text v0.5.0 // indirect
-	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
 )

go.sum

@@ -18,4 +18,6 @@ set -euo pipefail
 
 IMPORT_PATH=sigs.k8s.io/aws-file-cache-csi-driver
 mockgen -package=mocks -destination=./pkg/driver/mocks/mock_mount.go --build_flags=--mod=mod ${IMPORT_PATH}/pkg/driver Mounter
+mockgen -package=mocks -destination=./pkg/cloud/mocks/mock_ec2metadata.go --build_flags=--mod=mod ${IMPORT_PATH}/pkg/cloud EC2Metadata
+mockgen -package=mocks -destination=./pkg/cloud/mocks/mock_fsx.go --build_flags=--mod=mod ${IMPORT_PATH}/pkg/cloud FSx
 mockgen -package=mocks -destination=./pkg/driver/mocks/mock_cloud.go --build_flags=--mod=mod ${IMPORT_PATH}/pkg/cloud Cloud

hack/update-gomock

@@ -100,7 +100,7 @@ type FileCache struct {
 	MountName                string
 	FileCacheType            string
 	FileCacheTypeVersion     string
-	perUnitStorageThroughput int64
+	PerUnitStorageThroughput int64
 }
 
 type FileCacheOptions struct {
@@ -309,7 +309,7 @@ func (c *cloud) CreateFileCache(ctx context.Context, volumeName string, fileCach
 		MountName:                mountName,
 		FileCacheType:            *output.FileCache.FileCacheType,
 		FileCacheTypeVersion:     *output.FileCache.FileCacheTypeVersion,
-		perUnitStorageThroughput: perUnitStorageThroughput,
+		PerUnitStorageThroughput: perUnitStorageThroughput,
 	}, nil
 }
 
@@ -349,7 +349,7 @@ func (c *cloud) DescribeFileCache(ctx context.Context, fileCacheId string) (*Fil
 		MountName:                mountName,
 		FileCacheType:            *fc.FileCacheType,
 		FileCacheTypeVersion:     *fc.FileCacheTypeVersion,
-		perUnitStorageThroughput: perUnitStorageThroughput,
+		PerUnitStorageThroughput: perUnitStorageThroughput,
 	}, nil
 }