Skip to content

Commit 0f2a8da

Browse files
authored
Merge pull request #134 from NetApp/FSxN-as-PVC-for-EKS
Minor documentation changes.
2 parents 1d78070 + dc415dc commit 0f2a8da

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

Solutions/FSxN-as-PVC-for-EKS/README-san.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Vserver Volume Aggregate State Type Size Available Used%
125125
--------- ------------ ------------ ---------- ---- ---------- ---------- -----
126126
ekssvm ekssvm_root aggr1 online RW 1GB 972.4MB 0%
127127
ekssvm trident_pvc_1aae479e_4b27_4310_8bb2_71255134edf0
128-
aggr1 online RW 55GB 54.90GB 0%
128+
aggr1 online RW 55GB 55.00GB 0%
129129
2 entries were displayed.
130130

131131
FsxId0887a493c777c5122::> quit

Solutions/FSxN-as-PVC-for-EKS/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ vpc-id = "vpc-03ed6b1867d76e1a9"
122122
:bulb: **Tip:** You will use the values in the commands below, so probably a good idea to copy the output somewhere
123123
so you can easily reference it later.
124124

125-
> [!NOTE]
125+
> [!IMPORTANT]
126126
> Note that an FSxN File System was created, with a vserver (a.k.a. SVM). The default username
127127
> for the FSxN File System is 'fsxadmin'. And the default username for the vserver is 'vsadmin'. The
128128
> password for both of these users is the same and is what is stored in the AWS SecretsManager secret
@@ -339,13 +339,12 @@ from the AWS console. Here is an example of logging in and listing all the volum
339339
ubuntu@ip-10-0-4-125:~/FSx-ONTAP-samples-scripts/Solutions/FSxN-as-PVC-for-EKS$ ssh -l fsxadmin 198.19.255.174
340340
([email protected]) Password:
341341

342-
Last login time: 6/21/2024 15:30:27
343342
FsxId0887a493c777c5122::> volume show
344343
Vserver Volume Aggregate State Type Size Available Used%
345344
--------- ------------ ------------ ---------- ---- ---------- ---------- -----
346345
ekssvm ekssvm_root aggr1 online RW 1GB 972.4MB 0%
347346
ekssvm trident_pvc_1aae479e_4b27_4310_8bb2_71255134edf0
348-
aggr1 online RW 50GB 50GB 0%
347+
aggr1 online RW 50GB 50.00GB 0%
349348
2 entries were displayed.
350349

351350
FsxId0887a493c777c5122::> quit
@@ -458,7 +457,7 @@ kubectl get volumesnapshot
458457
The output should look like:
459458
```bash
460459
NAME READYTOUSE SOURCEPVC SOURCESNAPSHOTCONTENT RESTORESIZE SNAPSHOTCLASS SNAPSHOTCONTENT CREATIONTIME AGE
461-
mysql-volume-nas-snap-01 true mysql-volume-nas 50Gi fsx-snapclass snapcontent-bdce9310-9698-4b37-9f9b-d1d802e44f17 2m18s 2m18s
460+
mysql-volume-nas-snap-01 true mysql-volume-nas 63908Ki fsx-snapclass snapcontent-bdce9310-9698-4b37-9f9b-d1d802e44f17 2m18s 2m18s
462461
```
463462
To see more details on how the snapshot was defined, look at the `manifests/volume-snapshot-nas.yaml` file.
464463

Solutions/FSxN-as-PVC-for-EKS/terraform/variables.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ variable "fsx_password_secret_name" {
1818
description = "The base name of the secret to create within the AWS Secrets Manager that will contain the FSxN password. A random string will be appended to the end of the secreate name to ensure no name conflict."
1919
}
2020

21-
variable "fsxn_throughput_capacity" {
22-
default = 128
23-
description = "The throughput capacity to be allocated to the FSxN cluster. Must be 128, 256, 512, 1024, 2048, 4096."
24-
validation {
25-
condition = contains([128, 256, 512, 1024, 2048, 4096], var.fsxn_throughput_capacity)
26-
error_message = "The throughput capacity must be 128, 256, 512, 1024, 2048, or 4096."
27-
}
28-
}
29-
3021
variable "fsxn_storage_capacity" {
3122
default = 1024
3223
description = "The storage capacity, in GiBs, to be allocated to the FSxN clsuter. Must be at least 1024, and less than 196608."
@@ -35,6 +26,15 @@ variable "fsxn_storage_capacity" {
3526
error_message = "The storage capacity must be at least 1024, and less than 196608."
3627
}
3728
}
29+
30+
variable "fsxn_throughput_capacity" {
31+
default = 128
32+
description = "The throughput capacity to be allocated to the FSxN cluster. Must be 128, 256, 512, 1024, 2048, 4096."
33+
validation {
34+
condition = contains([128, 256, 512, 1024, 2048, 4096], var.fsxn_throughput_capacity)
35+
error_message = "The throughput capacity must be 128, 256, 512, 1024, 2048, or 4096."
36+
}
37+
}
3838
#
3939
# Keep in mind that key pairs are regional, so pick one that is in the region specified above.
4040
variable "key_pair_name" {

0 commit comments

Comments
 (0)