diff --git a/content/cn/docs/concepts/policy/pod-security-policy.md b/content/cn/docs/concepts/policy/pod-security-policy.md index a33cb3a043..23e8680b5d 100644 --- a/content/cn/docs/concepts/policy/pod-security-policy.md +++ b/content/cn/docs/concepts/policy/pod-security-policy.md @@ -109,7 +109,6 @@ _Pod 安全策略_ 由设置和策略组成,它们能够控制 Pod 访问的 1. configMap 1. vsphereVolume 1. quobyte -1. photonPersistentDisk 1. projected 1. portworxVolume 1. scaleIO diff --git a/content/en/docs/concepts/storage/persistent-volumes.md b/content/en/docs/concepts/storage/persistent-volumes.md index b10475e12b..27365b615e 100644 --- a/content/en/docs/concepts/storage/persistent-volumes.md +++ b/content/en/docs/concepts/storage/persistent-volumes.md @@ -234,7 +234,6 @@ resizing to take place. Also, file system resizing is only supported for followi * VsphereVolume * Quobyte Volumes * HostPath (Single node testing only -- local storage is not supported in any way and WILL NOT WORK in a multi-node cluster) -* VMware Photon * Portworx Volumes * ScaleIO Volumes * StorageOS @@ -313,7 +312,6 @@ In the CLI, the access modes are abbreviated to: | Glusterfs | ✓ | ✓ | ✓ | | HostPath | ✓ | - | - | | iSCSI | ✓ | ✓ | - | -| PhotonPersistentDisk | ✓ | - | - | | Quobyte | ✓ | ✓ | ✓ | | NFS | ✓ | ✓ | ✓ | | RBD | ✓ | ✓ | - | @@ -367,7 +365,6 @@ The following volume types support mount options: * Glusterfs * VsphereVolume * Quobyte Volumes -* VMware Photon Mount options are not validated, so mount will simply fail if one is invalid. diff --git a/content/en/docs/concepts/storage/storage-classes.md b/content/en/docs/concepts/storage/storage-classes.md index ccba9623e3..76bf11dc72 100644 --- a/content/en/docs/concepts/storage/storage-classes.md +++ b/content/en/docs/concepts/storage/storage-classes.md @@ -69,7 +69,6 @@ for provisioning PVs. This field must be specified. | GCEPersistentDisk | ✓ | [GCE](#gce) | | Glusterfs | ✓ | [Glusterfs](#glusterfs) | | iSCSI | - | - | -| PhotonPersistentDisk | ✓ | - | | Quobyte | ✓ | [Quobyte](#quobyte) | | NFS | - | - | | RBD | ✓ | [Ceph RBD](#ceph-rbd) | diff --git a/content/en/docs/getting-started-guides/scratch.md b/content/en/docs/getting-started-guides/scratch.md index 5bf657bdad..2102e36d80 100644 --- a/content/en/docs/getting-started-guides/scratch.md +++ b/content/en/docs/getting-started-guides/scratch.md @@ -640,7 +640,7 @@ This pod mounts several node file system directories using the `hostPath` volum Apiserver supports several cloud providers. -- options for `--cloud-provider` flag are `aws`, `azure`, `cloudstack`, `fake`, `gce`, `mesos`, `openstack`, `ovirt`, `photon`, `rackspace`, `vsphere`, or unset. +- options for `--cloud-provider` flag are `aws`, `azure`, `cloudstack`, `fake`, `gce`, `mesos`, `openstack`, `ovirt`, `rackspace`, `vsphere`, or unset. - unset used for bare metal setups. - support for new IaaS is added by contributing code [here](https://releases.k8s.io/{{< param "githubbranch" >}}/pkg/cloudprovider/providers)