Skip to content

add sanity testing #21

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

Merged
merged 1 commit into from
Mar 28, 2023
+225,535 −249
Merged

add sanity testing #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions CHANGELOG-0.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ sub-image-%:
.PHONY: test
test:
go test -v -race ./pkg/...
go test -v ./tests/sanity/...

.PHONY: clean
clean:
Expand Down
4 changes: 2 additions & 2 deletions examples/kubernetes/dynamic_provisioning/specs/storageclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/static_provisioning/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
- ReadWriteMany
mountOptions:
- flock
persistentVolumeReclaimPolicy: Recycle
persistentVolumeReclaimPolicy: Retain
Copy link
Contributor

@PatrickGhadban PatrickGhadban Mar 22, 2023

Choose a reason for hiding this comment

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

I know that this change is planned but I'm not sure if you wanted to include it here. If you do, could you please expand your original git message to include the context?

Copy link
Contributor Author

@kuba-wolf kuba-wolf Mar 22, 2023

Choose a reason for hiding this comment

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

I don't think it's big enough to be included in the git message, but I'll make a note of it in the PR

csi:
driver: filecache.csi.aws.com
volumeHandle: [FileCacheId]
Expand Down
6 changes: 3 additions & 3 deletions examples/kubernetes/static_provisioning/specs/pv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 11 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
73 changes: 72 additions & 1 deletion go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions hack/update-gomock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions pkg/cloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ type FileCache struct {
MountName string
FileCacheType string
FileCacheTypeVersion string
perUnitStorageThroughput int64
PerUnitStorageThroughput int64
}

type FileCacheOptions struct {
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down
Loading