Merge pull request #8464 from ahardin-rh/enterprise-3.9

[enterprise-3.9]Updated max pod memory information

Author: ahardin-rh

admin_guide/limits.adoc

@@ -31,8 +31,18 @@ default value is applied to the resource.
 [[limit-range-def]]
 // tag::admin_limits_sample_definitions[]
 
-.Limit Range Object Definition
+ifdef::openshift-online[]
+[IMPORTANT]
+====
+For {product-title} Pro, the maximum pod memory is 3Gi. The minimum pod or
+container memory that you can specify is 100Mi.
+
+For {product-title} Starter, the maximum pod memory is 1Gi. The minimum pod or
+container memory that you can specify is 200Mi.
 ====
+endif::[]
+
+.Core Limit Range Object Definition
 
 [source,yaml]
 ----
@@ -84,15 +94,14 @@ specified.
 <12> The default amount of CPU that a container will request to use if not specified.
 <13> The default amount of memory that a container will request to use if not specified.
 <14> The maximum amount of CPU burst that a container can make as a ratio of its limit over request.
-====
 
-For more information on how CPU and memory are measured, see xref:../dev_guide/compute_resources.adoc#dev-compute-resources[Compute Resources]. 
+For more information on how CPU and memory are measured, see xref:../dev_guide/compute_resources.adoc#dev-compute-resources[Compute Resources].
 
 // end::admin_limits_sample_definitions[]
 
 // tag::admin_limits_sample_definitions_2[]
 .{product-title} Limit Range Object Definition
-====
+
 [source,yaml]
 ----
 apiVersion: "v1"
@@ -112,7 +121,7 @@ spec:
 <1> The maximum size of an image that can be pushed to an internal registry.
 <2> The maximum number of unique image tags per image stream's spec.
 <3> The maximum number of unique image references per image stream's status.
-====
+
 // end::admin_limits_sample_definitions_2[]
 
 Both core and {product-title} resources can be specified in just one limit range
@@ -346,7 +355,6 @@ Across all persistent volume claims in a project, the following must hold true:
 [[limit-range-obj-def]]
 
 .Limit Range Object Definition
-====
 
 [source,json]
 ----
@@ -373,7 +381,6 @@ Across all persistent volume claims in a project, the following must hold true:
 <1> The name of the limit range object.
 <2> The minimum amount of storage that can be requested in a persistent volume claim
 <3> The maximum amount of storage that can be requested in a persistent volume claim
-====
 
 // end::admin_limits_claim_limits[]
 
@@ -400,18 +407,15 @@ You can also use the CLI to view limit range details:
 . First, get the list of limit ranges defined in the project. For example, for a
 project called *demoproject*:
 +
-====
 ----
 $ oc get limits -n demoproject
 NAME              AGE
 resource-limits   6d
 ----
-====
 
 . Then, describe the limit range you are interested in, for example the
 *resource-limits* limit range:
 +
-====
 ----
 $ oc describe limits resource-limits -n demoproject
 Name:                           resource-limits
@@ -426,7 +430,6 @@ openshift.io/Image              storage                 -       1Gi     -
 openshift.io/ImageStream        openshift.io/image      -       12      -               -               -
 openshift.io/ImageStream        openshift.io/image-tags -       10      -               -               -
 ----
-====
 // end::admin_limits_viewing[]
 
 [[deleting-limits]]

dev_guide/compute_resources.adoc

@@ -19,9 +19,19 @@ compute resources that are used in your project. This helps cluster
 administrators better manage and allocate resources across all projects, and
 ensure that no projects are using more than is appropriate for the cluster size.
 
+ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
 As a developer, you can also
 set xref:dev-compute-resources[requests and limits on compute resources] at the
 pod and container level.
+endif::[]
+
+ifdef::openshift-online[]
+[IMPORTANT]
+====
+{product-title} Pro project owners can change quotas for their project, but not
+limit ranges. {product-title} Starter users cannot modify quotas or limit ranges.
+====
+endif::[]
 
 The following sections help you understand how to check on your quota and limit
 range settings, what sorts of things they can constrain, and how you can request
@@ -123,7 +133,6 @@ wanted to use 1/10 of a single core, it would be represented as 100m.
 Memory is measured in bytes. In addition, it may be used with SI suffices (E, P,
 T, G, M, K) or their power-of-two-equivalents (Ei, Pi, Ti, Gi, Mi, Ki).
 
-====
 [source,yaml]
 ----
 apiVersion: v1
@@ -140,11 +149,10 @@ spec:
         cpu: 200m <3>
         memory: 400Mi <4>
 ----
-<1> The container requests 100m cpu.
+<1> The container requests 100m CPU.
 <2> The container requests 200Mi memory.
-<3> The container limits 200m cpu.
+<3> The container limits 200m CPU.
 <4> The container limits 400Mi memory.
-====
 
 [[dev-cpu-requests]]
 === CPU Requests
@@ -173,7 +181,6 @@ endif::[]
 
 To view compute resources for a pod:
 
-====
 ----
 $ oc describe pod nginx-tfjxt
 Name:       nginx-tfjxt
@@ -205,7 +212,6 @@ Containers:
     Restart Count:  0
     Environment Variables:
 ----
-====
 
 [[dev-cpu-limits]]
 === CPU Limits
@@ -302,27 +308,27 @@ are no more *BestEffort* or *Burstable* containers on the system.
 
 To specify compute resources via the CLI:
 
-====
-ifndef::openshift-online[]
+ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
 ----
 $ oc run nginx --image=nginx --limits=cpu=200m,memory=400Mi --requests=cpu=100m,memory=200Mi
 ----
 endif::[]
+
 ifdef::openshift-online[]
 ----
 $ oc run nginx --image=nginx --limits=memory=400Mi
 ----
 endif::[]
-====
+
 
 ifdef::openshift-origin,openshift-enterprise[]
 [[opaque-integer-resources-dev]]
 === Opaque Integer Resources
 
 include::admin_guide/opaque_integer_resources.adoc[tag=oir-intro]
 
-The cluster administrator is usually responsible for creating the resources and making them available. 
-For more information on creating opaque integer resources, see xref:../admin_guide/opaque_integer_resources.adoc#admin-guide-opaque-resources[Opaque Integer Resources] in the Administrator Guide. 
+The cluster administrator is usually responsible for creating the resources and making them available.
+For more information on creating opaque integer resources, see xref:../admin_guide/opaque_integer_resources.adoc#admin-guide-opaque-resources[Opaque Integer Resources] in the Administrator Guide.
 
 To consume an opaque integer resource in a pod, edit the pod to
 include the name of the opaque resource as a key in the `spec.containers[].resources.requests` field.