Merge remote-tracking branch 'upstream/master'

kubernetes-sigs · Feb 1, 2020 · ba14046 · ba14046
2 parents 1c62f2f + c111989
commit ba14046
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/OWNERS b/OWNERS
@@ -5,3 +5,4 @@ approvers:
 - leakingtapan
 - justinsb
 - jsafrane
+- wongma7
diff --git a/examples/kubernetes/static_provisioning/README.md b/examples/kubernetes/static_provisioning/README.md
@@ -13,8 +13,9 @@ spec:
   volumeMode: Filesystem
   accessModes:
     - ReadWriteMany
+  mountOptions:
+    - flock
   persistentVolumeReclaimPolicy: Recycle
-  storageClassName: fsx-sc
   csi:
     driver: fsx.csi.aws.com
     volumeHandle: [FileSystemId]
@@ -28,9 +29,8 @@ Replace `volumeHandle` with `FileSystemId` and `dnsname` with `DNSName`. You can
 ```
 
 ### Deploy the Application
-Create PV, persistence volume claim (PVC), storageclass and the pod that consumes the PV:
+Create PV, persistent volume claim (PVC), and the pod that consumes the PV:
 ```sh
->> kubectl apply -f examples/kubernetes/static_provisioning/specs/storageclass.yaml
 >> kubectl apply -f examples/kubernetes/static_provisioning/specs/pv.yaml
 >> kubectl apply -f examples/kubernetes/static_provisioning/specs/claim.yaml
 >> kubectl apply -f examples/kubernetes/static_provisioning/specs/pod.yaml

diff --git a/examples/kubernetes/static_provisioning/specs/claim.yaml b/examples/kubernetes/static_provisioning/specs/claim.yaml
@@ -5,7 +5,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteMany
-  storageClassName: fsx-sc
+  storageClassName: ""
   resources:
     requests:
       storage: 1200Gi
+  volumeName: fsx-pv
diff --git a/examples/kubernetes/static_provisioning/specs/pv.yaml b/examples/kubernetes/static_provisioning/specs/pv.yaml
@@ -4,12 +4,13 @@ metadata:
   name: fsx-pv
 spec:
   capacity:
-    storage: 5Gi
+    storage: 1200Gi
   volumeMode: Filesystem
   accessModes:
     - ReadWriteMany
-  persistentVolumeReclaimPolicy: Recycle
-  storageClassName: fsx-sc
+  mountOptions:
+    - flock
+  persistentVolumeReclaimPolicy: Retain
   csi:
     driver: fsx.csi.aws.com
     volumeHandle: fs-0199e5a63bd90f796

diff --git a/examples/kubernetes/static_provisioning/specs/storageclass.yaml b/examples/kubernetes/static_provisioning/specs/storageclass.yaml