Skip to content

Commit 78f0ed5

Browse files
authored
Merge branch 'openshift:main' into cp_latency
2 parents 3d7f866 + d31d11b commit 78f0ed5

File tree

214 files changed

+4226
-3618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+4226
-3618
lines changed

_topic_maps/_topic_map.yml

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,16 @@ Topics:
13031303
File: ovn-k-banp
13041304
- Name: Understanding the Ingress Node Firewall Operator
13051305
File: ingress-node-firewall-operator
1306+
- Name: Egress Firewall
1307+
Dir: egress_firewall
1308+
Distros: openshift-enterprise,openshift-origin
1309+
Topics:
1310+
- Name: Viewing an egress firewall for a project
1311+
File: viewing-egress-firewall-ovn
1312+
- Name: Editing an egress firewall for a project
1313+
File: editing-egress-firewall-ovn
1314+
- Name: Removing an egress firewall from a project
1315+
File: removing-egress-firewall-ovn
13061316
- Name: Configuring an egress firewall for a project
13071317
File: configuring-egress-firewall-ovn
13081318
- Name: Configuring IPsec encryption
@@ -1470,12 +1480,6 @@ Topics:
14701480
File: logging-network-policy
14711481
- Name: Configure an external gateway on the default network
14721482
File: configuring-secondary-external-gateway
1473-
- Name: Viewing an egress firewall for a project
1474-
File: viewing-egress-firewall-ovn
1475-
- Name: Editing an egress firewall for a project
1476-
File: editing-egress-firewall-ovn
1477-
- Name: Removing an egress firewall from a project
1478-
File: removing-egress-firewall-ovn
14791483
- Name: Configuring an egress IP address
14801484
File: configuring-egress-ips-ovn
14811485
- Name: Assigning an egress IP address
@@ -1662,8 +1666,6 @@ Topics:
16621666
File: persistent-storage-hostpath
16631667
- Name: Persistent storage using LVM Storage
16641668
File: persistent-storage-using-lvms
1665-
- Name: Troubleshooting local persistent storage using LVMS
1666-
File: troubleshooting-local-persistent-storage-using-lvms
16671669
- Name: Using Container Storage Interface (CSI)
16681670
Dir: container_storage_interface
16691671
Distros: openshift-enterprise,openshift-origin
@@ -1862,9 +1864,6 @@ Topics:
18621864
- Name: Catalog source pod scheduling
18631865
File: olm-cs-podsched
18641866
Distros: openshift-origin,openshift-enterprise
1865-
- Name: Managing platform Operators
1866-
File: olm-managing-po
1867-
Distros: openshift-enterprise,openshift-origin
18681867
- Name: Troubleshooting Operator issues
18691868
File: olm-troubleshooting-operator-issues
18701869
Distros: openshift-enterprise,openshift-origin
@@ -2156,27 +2155,6 @@ Topics:
21562155
File: odc-viewing-application-composition-using-topology-view
21572156
- Name: Exporting applications
21582157
File: odc-exporting-applications
2159-
- Name: Connecting applications to services
2160-
Dir: connecting_applications_to_services
2161-
Topics:
2162-
- Name: Service Binding Operator release notes
2163-
File: sbo-release-notes
2164-
- Name: Understanding Service Binding Operator
2165-
File: understanding-service-binding-operator
2166-
- Name: Installing Service Binding Operator
2167-
File: installing-sbo
2168-
- Name: Getting started with service binding
2169-
File: getting-started-with-service-binding
2170-
- Name: Getting started with service binding on IBM Power, IBM Z, and IBM LinuxONE
2171-
File: getting-started-with-service-binding-ibm-power-ibm-z
2172-
- Name: Exposing binding data from a service
2173-
File: exposing-binding-data-from-a-service
2174-
- Name: Projecting binding data
2175-
File: projecting-binding-data
2176-
- Name: Binding workloads using Service Binding Operator
2177-
File: binding-workloads-using-sbo
2178-
- Name: Connecting an application to a service using the Developer perspective
2179-
File: odc-connecting-an-application-to-a-service-using-the-developer-perspective
21802158
- Name: Working with Helm charts
21812159
Dir: working_with_helm_charts
21822160
Topics:
@@ -2324,7 +2302,7 @@ Topics:
23242302
File: cpmso-config-options-gcp
23252303
- Name: Control plane configuration options for Nutanix
23262304
File: cpmso-config-options-nutanix
2327-
- Name: Control plane configuration options for Red Hat OpenStack
2305+
- Name: Control plane configuration options for Red Hat OpenStack Platform
23282306
File: cpmso-config-options-openstack
23292307
- Name: Control plane configuration options for VMware vSphere
23302308
File: cpmso-config-options-vsphere
@@ -2371,6 +2349,8 @@ Topics:
23712349
File: hcp-getting-started
23722350
- Name: Authentication and authorization for hosted control planes
23732351
File: hcp-authentication-authorization
2352+
- Name: Handling a machine configuration for hosted control planes
2353+
File: hcp-machine-config
23742354
- Name: Using feature gates in a hosted cluster
23752355
File: hcp-using-feature-gates
23762356
- Name: Updating hosted control planes
@@ -2625,6 +2605,8 @@ Topics:
26252605
File: nodes-sno-worker-nodes
26262606
- Name: Node metrics dashboard
26272607
File: nodes-dashboard-using
2608+
- Name: Manage secure signatures with sigstore
2609+
File: nodes-sigstore-using
26282610
---
26292611
Name: Windows Container Support for OpenShift
26302612
Dir: windows_containers
@@ -2823,8 +2805,8 @@ Topics:
28232805
- Name: Release notes
28242806
Dir: distr_tracing_rn
28252807
Topics:
2826-
- Name: Distributed tracing 3.1.1
2827-
File: distr-tracing-rn-3-1-1
2808+
- Name: Distributed tracing 3.2
2809+
File: distr-tracing-rn-3-2
28282810
- Name: Past releases
28292811
File: distr-tracing-rn-past-releases
28302812
- Name: Distributed tracing architecture
@@ -2861,8 +2843,8 @@ Topics:
28612843
- Name: Release notes
28622844
Dir: otel_rn
28632845
Topics:
2864-
- Name: Red Hat build of OpenTelemetry 3.1.1
2865-
File: otel-rn-3-1-1
2846+
- Name: Red Hat build of OpenTelemetry 3.2
2847+
File: otel-rn-3-2
28662848
- Name: Past releases
28672849
File: otel-rn-past-releases
28682850
- Name: Installing
@@ -2873,8 +2855,8 @@ Topics:
28732855
File: otel-configuration-of-instrumentation
28742856
- Name: Sending traces and metrics to the Collector
28752857
File: otel-sending-traces-and-metrics-to-otel-collector
2876-
- Name: Sending metrics to the monitoring stack
2877-
File: otel-config-send-metrics-monitoring-stack
2858+
- Name: Configuring metrics for the monitoring stack
2859+
File: otel-configuring-metrics-for-monitoring-stack
28782860
- Name: Forwarding traces to a TempoStack
28792861
File: otel-forwarding
28802862
- Name: Configuring the Collector metrics
@@ -3051,8 +3033,30 @@ Topics:
30513033
File: ztp-sno-additional-worker-node
30523034
- Name: Pre-caching images for single-node OpenShift deployments
30533035
File: ztp-precaching-tool
3054-
- Name: Image-based upgrade for single-node OpenShift clusters
3055-
File: ztp-image-based-upgrade
3036+
#- Name: Image-based upgrade for single-node OpenShift clusters
3037+
# Dir: image_based_upgrade
3038+
# Distros: openshift-origin,openshift-enterprise
3039+
# Topics:
3040+
# - Name: Understanding the image-based upgrade for single-node OpenShift clusters
3041+
# File: cnf-understanding-image-based-upgrade
3042+
# - Name: Preparing for an image-based upgrade for single-node OpenShift clusters
3043+
# Dir: preparing_for_image_based_upgrade
3044+
# Distros: openshift-origin,openshift-enterprise
3045+
# Topics:
3046+
# - Name: Configuring a shared container directory for the image-based upgrade
3047+
# File: cnf-image-based-upgrade-shared-container-image
3048+
# - Name: Installing Operators for the image-based upgrade
3049+
# File: cnf-image-based-upgrade-install-operators
3050+
# - Name: Generating a seed image for the image-based upgrade with Lifecycle Agent
3051+
# File: cnf-image-based-upgrade-generate-seed
3052+
# - Name: Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent
3053+
# File: cnf-image-based-upgrade-prep-resources
3054+
# - Name: Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent using GitOps ZTP
3055+
# File: ztp-image-based-upgrade-prep-resources
3056+
# - Name: Performing an image-based upgrade for single-node OpenShift clusters
3057+
# File: cnf-image-based-upgrade-base
3058+
# - Name: Performing an image-based upgrade for single-node OpenShift clusters using GitOps ZTP
3059+
# File: ztp-image-based-upgrade
30563060
---
30573061
Name: Reference design specifications
30583062
Dir: telco_ref_design_specs

_topic_maps/_topic_map_osd.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,6 @@ Topics:
716716
File: olm-managing-custom-catalogs
717717
- Name: Catalog source pod scheduling
718718
File: olm-cs-podsched
719-
# - Name: Managing platform Operators <= Tech Preview
720-
# File: olm-managing-po
721719
- Name: Troubleshooting Operator issues
722720
File: olm-troubleshooting-operator-issues
723721
- Name: Developing Operators
@@ -893,28 +891,6 @@ Topics:
893891
# cannot create required namespace
894892
# - Name: Exporting applications
895893
# File: odc-exporting-applications
896-
- Name: Connecting applications to services
897-
Dir: connecting_applications_to_services
898-
Topics:
899-
- Name: Service Binding Operator release notes
900-
File: sbo-release-notes
901-
- Name: Understanding Service Binding Operator
902-
File: understanding-service-binding-operator
903-
- Name: Installing Service Binding Operator
904-
File: installing-sbo
905-
- Name: Getting started with service binding
906-
File: getting-started-with-service-binding
907-
# Not applicable to ROSA/OSD
908-
# - Name: Getting started with service binding on IBM Power, IBM Z, and IBM LinuxONE
909-
# File: getting-started-with-service-binding-ibm-power-ibm-z
910-
- Name: Exposing binding data from a service
911-
File: exposing-binding-data-from-a-service
912-
- Name: Projecting binding data
913-
File: projecting-binding-data
914-
- Name: Binding workloads using Service Binding Operator
915-
File: binding-workloads-using-sbo
916-
- Name: Connecting an application to a service using the Developer perspective
917-
File: odc-connecting-an-application-to-a-service-using-the-developer-perspective
918894
- Name: Working with Helm charts
919895
Dir: working_with_helm_charts
920896
Topics:

_topic_maps/_topic_map_rosa.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -937,8 +937,6 @@ Topics:
937937
File: olm-managing-custom-catalogs
938938
- Name: Catalog source pod scheduling
939939
File: olm-cs-podsched
940-
# - Name: Managing platform Operators <= Tech Preview
941-
# File: olm-managing-po
942940
- Name: Troubleshooting Operator issues
943941
File: olm-troubleshooting-operator-issues
944942
- Name: Developing Operators
@@ -1128,28 +1126,6 @@ Topics:
11281126
# cannot create required namespace
11291127
# - Name: Exporting applications
11301128
# File: odc-exporting-applications
1131-
- Name: Connecting applications to services
1132-
Dir: connecting_applications_to_services
1133-
Topics:
1134-
- Name: Service Binding Operator release notes
1135-
File: sbo-release-notes
1136-
- Name: Understanding Service Binding Operator
1137-
File: understanding-service-binding-operator
1138-
- Name: Installing Service Binding Operator
1139-
File: installing-sbo
1140-
- Name: Getting started with service binding
1141-
File: getting-started-with-service-binding
1142-
# Not applicable to ROSA/OSD
1143-
# - Name: Getting started with service binding on IBM Power, IBM Z, and IBM LinuxONE
1144-
# File: getting-started-with-service-binding-ibm-power-ibm-z
1145-
- Name: Exposing binding data from a service
1146-
File: exposing-binding-data-from-a-service
1147-
- Name: Projecting binding data
1148-
File: projecting-binding-data
1149-
- Name: Binding workloads using Service Binding Operator
1150-
File: binding-workloads-using-sbo
1151-
- Name: Connecting an application to a service using the Developer perspective
1152-
File: odc-connecting-an-application-to-a-service-using-the-developer-perspective
11531129
- Name: Working with Helm charts
11541130
Dir: working_with_helm_charts
11551131
Topics:
@@ -1367,8 +1343,8 @@ Topics:
13671343
# File: nodes-nodes-managing-max-pods
13681344
- Name: Using the Node Tuning Operator
13691345
File: nodes-node-tuning-operator
1370-
- Name: Remediating, fencing, and maintaining nodes
1371-
File: nodes-remediating-fencing-maintaining-rhwa
1346+
# - Name: Remediating, fencing, and maintaining nodes
1347+
# File: nodes-remediating-fencing-maintaining-rhwa
13721348
# Cannot create namespace needed to oc debug and reboot; revisit after Operator book converted
13731349
# - Name: Understanding node rebooting
13741350
# File: nodes-nodes-rebooting
@@ -1387,8 +1363,8 @@ Topics:
13871363
# Distros: openshift-rosa
13881364
# - Name: Monitoring for problems in your nodes
13891365
# File: nodes-nodes-problem-detector
1390-
- Name: Machine Config Daemon metrics
1391-
File: nodes-nodes-machine-config-daemon-metrics
1366+
# - Name: Machine Config Daemon metrics
1367+
# File: nodes-nodes-machine-config-daemon-metrics
13921368
# cannot patch resource "nodes"
13931369
# - Name: Creating infrastructure nodes
13941370
# File: nodes-nodes-creating-infrastructure-nodes

_topic_maps/_topic_map_rosa_hcp.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,6 @@ Topics:
940940
# File: olm-managing-custom-catalogs
941941
# - Name: Catalog source pod scheduling
942942
# File: olm-cs-podsched
943-
# - Name: Managing platform Operators <= Tech Preview
944-
# File: olm-managing-po
945943
# - Name: Troubleshooting Operator issues
946944
# File: olm-troubleshooting-operator-issues
947945
# - Name: Developing Operators
@@ -1117,28 +1115,6 @@ Topics:
11171115
# cannot create required namespace
11181116
# - Name: Exporting applications
11191117
# File: odc-exporting-applications
1120-
# - Name: Connecting applications to services
1121-
# Dir: connecting_applications_to_services
1122-
# Topics:
1123-
# - Name: Service Binding Operator release notes
1124-
# File: sbo-release-notes
1125-
# - Name: Understanding Service Binding Operator
1126-
# File: understanding-service-binding-operator
1127-
# - Name: Installing Service Binding Operator
1128-
# File: installing-sbo
1129-
# - Name: Getting started with service binding
1130-
# File: getting-started-with-service-binding
1131-
# Not applicable to ROSA/OSD
1132-
# - Name: Getting started with service binding on IBM Power, IBM Z, and IBM LinuxONE
1133-
# File: getting-started-with-service-binding-ibm-power-ibm-z
1134-
# - Name: Exposing binding data from a service
1135-
# File: exposing-binding-data-from-a-service
1136-
# - Name: Projecting binding data
1137-
# File: projecting-binding-data
1138-
# - Name: Binding workloads using Service Binding Operator
1139-
# File: binding-workloads-using-sbo
1140-
# - Name: Connecting an application to a service using the Developer perspective
1141-
# File: odc-connecting-an-application-to-a-service-using-the-developer-perspective
11421118
# - Name: Working with Helm charts
11431119
# Dir: working_with_helm_charts
11441120
# Topics:

applications/index.adoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ After you create the application, you can use the web console to xref:../applica
3939

4040
When the application is running, not all applications resources are used. As a cluster administrator, you can choose to xref:../applications/idling-applications.adoc#idling-applications[idle these scalable resources] to reduce resource consumption.
4141

42-
[id="connecting-application"]
43-
=== Connecting an application to services
44-
45-
An application uses backing services to build and connect workloads, which vary according to the service provider. Using the xref:../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#understanding-service-binding-operator[Service Binding Operator], as a developer, you can bind workloads together with Operator-managed backing services, without any manual procedures to configure the binding connection.
46-
ifndef::openshift-dedicated,openshift-rosa[]
47-
You can apply service binding also on xref:../applications/connecting_applications_to_services/getting-started-with-service-binding-ibm-power-ibm-z.adoc#getting-started-with-service-binding-ibm-power-ibm-z[IBM Power Systems, IBM Z, and LinuxONE environments].
48-
endif::openshift-dedicated,openshift-rosa[]
49-
5042
[id="deploying-application"]
5143
=== Deploying an application
5244
You can deploy your application using xref:../applications/deployments/what-deployments-are.adoc#what-deployments-are[`Deployment` or `DeploymentConfig`] objects and xref:../applications/deployments/managing-deployment-processes.adoc#deployment-operations[manage] them from the web console. You can create xref:../applications/deployments/deployment-strategies.adoc#deployment-strategies[deployment strategies] that help reduce downtime during a change or an upgrade to the application.

applications/odc-viewing-application-composition-using-topology-view.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ To view your applications in the *Topology* view and interact with them, ensure
1414
ifndef::openshift-rosa,openshift-dedicated[]
1515
* You have xref:../web_console/web-console.adoc#web-console[logged in to the web console].
1616
* You have the appropriate xref:../authentication/using-rbac.adoc#default-roles_using-rbac[roles and permissions] in a project to create applications and other workloads in {product-title}.
17-
* You have xref:../applications/creating_applications/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[created and deployed an application on {product-title} using the *Developer* perspective].
1817
* You are in xref:../web_console/web-console-overview.adoc#about-developer-perspective_web-console-overview[the *Developer* perspective].
1918
endif::openshift-rosa,openshift-dedicated[]
2019
ifdef::openshift-rosa,openshift-dedicated[]
@@ -42,7 +41,6 @@ include::modules/odc-labels-and-annotations-used-for-topology-view.adoc[leveloff
4241
== Additional resources
4342

4443
* See xref:../applications/creating_applications/odc-creating-applications-using-developer-perspective.adoc#odc-importing-codebase-from-git-to-create-application_odc-creating-applications-using-developer-perspective[Importing a codebase from Git to create an application] for more information on creating an application from Git.
45-
* See xref:../applications/connecting_applications_to_services/odc-connecting-an-application-to-a-service-using-the-developer-perspective.adoc#odc-connecting-an-application-to-a-service-using-the-developer-perspective[Connecting an application to a service using the Developer perspective].
4644
ifndef::openshift-rosa,openshift-dedicated[]
4745
* See xref:../applications/odc-exporting-applications.adoc#odc-exporting-applications[Exporting applications].
4846
endif::openshift-rosa,openshift-dedicated[]

architecture/control-plane.adoc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ include::modules/arch-olm-operators.adoc[leveloffset=+2]
5050
* For more details on running add-on Operators in {product-title}, see the _Operators_ guide sections on xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager (OLM)] and xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[OperatorHub].
5151
* For more details on the Operator SDK, see xref:../operators/operator_sdk/osdk-about.adoc#osdk-about[Developing Operators].
5252

53-
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
54-
include::modules/arch-platform-operators.adoc[leveloffset=+2]
55-
56-
[role="_additional-resources"]
57-
.Additional resources
58-
* xref:../operators/admin/olm-managing-po.adoc#olm-managing-po[Managing platform Operators]
59-
* xref:../operators/admin/olm-managing-po.adoc#olm-po-techpreview_olm-managing-po[Technology Preview restrictions for platform Operators]
60-
* xref:../operators/understanding/olm-packaging-format.adoc#olm-rukpak-about_olm-packaging-format[RukPak component and packaging format]
61-
* xref:../installing/cluster-capabilities.adoc#cluster-capabilities[Cluster capabilities]
62-
endif::[]
63-
6453
// This module does not apply to OSD/ROSA
6554
ifndef::openshift-dedicated,openshift-rosa[]
6655
include::modules/understanding-machine-config-operator.adoc[leveloffset=+1]

authentication/using-service-accounts-in-applications.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ include::modules/service-accounts-default.adoc[leveloffset=+1]
1212

1313
include::modules/service-account-auto-secret-removed.adoc[leveloffset=+2]
1414

15-
.Additional resources
16-
17-
* For information about requesting bound service account tokens, see xref:../authentication/bound-service-account-tokens.adoc#bound-sa-tokens-configuring_bound-service-account-tokens[Configuring bound service account tokens using volume projection].
18-
19-
* For information about creating a service account token secret, see xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-creating-sa_nodes-pods-secrets[Creating a service account token secret].
20-
2115
include::modules/service-accounts-creating.adoc[leveloffset=+1]
2216

2317
// include::modules/service-accounts-using-credentials-inside-a-container.adoc[leveloffset=+1]

cloud_experts_tutorials/cloud-experts-rosa-cloudwatch-sts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ EOF
226226
$ aws logs describe-log-groups --log-group-name-prefix rosa-${ROSA_CLUSTER_NAME}
227227
----
228228
+
229-
.Sample output
229+
.Example output
230230
+
231231
[source,c]
232232
----

cloud_experts_tutorials/rosa-mobb-prerequisites-tutorial.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ $ aws configure
107107
$ aws configure
108108
----
109109
+
110-
.Sample output
110+
.Example output
111111
[source,terminal]
112112
----
113113
AWS Access Key ID []:
@@ -127,7 +127,7 @@ $ aws sts get-caller-identity
127127
+
128128
You should receive output similar to the following:
129129
+
130-
.Sample output
130+
.Example output
131131
[source,terminal]
132132
----
133133
{

0 commit comments

Comments
 (0)