diff --git a/CHANGELOG.md b/CHANGELOG.md index 638440edb..51c5faf2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/storage_drivers/aws/api/aws.go b/storage_drivers/aws/api/aws.go index 512154d7d..4a1555263 100644 --- a/storage_drivers/aws/api/aws.go +++ b/storage_drivers/aws/api/aws.go @@ -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 { diff --git a/storage_drivers/aws/aws_cvs.go b/storage_drivers/aws/aws_cvs.go index a7ece4d06..97e429335 100644 --- a/storage_drivers/aws/aws_cvs.go +++ b/storage_drivers/aws/aws_cvs.go @@ -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" @@ -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, @@ -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,