Skip to content

Commit f210ebb

Browse files
committed
merge conflicts 4.17
1 parent c259179 commit f210ebb

File tree

163 files changed

+443
-397
lines changed

Some content is hidden

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

163 files changed

+443
-397
lines changed

_topic_maps/_topic_map.yml

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,14 +1338,18 @@ Name: Networking
13381338
Dir: networking
13391339
Distros: openshift-enterprise,openshift-origin
13401340
Topics:
1341-
- Name: About networking
1342-
File: about-networking
1343-
- Name: Understanding networking
1344-
File: understanding-networking
1345-
- Name: Accessing hosts
1346-
File: accessing-hosts
1347-
- Name: Networking dashboards
1348-
File: networking-dashboards
1341+
- Name: Networking overview
1342+
Dir: networking_overview
1343+
Distros: openshift-enterprise,openshift-origin
1344+
Topics:
1345+
- Name: Understanding networking
1346+
File: understanding-networking
1347+
- Name: Accessing hosts
1348+
File: accessing-hosts
1349+
- Name: Networking dashboards
1350+
File: networking-dashboards
1351+
- Name: CIDR range definitions
1352+
File: cidr-range-definitions
13491353
- Name: Networking Operators
13501354
Dir: networking_operators
13511355
Distros: openshift-enterprise,openshift-origin
@@ -1486,41 +1490,6 @@ Topics:
14861490
File: configuring-ipsec-ovn
14871491
- Name: Zero trust networking
14881492
File: zero-trust-networking
1489-
- Name: Configuring the Ingress Controller for manual DNS management
1490-
File: ingress-controller-dnsmgt
1491-
Distros: openshift-enterprise,openshift-origin
1492-
- Name: Verifying connectivity to an endpoint
1493-
File: verifying-connectivity-endpoint
1494-
- Name: Changing the cluster network MTU
1495-
File: changing-cluster-network-mtu
1496-
- Name: Configuring the node port service range
1497-
File: configuring-node-port-service-range
1498-
- Name: Configuring the cluster network IP address range
1499-
File: configuring-cluster-network-range
1500-
- Name: Configuring IP failover
1501-
File: configuring-ipfailover
1502-
- Name: Configuring system controls and interface attributes using the tuning plugin
1503-
File: configure-syscontrols-interface-tuning-cni
1504-
- Name: Using Stream Control Transmission Protocol
1505-
File: using-sctp
1506-
Distros: openshift-enterprise,openshift-origin
1507-
- Name: Using PTP hardware
1508-
Dir: ptp
1509-
Topics:
1510-
- Name: About PTP in OpenShift cluster nodes
1511-
File: about-ptp
1512-
- Name: Configuring PTP devices
1513-
File: configuring-ptp
1514-
- Name: Developing PTP events consumer applications with the REST API v2
1515-
File: ptp-cloud-events-consumer-dev-reference-v2
1516-
- Name: PTP events REST API v2 reference
1517-
File: ptp-events-rest-api-reference-v2
1518-
- Name: Developing PTP events consumer applications with the REST API v1
1519-
File: ptp-cloud-events-consumer-dev-reference
1520-
- Name: PTP events REST API v1 reference
1521-
File: ptp-events-rest-api-reference
1522-
- Name: CIDR range definitions
1523-
File: cidr-range-definitions
15241493
- Name: Multiple networks
15251494
Dir: multiple_networks
15261495
Distros: openshift-enterprise,openshift-origin
@@ -1624,84 +1593,115 @@ Topics:
16241593
File: tracking-network-flows
16251594
- Name: Configuring hybrid networking
16261595
File: configuring-hybrid-networking
1627-
- Name: Configuring Routes
1628-
Dir: routes
1629-
Topics:
1630-
- Name: Route configuration
1631-
File: route-configuration
1632-
- Name: Secured routes
1633-
File: secured-routes
1634-
- Name: Configuring ingress cluster traffic
1635-
Dir: configuring_ingress_cluster_traffic
1596+
- Name: Ingress and load balancing
1597+
Dir: ingress_load_balancing
1598+
Distros: openshift-enterprise,openshift-origin
16361599
Topics:
1637-
- Name: Overview
1638-
File: overview-traffic
1639-
Distros: openshift-enterprise,openshift-origin
1640-
- Name: Configuring ExternalIPs for services
1641-
File: configuring-externalip
1642-
Distros: openshift-enterprise,openshift-origin
1643-
- Name: Configuring ingress cluster traffic using an Ingress Controller
1644-
File: configuring-ingress-cluster-traffic-ingress-controller
1645-
- Name: Configuring the Ingress Controller endpoint publishing strategy
1646-
File: nw-configuring-ingress-controller-endpoint-publishing-strategy
1647-
Distros: openshift-enterprise,openshift-origin
1648-
- Name: Configuring ingress cluster traffic using a load balancer
1649-
File: configuring-ingress-cluster-traffic-load-balancer
1600+
- Name: Configuring Routes
1601+
Dir: routes
16501602
Distros: openshift-enterprise,openshift-origin
1651-
- Name: Configuring ingress cluster traffic on AWS
1652-
File: configuring-ingress-cluster-traffic-aws
1653-
Distros: openshift-enterprise,openshift-origin
1654-
- Name: Configuring ingress cluster traffic using a service external IP
1655-
File: configuring-ingress-cluster-traffic-service-external-ip
1656-
Distros: openshift-enterprise,openshift-origin
1657-
- Name: Configuring ingress cluster traffic using a NodePort
1658-
File: configuring-ingress-cluster-traffic-nodeport
1603+
Topics:
1604+
- Name: Route configuration
1605+
File: route-configuration
1606+
- Name: Secured routes
1607+
File: secured-routes
1608+
- Name: Configuring ingress cluster traffic
1609+
Dir: configuring_ingress_cluster_traffic
16591610
Distros: openshift-enterprise,openshift-origin
1660-
- Name: Configuring ingress cluster traffic using load balancer allowed source ranges
1661-
File: configuring-ingress-cluster-traffic-load-balancer-allowed-source-ranges
1611+
Topics:
1612+
- Name: Overview
1613+
File: overview-traffic
1614+
- Name: Configuring ExternalIPs for services
1615+
File: configuring-externalip
1616+
- Name: Configuring ingress cluster traffic using an Ingress Controller
1617+
File: configuring-ingress-cluster-traffic-ingress-controller
1618+
- Name: Configuring the Ingress Controller endpoint publishing strategy
1619+
File: nw-configuring-ingress-controller-endpoint-publishing-strategy
1620+
- Name: Configuring ingress cluster traffic using a load balancer
1621+
File: configuring-ingress-cluster-traffic-load-balancer
1622+
- Name: Configuring ingress cluster traffic on AWS
1623+
File: configuring-ingress-cluster-traffic-aws
1624+
- Name: Configuring ingress cluster traffic using a service external IP
1625+
File: configuring-ingress-cluster-traffic-service-external-ip
1626+
- Name: Configuring ingress cluster traffic using a NodePort
1627+
File: configuring-ingress-cluster-traffic-nodeport
1628+
- Name: Configuring ingress cluster traffic using load balancer allowed source ranges
1629+
File: configuring-ingress-cluster-traffic-load-balancer-allowed-source-ranges
1630+
- Name: Patching existing ingress objects
1631+
File: configuring-ingress-cluster-patch-fields
1632+
- Name: Configuring the Ingress Controller for manual DNS management
1633+
File: ingress-controller-dnsmgt
1634+
- Name: Load balancing on OpenStack
1635+
File: load-balancing-openstack
1636+
- Name: Load balancing with MetalLB
1637+
Dir: metallb
16621638
Distros: openshift-enterprise,openshift-origin
1663-
- Name: Patching existing ingress objects
1664-
File: configuring-ingress-cluster-patch-fields
1639+
Topics:
1640+
- Name: Configuring MetalLB address pools
1641+
File: metallb-configure-address-pools
1642+
- Name: Advertising the IP address pools
1643+
File: about-advertising-ipaddresspool
1644+
- Name: Configuring MetalLB BGP peers
1645+
File: metallb-configure-bgp-peers
1646+
- Name: Advertising an IP address pool using the community alias
1647+
File: metallb-configure-community-alias
1648+
- Name: Configuring MetalLB BFD profiles
1649+
File: metallb-configure-bfd-profiles
1650+
- Name: Configuring services to use MetalLB
1651+
File: metallb-configure-services
1652+
- Name: Managing symmetric routing with MetalLB
1653+
File: metallb-configure-return-traffic
1654+
- Name: Configuring the integration of MetalLB and FRR-K8s
1655+
File: metallb-frr-k8s
1656+
- Name: MetalLB logging, troubleshooting, and support
1657+
File: metallb-troubleshoot-support
1658+
- Name: Configuring network settings
1659+
Dir: configuring_network_settings
1660+
Distros: openshift-enterprise,openshift-origin
1661+
Topics:
1662+
- Name: Configuring system controls and interface attributes using the tuning plugin
1663+
File: configure-syscontrols-interface-tuning-cni
1664+
- Name: Configuring the node port service range
1665+
File: configuring-node-port-service-range
1666+
- Name: Configuring the cluster network IP address range
1667+
File: configuring-cluster-network-range
1668+
- Name: Configuring IP failover
1669+
File: configuring-ipfailover
1670+
- Name: Configuring the cluster-wide proxy
1671+
File: enable-cluster-wide-proxy
1672+
- Name: Configuring a custom PKI
1673+
File: configuring-a-custom-pki
1674+
- Name: Advanced networking
1675+
Dir: advanced_networking
1676+
Distros: openshift-enterprise, openshift-origin
1677+
Topics:
1678+
- Name: Verifying connectivity to an endpoint
1679+
File: verifying-connectivity-endpoint
1680+
- Name: Changing the cluster network MTU
1681+
File: changing-cluster-network-mtu
1682+
- Name: Using Stream Control Transmission Protocol
1683+
File: using-sctp
1684+
- Name: Associating secondary interfaces metrics to network attachments
1685+
File: associating-secondary-interfaces-metrics-to-network-attachments
1686+
- Name: Using PTP hardware
1687+
Dir: ptp
16651688
Distros: openshift-enterprise,openshift-origin
1666-
# Kubernetes NMState (TECHNOLOGY PREVIEW)
1689+
Topics:
1690+
- Name: About PTP in OpenShift cluster nodes
1691+
File: about-ptp
1692+
- Name: Configuring PTP devices
1693+
File: configuring-ptp
1694+
- Name: Developing PTP events consumer applications with the REST API v2
1695+
File: ptp-cloud-events-consumer-dev-reference-v2
1696+
- Name: PTP events REST API v2 reference
1697+
File: ptp-events-rest-api-reference-v2
16671698
- Name: Kubernetes NMState
16681699
Dir: k8s_nmstate
16691700
Topics:
16701701
- Name: Observing and updating node network state and configuration
16711702
File: k8s-nmstate-updating-node-network-config
16721703
- Name: Troubleshooting node network configuration
16731704
File: k8s-nmstate-troubleshooting-node-network
1674-
- Name: Configuring the cluster-wide proxy
1675-
File: enable-cluster-wide-proxy
1676-
Distros: openshift-enterprise,openshift-origin
1677-
- Name: Configuring a custom PKI
1678-
File: configuring-a-custom-pki
1679-
Distros: openshift-enterprise,openshift-origin
1680-
- Name: Load balancing on OpenStack
1681-
File: load-balancing-openstack
1682-
- Name: Load balancing with MetalLB
1683-
Dir: metallb
1684-
Topics:
1685-
- Name: Configuring MetalLB address pools
1686-
File: metallb-configure-address-pools
1687-
- Name: Advertising the IP address pools
1688-
File: about-advertising-ipaddresspool
1689-
- Name: Configuring MetalLB BGP peers
1690-
File: metallb-configure-bgp-peers
1691-
- Name: Advertising an IP address pool using the community alias
1692-
File: metallb-configure-community-alias
1693-
- Name: Configuring MetalLB BFD profiles
1694-
File: metallb-configure-bfd-profiles
1695-
- Name: Configuring services to use MetalLB
1696-
File: metallb-configure-services
1697-
- Name: Managing symmetric routing with MetalLB
1698-
File: metallb-configure-return-traffic
1699-
- Name: Configuring the integration of MetalLB and FRR-K8s
1700-
File: metallb-frr-k8s
1701-
- Name: MetalLB logging, troubleshooting, and support
1702-
File: metallb-troubleshoot-support
1703-
- Name: Associating secondary interfaces metrics to network attachments
1704-
File: associating-secondary-interfaces-metrics-to-network-attachments
17051705
---
17061706
Name: Storage
17071707
Dir: storage

_topic_maps/_topic_map_osd.yml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,13 @@ Name: Networking
826826
Dir: networking
827827
Distros: openshift-dedicated
828828
Topics:
829-
- Name: About networking
830-
File: about-managed-networking
829+
- Name: Networking overview
830+
Dir: networking_overview
831+
Topics:
832+
- Name: About networking
833+
File: about-managed-networking
834+
- Name: CIDR range definitions
835+
File: cidr-range-definitions
831836
- Name: Networking Operators
832837
Dir: networking_operators
833838
Distros: openshift-dedicated
@@ -836,12 +841,6 @@ Topics:
836841
File: dns-operator
837842
- Name: Ingress Operator in OpenShift Dedicated
838843
File: ingress-operator
839-
- Name: Network verification
840-
File: network-verification
841-
- Name: Configuring a cluster-wide proxy during installation
842-
File: configuring-cluster-wide-proxy
843-
- Name: CIDR range definitions
844-
File: cidr-range-definitions
845844
- Name: Network security
846845
Dir: network_security
847846
Distros: openshift-dedicated
@@ -862,27 +861,33 @@ Topics:
862861
File: deleting-network-policy
863862
- Name: Configuring multitenant isolation with network policy
864863
File: multitenant-network-policy
864+
- Name: Network verification
865+
File: network-verification
865866
- Name: OVN-Kubernetes network plugin
866867
Dir: ovn_kubernetes_network_provider
867868
Topics:
868869
- Name: About the OVN-Kubernetes network plugin
869870
File: about-ovn-kubernetes
870871
- Name: Migrating from the OpenShift SDN network plugin
871872
File: migrate-from-openshift-sdn-osd
872-
# - Name: Migrating from the OpenShift SDN network plugin
873-
# File: migrate-from-openshift-sdn
873+
- Name: Configuring a cluster-wide proxy during installation
874+
File: configuring-cluster-wide-proxy
874875
- Name: OpenShift SDN network plugin
875876
Dir: ovn_kubernetes_network_provider
876877
Topics:
877878
- Name: Enabling multicast for a project
878879
File: enabling-multicast
879-
- Name: Configuring Routes
880-
Dir: routes
880+
- Name: Ingress and load balancing
881+
Dir: ingress_load_balancing
882+
Distros: openshift-dedicated
881883
Topics:
882-
- Name: Route configuration
883-
File: route-configuration
884-
- Name: Secured routes
885-
File: secured-routes
884+
- Name: Configuring Routes
885+
Dir: routes
886+
Topics:
887+
- Name: Route configuration
888+
File: route-configuration
889+
- Name: Secured routes
890+
File: secured-routes
886891
---
887892
Name: Building applications
888893
Dir: applications

_topic_maps/_topic_map_rosa.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,8 +1070,14 @@ Name: Networking
10701070
Dir: networking
10711071
Distros: openshift-rosa
10721072
Topics:
1073-
- Name: About networking
1074-
File: about-managed-networking
1073+
- Name: Networking overview
1074+
Dir: networking_overview
1075+
Distros: openshift-rosa
1076+
Topics:
1077+
- Name: About networking
1078+
File: about-managed-networking
1079+
- Name: CIDR range definitions
1080+
File: cidr-range-definitions
10751081
- Name: Networking Operators
10761082
Dir: networking_operators
10771083
Distros: openshift-rosa
@@ -1084,12 +1090,6 @@ Topics:
10841090
File: ingress-operator
10851091
- Name: Ingress Node Firewall Operator in Red Hat OpenShift Service on AWS
10861092
File: ingress-node-firewall-operator
1087-
- Name: Network verification
1088-
File: network-verification
1089-
- Name: Configuring a cluster-wide proxy during installation
1090-
File: configuring-cluster-wide-proxy
1091-
- Name: CIDR range definitions
1092-
File: cidr-range-definitions
10931093
- Name: Network security
10941094
Dir: network_security
10951095
Distros: openshift-rosa
@@ -1122,6 +1122,10 @@ Topics:
11221122
File: default-network-policy
11231123
- Name: Configuring multitenant isolation with network policy
11241124
File: multitenant-network-policy
1125+
- Name: Audit logging for network security
1126+
File: logging-network-security
1127+
- Name: Network verification
1128+
File: network-verification
11251129
- Name: OVN-Kubernetes network plugin
11261130
Dir: ovn_kubernetes_network_provider
11271131
Topics:
@@ -1131,18 +1135,25 @@ Topics:
11311135
File: configuring-egress-ips-ovn
11321136
- Name: Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin
11331137
File: migrate-from-openshift-sdn
1138+
- Name: Configuring a cluster-wide proxy during installation
1139+
File: configuring-cluster-wide-proxy
11341140
- Name: OpenShift SDN network plugin
11351141
Dir: ovn_kubernetes_network_provider
11361142
Topics:
11371143
- Name: Enabling multicast for a project
11381144
File: enabling-multicast
1139-
- Name: Configuring Routes
1140-
Dir: routes
1145+
- Name: Ingress and load balancing
1146+
Dir: ingress_load_balancing
1147+
Distros: openshift-rosa
11411148
Topics:
1142-
- Name: Route configuration
1143-
File: route-configuration
1144-
- Name: Secured routes
1145-
File: secured-routes
1149+
- Name: Configuring Routes
1150+
Dir: routes
1151+
Distros: openshift-rosa
1152+
Topics:
1153+
- Name: Route configuration
1154+
File: route-configuration
1155+
- Name: Secured routes
1156+
File: secured-routes
11461157
---
11471158
Name: Building applications
11481159
Dir: applications

0 commit comments

Comments
 (0)