PodSecurity: restrictedVolumes: regenerate files

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes0.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - gcePersistentDisk:
-      pdName: testing
+      pdName: test
-    name: volume-gcepersistentdisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes1.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - awsElasticBlockStore:
-      volumeID: testing
+      volumeID: test
-    name: volume-awselasticblockstore
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes10.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flocker:
-      datasetName: testing
+      datasetName: test
-    name: volume-flocker
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes11.yaml

@@ -14,5 +14,5 @@ spec:
   volumes:
   - fc:
       wwids:
-      - testing
+      - test
-    name: volume-fc
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes12.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureFile:
-      secretName: testing
+      secretName: test
-      shareName: testing
+      shareName: test
-    name: volume-azurefile
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes13.yaml

@@ -12,6 +12,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-vsphere
+  - name: volume1
     vsphereVolume:
-      volumePath: testing
+      volumePath: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes14.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-quobyte
+  - name: volume1
     quobyte:
       registry: localhost:1234
-      volume: testing
+      volume: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes15.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureDisk:
-      diskName: testing
+      diskName: test
       diskURI: https://test.blob.core.windows.net/test/test.vhd
-    name: volume-azuredisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes16.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-portworxvolume
+  - name: volume1
     portworxVolume:
       fsType: ext4
-      volumeID: testing
+      volumeID: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes17.yaml

@@ -12,9 +12,9 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-scaleio
+  - name: volume1
     scaleIO:
       gateway: localhost
       secretRef: null
-      system: testing
+      system: test
-      volumeName: testing
+      volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes18.yaml

@@ -12,6 +12,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-storageos
+  - name: volume1
     storageos:
       volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes19.yaml

@@ -14,4 +14,4 @@ spec:
   volumes:
   - hostPath:
       path: /dev/null
-    name: volume-hostpath
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes2.yaml

@@ -14,4 +14,4 @@ spec:
   volumes:
   - gitRepo:
       repository: github.com/kubernetes/kubernetes
-    name: volume-gitrepo
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes3.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-nfs
+  - name: volume1
     nfs:
-      path: /testing
+      path: /test
-      server: testing
+      server: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes4.yaml

@@ -15,5 +15,5 @@ spec:
   - iscsi:
       iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz
       lun: 0
-      targetPortal: testing
+      targetPortal: test
-    name: volume-iscsi
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes5.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - glusterfs:
-      endpoints: testing
+      endpoints: test
-      path: testing
+      path: test
-    name: volume-glusterfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes6.yaml

@@ -12,8 +12,8 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-rbd
+  - name: volume1
     rbd:
-      image: testing
+      image: test
       monitors:
-      - testing
+      - test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes7.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flexVolume:
-      driver: testing
+      driver: test
-    name: volume-flexvolume
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes8.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - cinder:
-      volumeID: testing
+      volumeID: test
-    name: volume-cinder
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/fail/restrictedvolumes9.yaml

@@ -14,5 +14,5 @@ spec:
   volumes:
   - cephfs:
       monitors:
-      - testing
+      - test
-    name: volume-cephfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.0/pass/restrictedvolumes0.yaml

@@ -12,23 +12,24 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - configMap:
+  - name: volume0
-      name: volume-configmap-test
+  - emptyDir: {}
-    name: volume-configmap
+    name: volume1
+  - name: volume2
+    secret:
+      secretName: test
+  - name: volume3
+    persistentVolumeClaim:
+      claimName: test
   - downwardAPI:
       items:
       - fieldRef:
           fieldPath: metadata.labels
         path: labels
-    name: volume-downwardapi
+    name: volume4
-  - emptyDir: {}
+  - configMap:
-    name: volume-emptydir
+      name: test
-  - name: volume-pvc
+    name: volume5
-    persistentVolumeClaim:
+  - name: volume6
-      claimName: test
-  - name: volume-projects
     projected:
       sources: []
-  - name: volume-secret
-    secret:
-      secretName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes0.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - gcePersistentDisk:
-      pdName: testing
+      pdName: test
-    name: volume-gcepersistentdisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes1.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - awsElasticBlockStore:
-      volumeID: testing
+      volumeID: test
-    name: volume-awselasticblockstore
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes10.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flocker:
-      datasetName: testing
+      datasetName: test
-    name: volume-flocker
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes11.yaml

@@ -14,5 +14,5 @@ spec:
   volumes:
   - fc:
       wwids:
-      - testing
+      - test
-    name: volume-fc
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes12.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureFile:
-      secretName: testing
+      secretName: test
-      shareName: testing
+      shareName: test
-    name: volume-azurefile
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes13.yaml

@@ -12,6 +12,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-vsphere
+  - name: volume1
     vsphereVolume:
-      volumePath: testing
+      volumePath: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes14.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-quobyte
+  - name: volume1
     quobyte:
       registry: localhost:1234
-      volume: testing
+      volume: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes15.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureDisk:
-      diskName: testing
+      diskName: test
       diskURI: https://test.blob.core.windows.net/test/test.vhd
-    name: volume-azuredisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes16.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-portworxvolume
+  - name: volume1
     portworxVolume:
       fsType: ext4
-      volumeID: testing
+      volumeID: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes17.yaml

@@ -12,9 +12,9 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-scaleio
+  - name: volume1
     scaleIO:
       gateway: localhost
       secretRef: null
-      system: testing
+      system: test
-      volumeName: testing
+      volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes18.yaml

@@ -12,6 +12,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-storageos
+  - name: volume1
     storageos:
       volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes19.yaml

@@ -14,4 +14,4 @@ spec:
   volumes:
   - hostPath:
       path: /dev/null
-    name: volume-hostpath
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes2.yaml

@@ -14,4 +14,4 @@ spec:
   volumes:
   - gitRepo:
       repository: github.com/kubernetes/kubernetes
-    name: volume-gitrepo
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes3.yaml

@@ -12,7 +12,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-nfs
+  - name: volume1
     nfs:
-      path: /testing
+      path: /test
-      server: testing
+      server: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes4.yaml

@@ -15,5 +15,5 @@ spec:
   - iscsi:
       iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz
       lun: 0
-      targetPortal: testing
+      targetPortal: test
-    name: volume-iscsi
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes5.yaml

@@ -13,6 +13,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - glusterfs:
-      endpoints: testing
+      endpoints: test
-      path: testing
+      path: test
-    name: volume-glusterfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes6.yaml

@@ -12,8 +12,8 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-rbd
+  - name: volume1
     rbd:
-      image: testing
+      image: test
       monitors:
-      - testing
+      - test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes7.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flexVolume:
-      driver: testing
+      driver: test
-    name: volume-flexvolume
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes8.yaml

@@ -13,5 +13,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - cinder:
-      volumeID: testing
+      volumeID: test
-    name: volume-cinder
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/fail/restrictedvolumes9.yaml

@@ -14,5 +14,5 @@ spec:
   volumes:
   - cephfs:
       monitors:
-      - testing
+      - test
-    name: volume-cephfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.1/pass/restrictedvolumes0.yaml

@@ -12,23 +12,24 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - configMap:
+  - name: volume0
-      name: volume-configmap-test
+  - emptyDir: {}
-    name: volume-configmap
+    name: volume1
+  - name: volume2
+    secret:
+      secretName: test
+  - name: volume3
+    persistentVolumeClaim:
+      claimName: test
   - downwardAPI:
       items:
       - fieldRef:
           fieldPath: metadata.labels
         path: labels
-    name: volume-downwardapi
+    name: volume4
-  - emptyDir: {}
+  - configMap:
-    name: volume-emptydir
+      name: test
-  - name: volume-pvc
+    name: volume5
-    persistentVolumeClaim:
+  - name: volume6
-      claimName: test
-  - name: volume-projects
     projected:
       sources: []
-  - name: volume-secret
-    secret:
-      secretName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes0.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - gcePersistentDisk:
-      pdName: testing
+      pdName: test
-    name: volume-gcepersistentdisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes1.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - awsElasticBlockStore:
-      volumeID: testing
+      volumeID: test
-    name: volume-awselasticblockstore
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes10.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flocker:
-      datasetName: testing
+      datasetName: test
-    name: volume-flocker
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes11.yaml

@@ -18,5 +18,5 @@ spec:
   volumes:
   - fc:
       wwids:
-      - testing
+      - test
-    name: volume-fc
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes12.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureFile:
-      secretName: testing
+      secretName: test
-      shareName: testing
+      shareName: test
-    name: volume-azurefile
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes13.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-vsphere
+  - name: volume1
     vsphereVolume:
-      volumePath: testing
+      volumePath: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes14.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-quobyte
+  - name: volume1
     quobyte:
       registry: localhost:1234
-      volume: testing
+      volume: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes15.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureDisk:
-      diskName: testing
+      diskName: test
       diskURI: https://test.blob.core.windows.net/test/test.vhd
-    name: volume-azuredisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes16.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-portworxvolume
+  - name: volume1
     portworxVolume:
       fsType: ext4
-      volumeID: testing
+      volumeID: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes17.yaml

@@ -16,9 +16,9 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-scaleio
+  - name: volume1
     scaleIO:
       gateway: localhost
       secretRef: null
-      system: testing
+      system: test
-      volumeName: testing
+      volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes18.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-storageos
+  - name: volume1
     storageos:
       volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes19.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - hostPath:
       path: /dev/null
-    name: volume-hostpath
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes2.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - gitRepo:
       repository: github.com/kubernetes/kubernetes
-    name: volume-gitrepo
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes3.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-nfs
+  - name: volume1
     nfs:
-      path: /testing
+      path: /test
-      server: testing
+      server: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes4.yaml

@@ -19,5 +19,5 @@ spec:
   - iscsi:
       iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz
       lun: 0
-      targetPortal: testing
+      targetPortal: test
-    name: volume-iscsi
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes5.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - glusterfs:
-      endpoints: testing
+      endpoints: test
-      path: testing
+      path: test
-    name: volume-glusterfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes6.yaml

@@ -16,8 +16,8 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-rbd
+  - name: volume1
     rbd:
-      image: testing
+      image: test
       monitors:
-      - testing
+      - test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes7.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flexVolume:
-      driver: testing
+      driver: test
-    name: volume-flexvolume
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes8.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - cinder:
-      volumeID: testing
+      volumeID: test
-    name: volume-cinder
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/fail/restrictedvolumes9.yaml

@@ -18,5 +18,5 @@ spec:
   volumes:
   - cephfs:
       monitors:
-      - testing
+      - test
-    name: volume-cephfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.10/pass/restrictedvolumes0.yaml

@@ -16,23 +16,24 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - configMap:
+  - name: volume0
-      name: volume-configmap-test
+  - emptyDir: {}
-    name: volume-configmap
+    name: volume1
+  - name: volume2
+    secret:
+      secretName: test
+  - name: volume3
+    persistentVolumeClaim:
+      claimName: test
   - downwardAPI:
       items:
       - fieldRef:
           fieldPath: metadata.labels
         path: labels
-    name: volume-downwardapi
+    name: volume4
-  - emptyDir: {}
+  - configMap:
-    name: volume-emptydir
+      name: test
-  - name: volume-pvc
+    name: volume5
-    persistentVolumeClaim:
+  - name: volume6
-      claimName: test
-  - name: volume-projects
     projected:
       sources: []
-  - name: volume-secret
-    secret:
-      secretName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes0.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - gcePersistentDisk:
-      pdName: testing
+      pdName: test
-    name: volume-gcepersistentdisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes1.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - awsElasticBlockStore:
-      volumeID: testing
+      volumeID: test
-    name: volume-awselasticblockstore
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes10.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flocker:
-      datasetName: testing
+      datasetName: test
-    name: volume-flocker
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes11.yaml

@@ -18,5 +18,5 @@ spec:
   volumes:
   - fc:
       wwids:
-      - testing
+      - test
-    name: volume-fc
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes12.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureFile:
-      secretName: testing
+      secretName: test
-      shareName: testing
+      shareName: test
-    name: volume-azurefile
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes13.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-vsphere
+  - name: volume1
     vsphereVolume:
-      volumePath: testing
+      volumePath: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes14.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-quobyte
+  - name: volume1
     quobyte:
       registry: localhost:1234
-      volume: testing
+      volume: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes15.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureDisk:
-      diskName: testing
+      diskName: test
       diskURI: https://test.blob.core.windows.net/test/test.vhd
-    name: volume-azuredisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes16.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-portworxvolume
+  - name: volume1
     portworxVolume:
       fsType: ext4
-      volumeID: testing
+      volumeID: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes17.yaml

@@ -16,9 +16,9 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-scaleio
+  - name: volume1
     scaleIO:
       gateway: localhost
       secretRef: null
-      system: testing
+      system: test
-      volumeName: testing
+      volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes18.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-storageos
+  - name: volume1
     storageos:
       volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes19.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - hostPath:
       path: /dev/null
-    name: volume-hostpath
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes2.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - gitRepo:
       repository: github.com/kubernetes/kubernetes
-    name: volume-gitrepo
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes3.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-nfs
+  - name: volume1
     nfs:
-      path: /testing
+      path: /test
-      server: testing
+      server: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes4.yaml

@@ -19,5 +19,5 @@ spec:
   - iscsi:
       iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz
       lun: 0
-      targetPortal: testing
+      targetPortal: test
-    name: volume-iscsi
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes5.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - glusterfs:
-      endpoints: testing
+      endpoints: test
-      path: testing
+      path: test
-    name: volume-glusterfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes6.yaml

@@ -16,8 +16,8 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-rbd
+  - name: volume1
     rbd:
-      image: testing
+      image: test
       monitors:
-      - testing
+      - test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes7.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flexVolume:
-      driver: testing
+      driver: test
-    name: volume-flexvolume
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes8.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - cinder:
-      volumeID: testing
+      volumeID: test
-    name: volume-cinder
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/fail/restrictedvolumes9.yaml

@@ -18,5 +18,5 @@ spec:
   volumes:
   - cephfs:
       monitors:
-      - testing
+      - test
-    name: volume-cephfs
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.11/pass/restrictedvolumes0.yaml

@@ -16,23 +16,24 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - configMap:
+  - name: volume0
-      name: volume-configmap-test
+  - emptyDir: {}
-    name: volume-configmap
+    name: volume1
+  - name: volume2
+    secret:
+      secretName: test
+  - name: volume3
+    persistentVolumeClaim:
+      claimName: test
   - downwardAPI:
       items:
       - fieldRef:
           fieldPath: metadata.labels
         path: labels
-    name: volume-downwardapi
+    name: volume4
-  - emptyDir: {}
+  - configMap:
-    name: volume-emptydir
+      name: test
-  - name: volume-pvc
+    name: volume5
-    persistentVolumeClaim:
+  - name: volume6
-      claimName: test
-  - name: volume-projects
     projected:
       sources: []
-  - name: volume-secret
-    secret:
-      secretName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes0.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - gcePersistentDisk:
-      pdName: testing
+      pdName: test
-    name: volume-gcepersistentdisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes1.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - awsElasticBlockStore:
-      volumeID: testing
+      volumeID: test
-    name: volume-awselasticblockstore
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes10.yaml

@@ -17,5 +17,5 @@ spec:
     runAsNonRoot: true
   volumes:
   - flocker:
-      datasetName: testing
+      datasetName: test
-    name: volume-flocker
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes11.yaml

@@ -18,5 +18,5 @@ spec:
   volumes:
   - fc:
       wwids:
-      - testing
+      - test
-    name: volume-fc
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes12.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureFile:
-      secretName: testing
+      secretName: test
-      shareName: testing
+      shareName: test
-    name: volume-azurefile
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes13.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-vsphere
+  - name: volume1
     vsphereVolume:
-      volumePath: testing
+      volumePath: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes14.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-quobyte
+  - name: volume1
     quobyte:
       registry: localhost:1234
-      volume: testing
+      volume: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes15.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - azureDisk:
-      diskName: testing
+      diskName: test
       diskURI: https://test.blob.core.windows.net/test/test.vhd
-    name: volume-azuredisk
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes16.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-portworxvolume
+  - name: volume1
     portworxVolume:
       fsType: ext4
-      volumeID: testing
+      volumeID: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes17.yaml

@@ -16,9 +16,9 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-scaleio
+  - name: volume1
     scaleIO:
       gateway: localhost
       secretRef: null
-      system: testing
+      system: test
-      volumeName: testing
+      volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes18.yaml

@@ -16,6 +16,6 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-storageos
+  - name: volume1
     storageos:
       volumeName: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes19.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - hostPath:
       path: /dev/null
-    name: volume-hostpath
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes2.yaml

@@ -18,4 +18,4 @@ spec:
   volumes:
   - gitRepo:
       repository: github.com/kubernetes/kubernetes
-    name: volume-gitrepo
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes3.yaml

@@ -16,7 +16,7 @@ spec:
   securityContext:
     runAsNonRoot: true
   volumes:
-  - name: volume-nfs
+  - name: volume1
     nfs:
-      path: /testing
+      path: /test
-      server: testing
+      server: test

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes4.yaml

@@ -19,5 +19,5 @@ spec:
   - iscsi:
       iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz
       lun: 0
-      targetPortal: testing
+      targetPortal: test
-    name: volume-iscsi
+    name: volume1

staging/src/k8s.io/pod-security-admission/test/testdata/restricted/v1.12/fail/restrictedvolumes5.yaml

@@ -17,6 +17,6 @@ spec:
     runAsNonRoot: true
   volumes:
   - glusterfs:
-      endpoints: testing
+      endpoints: test
-      path: testing
+      path: test
-    name: volume-glusterfs
+    name: volume1