Skip to content

[online-3.6] changed all instances of emptydir and EmptyDir to emptyDir #6108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaurav-nelson merged 1 commit into from
Nov 3, 2017
Merged

[online-3.6] changed all instances of emptydir and EmptyDir to emptyDir #6108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions architecture/additional_concepts/storage.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ ifdef::openshift-dedicated[]
====
* PVs are provisioned with either EBS volumes (AWS) or GCP storage (GCP), depending on where the cluster is provisioned.
* Only RWO access mode is applicable, since EBS volumes and GCE Persistent Disks cannot be mounted to multiple nodes.
* *EmptyDir* has the same lifecycle as the pod:
** *EmptyDir* volumes survive container crashes/restarts.
** *EmptyDir* volumes are deleted when the pod is deleted.
* *emptyDir* has the same lifecycle as the pod:
** *emptyDir* volumes survive container crashes/restarts.
** *emptyDir* volumes are deleted when the pod is deleted.
====
endif::[]

Expand All @@ -359,12 +359,12 @@ ifdef::openshift-online[]
* Only RWO access access mode is applicable, since EBS volumes and GCE Persistent Disks cannot be mounted to to multiple nodes.
* Docker volumes are disabled.
** VOLUME directive without a mapped external volume fails to be instantiated.
* *EmptyDir* is restricted to 512 Mi per project (group) per node.
* *emptyDir* is restricted to 512 Mi per project (group) per node.
** If there is a single pod for a project on a particular node, then the pod can consume up to 512 Mi of *emptyDir* storage.
** If there are multiple pods for a project on a particular node, then those pods will share the 512 Mi of *emptyDir* storage.
* *EmptyDir* has the same lifecycle as the pod:
** *EmptyDir* volumes survive container crashes/restarts.
** *EmptyDir* volumes are deleted when the pod is deleted.
* *emptyDir* has the same lifecycle as the pod:
** *emptyDir* volumes survive container crashes/restarts.
** *emptyDir* volumes are deleted when the pod is deleted.
====
endif::[]

Expand Down
2 changes: 1 addition & 1 deletion creating_images/guidelines.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ ifdef::openshift-online[]

Docker images cannot be built using the `VOLUME` directive in the `DOCKERFILE`.
Images using a read/write file system need to use persistent volumes or
`emptydir` volumes instead of local storage. Instead of specifying a volume in
`emptyDir` volumes instead of local storage. Instead of specifying a volume in
the Dockerfile, specify a directory for local storage and mount either a
persistent volume or `emptyDir` volume to that directory when deploying the pod.
endif::[]
Expand Down
2 changes: 1 addition & 1 deletion dev_guide/application_lifecycle/new_app.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ as input to `new-app`, then an image stream is created for that image as well.

a|`DeploymentConfig`
a|A `DeploymentConfig` is created either to deploy the output of a build, or a
specified image. The `new-app` command creates xref:../volumes.adoc#dev-guide-volumes[*EmptyDir*
specified image. The `new-app` command creates xref:../volumes.adoc#dev-guide-volumes[*emptyDir*
volumes] for all Docker volumes that are specified in containers included in the
resulting `DeploymentConfig`.

Expand Down
4 changes: 2 additions & 2 deletions dev_guide/volumes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ are present, to repair them when possible, {product-title} invokes the `fsck`
utility prior to the `mount` utility. This occurs when either adding a volume or
updating an existing volume.

The simplest volume type is `EmptyDir`, which is a temporary directory on a
The simplest volume type is `emptyDir`, which is a temporary directory on a
single machine. Administrators may also allow you to request a
xref:persistent_volumes.adoc#dev-guide-persistent-volumes[persistent volume] that is automatically attached
to your pods.

[NOTE]
====
`EmptyDir` volume storage may be restricted by a quota based on the pod's
`emptyDir` volume storage may be restricted by a quota based on the pod's
FSGroup, if the FSGroup parameter is enabled by your cluster administrator.
====

Expand Down
4 changes: 2 additions & 2 deletions getting_started/devpreview_faq.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Yes, but with a few caveats. For
https://docs.docker.com/engine/security/security/[security reasons], no images
that run processes as root are allowed. Additionally, any Dockerfile `VOLUME`
instruction must be mounted with either a persistent volume claim (PVC) or an
EmptyDir at this time. See xref:devpreview-current-usage-considerations[more
emptyDir at this time. See xref:devpreview-current-usage-considerations[more
considerations].

CAN I RUN PRODUCTION SERVICES ON THE DEVELOPER PREVIEW?::
Expand Down Expand Up @@ -141,7 +141,7 @@ pods and containers.
secrets (though some amount of these secrets will be needed by the system's
build and deployer service accounts).
* Any Dockerfile `VOLUME` instruction must be mounted with either a persistent
volume claim (PVC) or an EmptyDir at this time.
volume claim (PVC) or an emptyDir at this time.
* The project associated with a user can allocate up to two PVCs of up to 1 GiB each.
* No images that run as *root* are allowed.
* Only the Source-to-Image (S2I) build strategy is allowed for any build
Expand Down
Loading