Skip to content

Commit b8b2ce4

Browse files
authored
Merge pull request #42997 from bergerhoffer/410-fixes
Fixing some xrefs to try to fix 4.10 build issues
2 parents 296f139 + f87f2ea commit b8b2ce4

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

networking/configuring-a-custom-pki.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ its privately signed CA certificates are recognized across the cluster.
1414
You can leverage the Proxy API to add cluster-wide trusted CA certificates. You
1515
must do this either during installation or at runtime.
1616

17-
* During _installation_, xref:installation-configure-proxy_{context}[configure the cluster-wide proxy]. You must define your
17+
* During _installation_, xref:../networking/configuring-a-custom-pki.adoc#installation-configure-proxy_{context}[configure the cluster-wide proxy]. You must define your
1818
privately signed CA certificates in the `install-config.yaml` file's
1919
`additionalTrustBundle` setting.
2020
+
@@ -24,8 +24,7 @@ Operator then creates a `trusted-ca-bundle` ConfigMap that merges these CA
2424
certificates with the {op-system-first} trust bundle; this ConfigMap is
2525
referenced in the Proxy object's `trustedCA` field.
2626
27-
* At _runtime_, xref:nw-proxy-configure-object_{context}[modify the default Proxy object to include your privately signed
28-
CA certificates] (part of cluster's proxy enablement workflow). This involves
27+
* At _runtime_, xref:../networking/configuring-a-custom-pki.adoc#nw-proxy-configure-object_{context}[modify the default Proxy object to include your privately signed CA certificates] (part of cluster's proxy enablement workflow). This involves
2928
creating a ConfigMap that contains the privately signed CA certificates that
3029
should be trusted by the cluster, and then modifying the proxy resource with the
3130
`trustedCA` referencing the privately signed certificates' ConfigMap.

networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ include::modules/nw-ingress-sharding-namespace-labels.adoc[leveloffset=+1]
5353
== Additional resources
5454

5555
* The Ingress Operator manages wildcard DNS. For more information, see
56-
xref:../../networking/ingress-operator.adoc#configuring-ingress[Ingress Operator
57-
in {product-title}],
58-
xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing
59-
a cluster on bare metal], and
56+
xref:../../networking/ingress-operator.adoc#configuring-ingress[Ingress Operator in {product-title}],
57+
xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing a cluster on bare metal], and
6058
xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[Installing a cluster on vSphere].
6159
endif::[]

networking/hardware_networks/configuring-hardware-offloading.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ include::modules/nw-sriov-hwol-supported-devices.adoc[leveloffset=+1]
2020
== Prerequisites
2121

2222
* Your cluster has at least one bare metal machine with a network interface controller that is supported for hardware offloading.
23-
* You xref:./installing-sriov-operator.html#installing-sr-iov-operator_installing-sriov-operator[installed the SR-IOV Network Operator].
24-
* Your cluster uses the xref:../ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes CNI].
25-
* In your xref:../cluster-network-operator.adoc#gatewayConfig-object_cluster-network-operator[OVN-Kubernetes CNI configuration], the `gatewayConfig.routingViaHost` field is set to `false`.
23+
* You xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sr-iov-operator_installing-sriov-operator[installed the SR-IOV Network Operator].
24+
* Your cluster uses the xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes CNI].
25+
* In your xref:../../networking/cluster-network-operator.adoc#gatewayConfig-object_cluster-network-operator[OVN-Kubernetes CNI configuration], the `gatewayConfig.routingViaHost` field is set to `false`.
2626

2727
//Configure a machine config pool for hardware offloading
2828
include::modules/nw-sriov-hwol-configuring-machine-config-pool.adoc[leveloffset=+1]

networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ include::modules/virt-creating-interface-on-nodes.adoc[leveloffset=+1]
1616
[discrete]
1717
[role="_additional-resources"]
1818
== Additional resources
19-
* xref:virt-example-nmstate-multiple-interfaces_{context}[Example for creating multiple interfaces in the same policy]
20-
* xref:virt-example-nmstate-IP-management_{context}[Examples of different IP management methods in policies]
19+
* xref:../../networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc#virt-example-nmstate-multiple-interfaces_{context}[Example for creating multiple interfaces in the same policy]
20+
* xref:../../networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc#virt-example-nmstate-IP-management_{context}[Examples of different IP management methods in policies]
2121

2222
include::modules/virt-confirming-policy-updates-on-nodes.adoc[leveloffset=+1]
2323

networking/network_policy/creating-network-policy.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ include::modules/nw-networkpolicy-object.adoc[leveloffset=+1]
1515
[role="_additional-resources"]
1616
== Additional resources
1717

18-
* xref:../../web_console/web-console.adoc[Accessing the web console]
18+
* xref:../../web_console/web-console.adoc#web-console[Accessing the web console]

0 commit comments

Comments
 (0)