Skip to content

Commit

Permalink
Merge pull request openshift#7466 from ahardin-rh/no-TP-in-online-ded…
Browse files Browse the repository at this point in the history
…icated

Removed references to Tech Preview features from Online and Dedicated docs
  • Loading branch information
ahardin-rh authored Feb 1, 2018
2 parents 8604db1 + 0c6f838 commit 3e5b51f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ Topics:
File: openshift_pipeline
- Name: Cron Jobs
File: cron_jobs
Distros: openshift-enterprise,openshift-dedicated,openshift-origin,openshift-online
Distros: openshift-enterprise,openshift-origin
- Name: Create from URL
File: create_from_url
- Name: Application memory sizing
Expand Down
9 changes: 6 additions & 3 deletions admin_guide/managing_networking.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,12 @@ the JDBC connection information) rather than the actual protected service URL.
You can also assign static IP addresses to projects, ensuring that all
outgoing external connections from the specified project have recognizable
origins. This is different from the default egress router, which is used to send
traffic to specific destinations. See the
traffic to specific destinations.
ifdef::openshift-origin,openshift-enterprise[]
See the
xref:enabling-static-ips-for-external-project-traffic[Enabling Fixed IPs for
External Project Traffic] section for more information.
endif::openshift-origin,openshift-enterprise[]

As an {product-title} cluster administrator, you can control egress traffic in three ways:

Expand Down Expand Up @@ -911,7 +914,7 @@ is complicated, because nodes have both "external" IP addresses and
"internal" SDN IP addresses. Thus, some pod-to-node/master traffic may
pass through this chain, but other pod-to-node/master traffic may
bypass it.

ifdef::openshift-origin,openshift-enterprise[]
[[enabling-static-ips-for-external-project-traffic]]
== Enabling Static IPs for External Project Traffic

Expand Down Expand Up @@ -995,7 +998,7 @@ If the above is enabled for a project, all egress traffic from that project will
be routed to the node hosting that egress IP, then connected (using NAT) to that
IP address. If `egressIPs` is set on a `NetNamespace`, but there is no node
hosting that egress IP, then egress traffic from the namespace will be dropped.

endif::openshift-origin,openshift-enterprise[]

[[admin-guide-networking-multicast]]
== Enabling Multicast
Expand Down
7 changes: 4 additions & 3 deletions architecture/additional_concepts/storage.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ cluster.

The CLI shows the name of the PVC bound to the PV.

ifdef::openshift-enterprise,openshift-origin[]
[[pv-mount-options]]

=== Mount Options
[IMPORTANT]
====
Expand Down Expand Up @@ -497,7 +497,7 @@ The following persistent volume types support mount options:
====
Fibre Channel and HostPath persistent volumes do not support mount options.
====

endif::openshift-enterprise,openshift-origin[]
[[persistent-volume-claims]]

== Persistent Volume Claims
Expand Down Expand Up @@ -579,8 +579,8 @@ spec:
----

ifdef::openshift-enterprise,openshift-origin[]
[[block-volume-support]]

== Block Volume Support
[IMPORTANT]
====
Expand Down Expand Up @@ -750,3 +750,4 @@ Unspecified values result in the default value of *Filesystem*.
|GlusterFS
|InProgress Kube 1.10
|===
endif::openshift-enterprise,openshift-origin[]
4 changes: 4 additions & 0 deletions cli_reference/basic_cli_operations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ syntax:
|`build` |
|`buildConfig` | `bc`
|`deploymentConfig` | `dc`
ifdef::openshift-enterprise,openshift-origin[]
|`deployments` (Technology Preview)| `deploy`
endif::openshift-enterprise,openshift-origin[]
|`event` |`ev`
|`imageStream` | `is`
|`imageStreamTag` | `istag`
Expand All @@ -123,7 +125,9 @@ syntax:
|`pod` |`po`
|`ResourceQuota` | `quota`
|`replicationController` |`rc`
ifdef::openshift-enterprise,openshift-origin[]
|`replicaSet` (Technology Preview)|`rs`
endif::openshift-enterprise,openshift-origin[]
|`secrets` |
|`service` |`svc`
|`ServiceAccount` | `sa`
Expand Down
8 changes: 4 additions & 4 deletions dev_guide/managing_images.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ metadata:
selflink: /oapi/v1/namespaces/openshift/imagestreamimages/ruby@3a335d7
----
====

ifdef::openshift-enterprise,openshift-origin[]
[[using-is-with-k8s]]
== Using Image Streams with Kubernetes Resources (Technology Preview)

Expand Down Expand Up @@ -466,7 +466,7 @@ To disable image lookup, pass `*--enabled=false*`:
----
$ oc set image-lookup deploy/mysql --enabled=false
----

endif::openshift-enterprise,openshift-origin[]
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
[[image-pull-policy]]
== Image Pull Policy
Expand Down Expand Up @@ -1144,10 +1144,10 @@ Value: array of triggers, where each item has the schema:
====


When {product-title} sees one of the core Kubernetes resources that contains both a pod template (i.e, only CronJobs, Deployments, StatefulSets, DaemonSets, Jobs, ReplicaSets, ReplicationControllers, and Pods) and this annotation, it will attempt to update the object using the image currently associated with the ImageStreamTag referenced by trigger. The update is performed against the `fieldPath` specified.
When {product-title} sees one of the core Kubernetes resources that contains both a pod template (i.e, only CronJobs, Deployments, StatefulSets, DaemonSets, Jobs, ReplicaSets, ReplicationControllers, and Pods) and this annotation, it will attempt to update the object using the image currently associated with the ImageStreamTag referenced by trigger. The update is performed against the `fieldPath` specified.

In the following example the trigger will fire when the `example:latest` imagestream tag is updated. Upon firing, the object's pod template image reference for the `web` container will be updated with a new image value. If the pod template is part of a Deployment definition, the change
to the pod template will automatically trigger a deployment, effectively rolling out the new image.
to the pod template will automatically trigger a deployment, effectively rolling out the new image.

====
----
Expand Down
10 changes: 5 additions & 5 deletions using_images/db_images/mysql.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Once you have instantiated the service, you can copy the user name, password,
and database name environment variables into a deployment configuration for
another component that intends to access the database. That component can then
access the database via the service that was defined.

ifdef::openshift-origin,openshift-enterprise[]
[[using-mysql-replication]]
== Using MySQL Replication

Expand All @@ -460,15 +460,15 @@ ifdef::openshift-origin[]
Replication support provided by the MySQL image is experimental and should not
be used in production.
====
endif::[]
endif::openshift-origin[]

ifdef::openshift-enterprise,openshift-dedicated,openshift-online[]
ifdef::openshift-enterprise[]
[NOTE]
====
Enabling clustering for database images is currently in Technology Preview and
not intended for production use.
====
endif::[]
endif::openshift-enterprise[[]

Red Hat provides a proof-of-concept
xref:../../dev_guide/templates.adoc#dev-guide-templates[template] for MySQL
Expand All @@ -489,7 +489,7 @@ The following sections detail the objects defined in the example template and
describe how they work together to start a cluster of MySQL servers implementing
master-slave replication. This is the recommended replication strategy for
MySQL.

endif::openshift-origin,openshift-enterprise[]
[[creating-the-deployment-configuration-for-mysql-master]]
=== Creating the Deployment Configuration for the MySQL Master

Expand Down

0 comments on commit 3e5b51f

Please sign in to comment.