From 4ad67acedd04cdc205e61feb73c126034fbe1f41 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:46:26 +0200
Subject: [PATCH] Move back vsphere csi to kube-system ns (#9312)

---
 docs/vsphere-csi.md                                        | 2 +-
 roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/vsphere-csi.md b/docs/vsphere-csi.md
index 514dbec33..a399d4b17 100644
--- a/docs/vsphere-csi.md
+++ b/docs/vsphere-csi.md
@@ -37,7 +37,7 @@ You need to source the vSphere credentials you use to deploy your machines that
 | vsphere_csi_aggressive_node_drain           | FALSE    | boolean |                            | false                     | Enable aggressive node drain strategy                                                                               |
 | vsphere_csi_aggressive_node_unreachable_timeout            | FALSE     | int  | 300   |                           | Timeout till node will be drained when it in an unreachable state                                                           |
 | vsphere_csi_aggressive_node_not_ready_timeout              | FALSE     | int  | 300   |                           | Timeout till node will be drained when it in not-ready state                                                                |
-| vsphere_csi_namespace                       | TRUE     | string  |                            | "vmware-system-csi"       | vSphere CSI namespace to use
+| vsphere_csi_namespace                       | TRUE     | string  |                            | "kube-system"       | vSphere CSI namespace to use; kube-system for backward compatibility, should be change to vmware-system-csi on the long run |
 
 ## Usage example
 
diff --git a/roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml b/roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml
index 088779fda..84e78c3f1 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml
+++ b/roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml
@@ -14,7 +14,8 @@ vsphere_csi_node_driver_registrar_image_tag: "v2.5.0"
 vsphere_csi_driver_image_tag: "v2.5.1"
 vsphere_csi_resizer_tag: "v1.4.0"
 
-vsphere_csi_namespace: "vmware-system-csi"
+# Set to kube-system for backward compatibility, should be change to vmware-system-csi on the long run
+vsphere_csi_namespace: "kube-system"
 
 vsphere_csi_controller_replicas: 1
 
-- 
GitLab