diff --git a/modules/nw-networkpolicy-multitenant-isolation.adoc b/modules/nw-networkpolicy-multitenant-isolation.adoc index 8ab369f009fd..b8cfa5e01df5 100644 --- a/modules/nw-networkpolicy-multitenant-isolation.adoc +++ b/modules/nw-networkpolicy-multitenant-isolation.adoc @@ -43,7 +43,7 @@ spec: - from: - namespaceSelector: matchLabels: - network.openshift.io/policy-group: ingress + policy-group.network.openshift.io/ingress="" podSelector: {} policyTypes: - Ingress diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index 57fa1b370ce4..47b041e8e20c 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -15,8 +15,9 @@ The following table describes the CSI drivers that are installed with {product-t [cols=",^v,^v,^v", width="100%",options="header"] |=== |CSI driver |CSI volume snapshots |CSI cloning |CSI resize +<<<<<<< HEAD |AWS EBS (Tech Preview) | ✅ | - | ✅ -|OpenStack Manila | ✅ | ✅ | ✅ +|OpenStack Manila | ✅ | - | - |Red Hat Virtualization (oVirt) | - | - | - |===