Skip to content

Commit 3e5b51f

Browse files
authored
Merge pull request openshift#7466 from ahardin-rh/no-TP-in-online-dedicated
Removed references to Tech Preview features from Online and Dedicated docs
2 parents 8604db1 + 0c6f838 commit 3e5b51f

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

_topic_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ Topics:
890890
File: openshift_pipeline
891891
- Name: Cron Jobs
892892
File: cron_jobs
893-
Distros: openshift-enterprise,openshift-dedicated,openshift-origin,openshift-online
893+
Distros: openshift-enterprise,openshift-origin
894894
- Name: Create from URL
895895
File: create_from_url
896896
- Name: Application memory sizing

admin_guide/managing_networking.adoc

+6-3
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,12 @@ the JDBC connection information) rather than the actual protected service URL.
171171
You can also assign static IP addresses to projects, ensuring that all
172172
outgoing external connections from the specified project have recognizable
173173
origins. This is different from the default egress router, which is used to send
174-
traffic to specific destinations. See the
174+
traffic to specific destinations.
175+
ifdef::openshift-origin,openshift-enterprise[]
176+
See the
175177
xref:enabling-static-ips-for-external-project-traffic[Enabling Fixed IPs for
176178
External Project Traffic] section for more information.
179+
endif::openshift-origin,openshift-enterprise[]
177180

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

@@ -911,7 +914,7 @@ is complicated, because nodes have both "external" IP addresses and
911914
"internal" SDN IP addresses. Thus, some pod-to-node/master traffic may
912915
pass through this chain, but other pod-to-node/master traffic may
913916
bypass it.
914-
917+
ifdef::openshift-origin,openshift-enterprise[]
915918
[[enabling-static-ips-for-external-project-traffic]]
916919
== Enabling Static IPs for External Project Traffic
917920

@@ -995,7 +998,7 @@ If the above is enabled for a project, all egress traffic from that project will
995998
be routed to the node hosting that egress IP, then connected (using NAT) to that
996999
IP address. If `egressIPs` is set on a `NetNamespace`, but there is no node
9971000
hosting that egress IP, then egress traffic from the namespace will be dropped.
998-
1001+
endif::openshift-origin,openshift-enterprise[]
9991002

10001003
[[admin-guide-networking-multicast]]
10011004
== Enabling Multicast

architecture/additional_concepts/storage.adoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ cluster.
435435

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

438+
ifdef::openshift-enterprise,openshift-origin[]
438439
[[pv-mount-options]]
439-
440440
=== Mount Options
441441
[IMPORTANT]
442442
====
@@ -497,7 +497,7 @@ The following persistent volume types support mount options:
497497
====
498498
Fibre Channel and HostPath persistent volumes do not support mount options.
499499
====
500-
500+
endif::openshift-enterprise,openshift-origin[]
501501
[[persistent-volume-claims]]
502502

503503
== Persistent Volume Claims
@@ -579,8 +579,8 @@ spec:
579579
580580
----
581581

582+
ifdef::openshift-enterprise,openshift-origin[]
582583
[[block-volume-support]]
583-
584584
== Block Volume Support
585585
[IMPORTANT]
586586
====
@@ -750,3 +750,4 @@ Unspecified values result in the default value of *Filesystem*.
750750
|GlusterFS
751751
|InProgress Kube 1.10
752752
|===
753+
endif::openshift-enterprise,openshift-origin[]

cli_reference/basic_cli_operations.adoc

+4
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ syntax:
112112
|`build` |
113113
|`buildConfig` | `bc`
114114
|`deploymentConfig` | `dc`
115+
ifdef::openshift-enterprise,openshift-origin[]
115116
|`deployments` (Technology Preview)| `deploy`
117+
endif::openshift-enterprise,openshift-origin[]
116118
|`event` |`ev`
117119
|`imageStream` | `is`
118120
|`imageStreamTag` | `istag`
@@ -123,7 +125,9 @@ syntax:
123125
|`pod` |`po`
124126
|`ResourceQuota` | `quota`
125127
|`replicationController` |`rc`
128+
ifdef::openshift-enterprise,openshift-origin[]
126129
|`replicaSet` (Technology Preview)|`rs`
130+
endif::openshift-enterprise,openshift-origin[]
127131
|`secrets` |
128132
|`service` |`svc`
129133
|`ServiceAccount` | `sa`

dev_guide/managing_images.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ metadata:
357357
selflink: /oapi/v1/namespaces/openshift/imagestreamimages/ruby@3a335d7
358358
----
359359
====
360-
360+
ifdef::openshift-enterprise,openshift-origin[]
361361
[[using-is-with-k8s]]
362362
== Using Image Streams with Kubernetes Resources (Technology Preview)
363363

@@ -466,7 +466,7 @@ To disable image lookup, pass `*--enabled=false*`:
466466
----
467467
$ oc set image-lookup deploy/mysql --enabled=false
468468
----
469-
469+
endif::openshift-enterprise,openshift-origin[]
470470
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
471471
[[image-pull-policy]]
472472
== Image Pull Policy
@@ -1144,10 +1144,10 @@ Value: array of triggers, where each item has the schema:
11441144
====
11451145

11461146

1147-
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.
1147+
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.
11481148

11491149
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
1150-
to the pod template will automatically trigger a deployment, effectively rolling out the new image.
1150+
to the pod template will automatically trigger a deployment, effectively rolling out the new image.
11511151

11521152
====
11531153
----

using_images/db_images/mysql.adoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ Once you have instantiated the service, you can copy the user name, password,
450450
and database name environment variables into a deployment configuration for
451451
another component that intends to access the database. That component can then
452452
access the database via the service that was defined.
453-
453+
ifdef::openshift-origin,openshift-enterprise[]
454454
[[using-mysql-replication]]
455455
== Using MySQL Replication
456456

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

465-
ifdef::openshift-enterprise,openshift-dedicated,openshift-online[]
465+
ifdef::openshift-enterprise[]
466466
[NOTE]
467467
====
468468
Enabling clustering for database images is currently in Technology Preview and
469469
not intended for production use.
470470
====
471-
endif::[]
471+
endif::openshift-enterprise[[]
472472

473473
Red Hat provides a proof-of-concept
474474
xref:../../dev_guide/templates.adoc#dev-guide-templates[template] for MySQL
@@ -489,7 +489,7 @@ The following sections detail the objects defined in the example template and
489489
describe how they work together to start a cluster of MySQL servers implementing
490490
master-slave replication. This is the recommended replication strategy for
491491
MySQL.
492-
492+
endif::openshift-origin,openshift-enterprise[]
493493
[[creating-the-deployment-configuration-for-mysql-master]]
494494
=== Creating the Deployment Configuration for the MySQL Master
495495

0 commit comments

Comments
 (0)