Skip to content

Commit

Permalink
Worked around a breaking API change in NetApp Cloud Volumes Service i…
Browse files Browse the repository at this point in the history
…n AWS

Closes: #288
  • Loading branch information
clintonk authored and adkerr committed Sep 12, 2019
1 parent e465ba9 commit 8c2d924
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- **Kubernetes:** Reduced log verbosity in CSI sidecars.
- **Kubernetes:** Added fix for volume names longer than 64 characters in solidfire and ontap-nas-economy drivers.
- **Kubernetes:** Fix for Azure NetApp Files to work with non-CSI deployments.
- Worked around a breaking API change in NetApp Cloud Volumes Service in AWS. (Issue [#288](https://github.com/NetApp/trident/issues/288))

**Deprecations:**
- **Kubernetes:** Deprecated support for external etcd stores for storing Trident's data in favor of CRDs. Will be
Expand Down
2 changes: 1 addition & 1 deletion storage_drivers/aws/api/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

const httpTimeoutSeconds = 30
const retryTimeoutSeconds = 30
const createTimeoutSeconds = 300
const createTimeoutSeconds = 480

// ClientConfig holds configuration data for the API driver object.
type ClientConfig struct {
Expand Down
6 changes: 3 additions & 3 deletions storage_drivers/aws/aws_cvs.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const (
MinimumVolumeSizeBytes = 1000000000 // 1 GB
MinimumCVSVolumeSizeBytes = 100000000000 // 100 GB
MinimumAPIVersion = "1.0.0"
MinimumSDEVersion = "1.66.3"
MinimumSDEVersion = "1.126.1"

defaultServiceLevel = api.ServiceLevelStandard
defaultNfsMountOptions = "-o nfsvers=3"
Expand Down Expand Up @@ -591,7 +591,7 @@ func (d *NFSStorageDriver) Create(
AllowedClients: pool.InternalAttributes[ExportRule],
Cifs: false,
Nfsv3: true,
Nfsv4: true,
Nfsv4: false,
RuleIndex: 1,
UnixReadOnly: false,
UnixReadWrite: true,
Expand All @@ -616,7 +616,7 @@ func (d *NFSStorageDriver) Create(
CreationToken: name,
ExportPolicy: exportPolicy,
Labels: d.getTelemetryLabels(),
ProtocolTypes: []string{api.ProtocolTypeNFSv3, api.ProtocolTypeNFSv4},
ProtocolTypes: []string{api.ProtocolTypeNFSv3},
QuotaInBytes: int64(sizeBytes),
SecurityStyle: defaultSecurityStyle,
ServiceLevel: serviceLevel,
Expand Down

0 comments on commit 8c2d924

Please sign in to comment.