From 878577d2e393b3eb5d5763e7166438d6cd2a025b Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 19 Oct 2021 14:42:35 -0400 Subject: [PATCH 1/3] Updates the table to remove that Manila CSI supports clone and resize --- .../persistent-storage-csi-drivers-supported.adoc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index 57fa1b370ce4..0ce20d836031 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -15,9 +15,23 @@ 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 | ✅ | ✅ | ✅ |Red Hat Virtualization (oVirt) | - | - | - +======= + +|AWS EBS | ✅ | - | ✅ +|AWS EFS (Tech Preview) | - | - | - +|Google Cloud Platform (GCP) persistent disk (PD) (Tech Preview)| ✅ | - | ✅ +|Microsoft Azure Disk (Tech Preview) | ✅ | ✅ | ✅ +|Microsoft Azure Stack Hub | ✅ | ✅ | ✅ +|OpenStack Cinder | ✅ | ✅ | ✅ +|OpenShift Container Storage | ✅ | ✅ | ✅ +|OpenStack Manila | ✅ | - | - +|Red Hat Virtualization (oVirt) | - | - | ✅ +|VMware vSphere (Tech Preview) | - | - | - +>>>>>>> 090f0b7a0... Updates the table to remove that Manila CSI supports clone and resize |=== [IMPORTANT] From fd4d00b4d6a78c7a88a632cd463beac949d19aff Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 19 Oct 2021 14:42:35 -0400 Subject: [PATCH 2/3] Updates the table to remove that Manila CSI supports clone and resize --- .../persistent-storage-csi-drivers-supported.adoc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index 0ce20d836031..47b041e8e20c 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -17,21 +17,8 @@ The following table describes the CSI drivers that are installed with {product-t |CSI driver |CSI volume snapshots |CSI cloning |CSI resize <<<<<<< HEAD |AWS EBS (Tech Preview) | ✅ | - | ✅ -|OpenStack Manila | ✅ | ✅ | ✅ -|Red Hat Virtualization (oVirt) | - | - | - -======= - -|AWS EBS | ✅ | - | ✅ -|AWS EFS (Tech Preview) | - | - | - -|Google Cloud Platform (GCP) persistent disk (PD) (Tech Preview)| ✅ | - | ✅ -|Microsoft Azure Disk (Tech Preview) | ✅ | ✅ | ✅ -|Microsoft Azure Stack Hub | ✅ | ✅ | ✅ -|OpenStack Cinder | ✅ | ✅ | ✅ -|OpenShift Container Storage | ✅ | ✅ | ✅ |OpenStack Manila | ✅ | - | - -|Red Hat Virtualization (oVirt) | - | - | ✅ -|VMware vSphere (Tech Preview) | - | - | - ->>>>>>> 090f0b7a0... Updates the table to remove that Manila CSI supports clone and resize +|Red Hat Virtualization (oVirt) | - | - | - |=== [IMPORTANT] From e9dfb7111bdabc5007e80e52e23a510b74282262 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 9 Nov 2021 13:48:30 -0500 Subject: [PATCH 3/3] Updates the network policy label to one that works --- modules/nw-networkpolicy-multitenant-isolation.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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