Skip to content

Commit 87810be

Browse files
authored
Merge pull request #87905 from opayne1/OSDOCS-12236
OSDOCS#12236: Updates to Welcome and Learn more OCP pages
2 parents 5f130d8 + 8f620c0 commit 87810be

File tree

2 files changed

+90
-72
lines changed

2 files changed

+90
-72
lines changed

welcome/index.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ To navigate the {product-title} {product-version} documentation, you can use one
2828

2929
* Use the navigation bar to browse the documentation.
3030
* Select the task that interests you from xref:../welcome/learn_more_about_openshift.adoc#learn_more_about_openshift[Learn more about {product-title}].
31+
* {product-title} has a variety of layered offerings to add additional functionality and extend the capabilities of a cluster. For more information, see link:https://access.redhat.com/support/policy/updates/openshift_operators[{product-title} Operator Life Cycles]
3132
endif::openshift-rosa,openshift-dedicated,openshift-dpu,openshift-telco[]
3233
3334
ifdef::openshift-dpu[]

welcome/learn_more_about_openshift.adoc

Lines changed: 89 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,45 @@ toc::[]
88

99
Use the following sections to find content to help you learn about and better understand {product-title} functions:
1010

11+
[id="support"]
12+
== Learning and support
13+
14+
[options="header",cols="2*"]
15+
|===
16+
| Learn about {product-title} |Optional additional resources
17+
18+
|link:https://www.openshift.com/learn/whats-new[What's new in {product-title}]
19+
|link:https://www.openshift.com/blog?hsLang=en-us[OpenShift blog]
20+
21+
|link:https://access.redhat.com/support/policy/updates/openshift[{product-title} Life Cycle Policy]
22+
|link:https://access.redhat.com/support/policy/updates/openshift#ocp4_phases[{product-title} life cycle]
23+
24+
|link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal]
25+
|link:https://access.redhat.com/articles/4217411[OpenShift Knowledgebase articles]
26+
27+
| xref:../support/getting-support.adoc#getting-support[Getting Support]
28+
| xref:../support/gathering-cluster-data.adoc#gathering-data[Gathering data about your cluster]
29+
30+
|===
31+
1132
[id="architecture"]
1233
== Architecture
1334

14-
[options="header",cols="3*"]
35+
[options="header",cols="2*"]
1536
|===
16-
| Learn about {product-title} |Plan an {product-title} deployment |Optional additional resources
37+
| Learn about {product-title} |Optional additional resources
1738

1839
| link:https://www.openshift.com/blog/enterprise-kubernetes-with-openshift-part-one?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[Enterprise Kubernetes with OpenShift]
1940
| link:https://access.redhat.com/articles/4128421[Tested platforms]
20-
| link:https://www.openshift.com/blog?hsLang=en-us[OpenShift blog]
2141

2242
| xref:../architecture/architecture.adoc#architecture[Architecture]
2343
| xref:../security/container_security/security-understanding.adoc#understanding-security[Security and compliance]
24-
| link:https://www.openshift.com/learn/whats-new[What's new in {product-title}]
2544

26-
|
2745
| xref:../networking/understanding-networking.adoc#understanding-networking[Networking]
28-
| link:https://access.redhat.com/support/policy/updates/openshift#ocp4_phases[{product-title} life cycle]
46+
| xref:../networking/ovn_kubernetes_network_provider/ovn-kubernetes-architecture-assembly.adoc#ovn-kubernetes-architecture-con[OVN-Kubernetes architecture]
2947

30-
|
3148
| xref:../backup_and_restore/index.adoc#backup-restore-overview[Backup and restore]
32-
|
33-
34-
| link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal]
35-
|
36-
a|* xref:../support/getting-support.adoc#getting-support[Getting Support]
37-
* link:https://access.redhat.com/articles/4217411[OpenShift Knowledgebase articles]
49+
| xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#scenario-2-restoring-cluster-state[Restoring to a previous cluster state]
3850

3951
|===
4052

@@ -50,7 +62,7 @@ Explore the following {product-title} installation tasks:
5062
| xref:../installing/overview/installing-preparing.adoc#installing-preparing[Selecting a cluster installation method and preparing it for users]
5163

5264
| xref:../installing/overview/installing-fips.adoc#installing-fips-mode_installing-fips[Installing a cluster in FIPS mode]
53-
|
65+
| xref:../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#agent-installer-fips-compliance_preparing-to-install-with-agent-based-installer[About FIPS compliance]
5466

5567
|===
5668

@@ -61,8 +73,8 @@ Explore the following {product-title} installation tasks:
6173
|===
6274
| Learn about other installer tasks on {product-title} |Optional additional resources
6375

64-
| xref:../installing/validation_and_troubleshooting/installing-troubleshooting.adoc#installing-troubleshooting[Check installation logs]
65-
|
76+
| xref:../installing/validation_and_troubleshooting/installing-troubleshooting.adoc#installing-troubleshooting[Troubleshooting installation issues]
77+
| xref:../installing/validation_and_troubleshooting/validating-an-installation.adoc#validating-an-installation[Validating an installation]
6678

6779
| xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-data-foundation[Install {rh-storage-first}]
6880
| xref:../machine_configuration/mco-coreos-layering.adoc#mco-coreos-layering[{op-system-first} image layering]
@@ -134,34 +146,34 @@ a|* xref:../machine_management/index.adoc#machine-api-overview_overview-of-machi
134146
| Manage xref:../machine_management/index.adoc#machine-mgmt-intro-managing-compute_overview-of-machine-management[compute] and xref:../machine_management/index.adoc#machine-mgmt-intro-managing-control-plane_overview-of-machine-management[control plane] machines with machine sets.
135147
|
136148

137-
|xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[Deploying machine health checks]
138-
|
149+
| xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[Deploying machine health checks]
150+
| xref:../machine_management/control_plane_machine_management/cpmso-about.adoc#cpmso-about[About control plane machine sets]
139151

140-
|xref:../machine_management/applying-autoscaling.adoc#applying-autoscaling[Applying autoscaling to an {product-title} cluster]
141-
|
152+
| xref:../machine_management/applying-autoscaling.adoc#applying-autoscaling[Applying autoscaling to an {product-title} cluster]
153+
| xref:../nodes/pods/nodes-pods-priority.adoc#nodes-pods-priority[Including pod priority in pod scheduling decisions]
142154

143155
| xref:../registry/index.adoc#registry-overview[Manage container registries]
144156
| link:https://access.redhat.com/documentation/en-us/red_hat_quay/[Red Hat Quay]
145157

146158
| xref:../authentication/understanding-authentication.adoc#understanding-authentication[Manage users and groups]
147-
|
159+
| xref:../authentication/impersonating-system-admin.adoc#impersonating-system-admin[Impersonating the system:admin user]
148160

149161
| xref:../authentication/understanding-authentication.adoc#understanding-authentication[Manage authentication]
150-
| xref:../authentication/understanding-identity-provider.adoc#supported-identity-providers[multiple identity providers]
162+
| xref:../authentication/understanding-identity-provider.adoc#supported-identity-providers[Multiple identity providers]
151163

152-
| Manage xref:../security/certificates/replacing-default-ingress-certificate.adoc#replacing-default-ingress[ingress], xref:../security/certificates/api-server.adoc#api-server-certificates[API server], and xref:../security/certificates/service-serving-certificate.adoc#add-service-serving[service] certificates
153-
|
164+
| Manage xref:../security/certificates/replacing-default-ingress-certificate.adoc#replacing-default-ingress[Ingress], xref:../security/certificates/api-server.adoc#api-server-certificates[API server], and xref:../security/certificates/service-serving-certificate.adoc#add-service-serving[Service] certificates
165+
| xref:../networking/network_security/network-policy-apis.adoc#network-policy-apis[Network security]
154166

155167
| xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]
156168
a|* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator]
157-
* xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces]
158-
* xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[network policy]
169+
* xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[Multiple network interfaces]
170+
* xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[Network policy]
159171

160172
| xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Manage Operators]
161-
|
173+
| xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators]
162174

175+
| xref:../windows_containers/index.adoc#index[{productwinc} overview]
163176
| xref:../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads_understanding-windows-container-workloads[Understanding Windows container workloads]
164-
|
165177

166178
|===
167179

@@ -178,17 +190,17 @@ a|* xref:../updating/updating_a_cluster/updating-cluster-web-console.adoc#updati
178190
* xref:../disconnected/updating/index.adoc#about-disconnected-updates[Using the OpenShift Update Service in a disconnected environment]
179191

180192
| xref:../operators/understanding/crds/crd-extending-api-with-crds.adoc#crd-extending-api-with-crds[Use custom resource definitions (CRDs) to modify the cluster]
181-
a|* xref:../operators/understanding/crds/crd-extending-api-with-crds.adoc#crd-creating-custom-resources-definition_crd-extending-api-with-crds[create a CRD]
182-
* xref:../operators/understanding/crds/crd-managing-resources-from-crds.adoc#crd-managing-resources-from-crds[manage resources from CRDs]
193+
a|* xref:../operators/understanding/crds/crd-extending-api-with-crds.adoc#crd-creating-custom-resources-definition_crd-extending-api-with-crds[Create a CRD]
194+
* xref:../operators/understanding/crds/crd-managing-resources-from-crds.adoc#crd-managing-resources-from-crds[Manage resources from CRDs]
183195

184196
| xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Set resource quotas]
185-
| xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[set quotas]
197+
| xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Set quotas]
186198

187199
| xref:../applications/pruning-objects.adoc#pruning-objects[Prune and reclaim resources]
188-
|
200+
| xref:../cicd/builds/advanced-build-operations.adoc#builds-build-pruning-advanced-build-operations[Performing advanced builds]
189201

190202
| xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#scaling-cluster-monitoring-operator[Scale] and xref:../scalability_and_performance/using-node-tuning-operator.adoc#using-node-tuning-operator[tune] clusters
191-
|
203+
| xref:../scalability_and_performance/index.adoc#index[{product-title} scalability and performance]
192204

193205
|===
194206

@@ -200,13 +212,13 @@ a|* xref:../operators/understanding/crds/crd-extending-api-with-crds.adoc#crd-cr
200212
|Learn about {product-title} |Optional additional resources
201213

202214
| xref:../observability/logging/cluster-logging.adoc#cluster-logging[OpenShift Logging]
203-
|
215+
| xref:../observability/cluster_observability_operator/ui_plugins/logging-ui-plugin.adoc#logging-ui-plugin[Logging UI pluigin]
204216

217+
| xref:../observability/distr_tracing/distr-tracing-rn.adoc#distr-tracing-rn[Release notes for the {DTProductName}]
205218
| xref:../observability/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc#distr-tracing-architecture[{jaegername}]
206-
|
207219

208220
| xref:../observability/otel/otel-installing.adoc#install-otel[Red Hat build of OpenTelemetry]
209-
|
221+
| xref:../observability/otel/otel-config-multicluster.adoc#otel-config-multicluster[Gathering the observability data from multiple clusters]
210222

211223
| xref:../observability/network_observability/network-observability-overview.adoc#network-observability-overview[About Network Observability]
212224
a|* xref:../observability/network_observability/metrics-alerts-dashboards.adoc#metrics-alerts-dashboards_metrics-alerts-dashboards[Using metrics with dashboards and alerts]
@@ -225,40 +237,27 @@ a|* xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc
225237
|===
226238
|Learn about {product-title} |Optional additional resources
227239

228-
| xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Manage storage]
229-
|
230-
231-
| xref:../storage/understanding-ephemeral-storage.adoc#understanding-ephemeral-storage[Storage]
232-
|
240+
| xref:../storage/index.adoc#storage-types[Storage types]
241+
a| * xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Persistent storage]
242+
* xref:../storage/understanding-ephemeral-storage.adoc#understanding-ephemeral-storage[Ephemeral storage]
233243

234244
|===
235245

236246
[id="application_site_reliability_engineer"]
237247
== Application Site Reliability Engineer (App SRE)
238248

239-
[options="header",cols="3*"]
249+
[options="header",cols="2*"]
240250
|===
241-
|Learn about {product-title} |Deploy and manage applications |Optional additional resources
251+
|Learn about {product-title} |Optional additional resources
242252

243-
|
253+
| xref:../applications/index.adoc#building-applications-overview[Building applications overview]
244254
| xref:../applications/projects/working-with-projects.adoc#working-with-projects[Projects]
245-
| xref:../support/getting-support.adoc#getting-support[Getting Support]
246255

247-
| xref:../architecture/architecture.adoc#architecture[Architecture]
248256
| xref:../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Operators]
249-
| link:https://access.redhat.com/articles/4217411[OpenShift Knowledgebase articles]
257+
| xref:../operators/operator-reference.adoc#cluster-operator-reference[Cluster Operator reference]
250258

251-
|
252259
| xref:../observability/logging/cluster-logging.adoc#cluster-logging[Logging]
253-
| link:https://access.redhat.com/support/policy/updates/openshift#ocp4_phases[{product-title} Life Cycle]
254-
255-
|
256260
| link:https://www.openshift.com/blog/tag/logging[Blogs about logging]
257-
|
258-
259-
|
260-
| xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[Monitoring]
261-
|
262261

263262
|===
264263

@@ -302,20 +301,38 @@ a|* xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-sched
302301
* xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
303302
|===
304303

304+
[id="self-managed-hcp"]
305+
== {hcp-capital}
305306

306-
//
307-
//[id="hosted-control-plane-activities"]
308-
//== Hosted control plane activities
309-
310-
//[options="header",cols="2*"]
311-
// |===
312-
// |Learn about {hcp-capital} |Optional additional resources
313-
314-
// | xref:../hosted_control_planes/index.adoc#hosted_control_planes[Hosted control planes overview]
315-
// | xref:../hosted_control_planes/index.adoc#hosted-control-planes-overview_hcp-overview[Introduction to hosted control planes]
316-
317-
// | xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-getting-started [Getting started with hosted control planes]
318-
// |
319-
320-
// |===
321-
//
307+
[options="header",cols="2*"]
308+
|===
309+
|Learn about {hcp} |Optional additional resources
310+
311+
| xref:../hosted_control_planes/index.adoc#hosted-control-planes-overview[Hosted control planes overview]
312+
a|
313+
xref:../hosted_control_planes/index.adoc#hosted-control-planes-version-support_hcp-overview[Versioning for {hcp}]
314+
315+
| Preparing to deploy
316+
a| * xref:../hosted_control_planes/hcp-prepare/hcp-requirements.adoc#hcp-requirements[Requirements for {hcp}]
317+
* xref:../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc#hcp-sizing-guidance[Sizing guidance for {hcp}]
318+
* xref:../hosted_control_planes/hcp-prepare/hcp-override-resource-util.adoc#hcp-override-resource-util[Overriding resource utilization measurements]
319+
* xref:../hosted_control_planes/hcp-prepare/hcp-cli.adoc#hcp-cli[Installing the {hcp} command-line interface]
320+
* xref:../hosted_control_planes/hcp-prepare/hcp-distribute-workloads.adoc#hcp-distribute-workloads[Distributing hosted cluster workloads]
321+
* xref:../hosted_control_planes/hcp-prepare/hcp-enable-disable.adoc#hcp-enable-disable[Enabling or disabling the {hcp} feature]
322+
323+
| Deploying {hcp}
324+
a| * xref:../hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc#hcp-deploy-virt[Deploying {hcp} on {VirtProductName}]
325+
* xref:../hosted_control_planes/hcp-deploy/hcp-deploy-aws.adoc#hcp-deploy-aws[Deploying {hcp} on {aws-short}]
326+
* xref:../hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc#hcp-deploy-bm[Deploying {hcp} on bare metal]
327+
* xref:../hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc#hcp-deploy-non-bm[Deploying {hcp} on non-bare-metal agent machines]
328+
* xref:../hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc#hcp-deploy-ibmz[Deploying {hcp} on {ibm-z-title}]
329+
* xref:../hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc#hcp-deploy-ibm-power[Deploying {hcp} on {ibm-power-title}]
330+
331+
| Deploying {hcp} in a disconnected environment
332+
a| * xref:../hosted_control_planes/hcp-disconnected/hcp-deploy-dc-bm.adoc#hcp-deploy-dc-bm[Deploying {hcp} on bare metal in a disconnected environment]
333+
* xref:../hosted_control_planes/hcp-disconnected/hcp-deploy-dc-virt.adoc#hcp-deploy-dc-virt[Deploying {hcp} on {VirtProductName} in a disconnected environment]
334+
335+
| xref:../hosted_control_planes/hcp-troubleshooting.adoc#hcp-troubleshooting[Troubleshooting {hcp}]
336+
a| xref:../hosted_control_planes/hcp-troubleshooting.adoc#hosted-control-planes-troubleshooting_hcp-troubleshooting[Gathering information to troubleshoot {hcp}]
337+
338+
|===

0 commit comments

Comments
 (0)