Update the namespace to vmware-system-csi

vmware-tanzu · Mar 17, 2023 · 1c81f72 · 1c81f72
1 parent 5fe0f5c
commit 1c81f72
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 18 deletions.
diff --git a/artifacts/compatibility-yaml/compatibility-v0.7.0.yaml b/artifacts/compatibility-yaml/compatibility-v0.7.0.yaml
@@ -1,38 +1,48 @@
 {
   "CSI" : {
     "2.7.1" : {
-      "vSphere": { "min": "6.7.1", "max": "8.0.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "min": "1.22", "max": "1.26" },
       "isCPIRequired": false,
       "deploymentPath": [
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.7.0/manifests/vanilla/namespace.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.7.0/manifests/vanilla/validatingwebhook.yaml",
           "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.7.0/manifests/vanilla/vsphere-csi-driver.yaml" ]
     },
     "2.6.2": {
-      "vSphere": { "min": "6.7.1", "max": "8.0.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "min": "1.22", "max": "1.24" },
       "isCPIRequired": false,
       "deploymentPath": [
-          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.7.0/manifests/vanilla/vsphere-csi-driver.yaml" ]
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.6.2/manifests/vanilla/namespace.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.6.2/manifests/vanilla/validatingwebhook.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.6.2/manifests/vanilla/vsphere-csi-driver.yaml" ]
     },
     "2.5.1": {
-      "vSphere": { "min": "6.7.1", "max": "8.0.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "min": "1.20", "max": "1.23" },
       "isCPIRequired": false,
       "deploymentPath": [
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.5.1/manifests/vanilla/namespace.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.5.1/manifests/vanilla/validatingwebhook.yaml",
           "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.5.1/manifests/vanilla/vsphere-csi-driver.yaml" ]
     },
     "2.4.0": {
-      "vSphere": { "min": "6.7.1", "max": "8.0.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "min": "1.20", "max": "1.22" },
       "isCPIRequired": false,
       "deploymentPath": [
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.4.0/manifests/vanilla/namespace.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.4.0/manifests/vanilla/validatingwebhook.yaml",
           "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.4.0/manifests/vanilla/vsphere-csi-driver.yaml" ]
     },
     "2.3.0": {
       "vSphere": { "min": "6.7.1", "max": "7.0.4" },
       "k8s": { "min": "1.19", "max": "1.21" },
       "isCPIRequired": false,
       "deploymentPath": [
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.3.0/manifests/vanilla/namespace.yaml",
+          "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.3.0/manifests/vanilla/validatingwebhook.yaml",
           "https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v2.3.0/manifests/vanilla/vsphere-csi-driver.yaml" ]
     },
     "2.2.2": {
@@ -68,15 +78,15 @@
   },
   "CPI" : {
     "1.26.0": {
-      "vSphere": { "min": "6.7.1", "max": "8.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "skewVersion": "1.26" },
       "deploymentPath": [
           "https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/v1.26.0/manifests/controller-manager/cloud-controller-manager-roles.yaml",
           "https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/v1.26.0/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml",
           "https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/v1.26.0/manifests/controller-manager/vsphere-cloud-controller-manager-ds.yaml" ]
     },
     "1.25.0": {
-      "vSphere": { "min": "6.7.1", "max": "8.0" },
+      "vSphere": { "min": "6.7.1", "max": "8.0.1" },
       "k8s": { "skewVersion": "1.25" },
       "deploymentPath": [
           "https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/v1.25.0/manifests/controller-manager/cloud-controller-manager-roles.yaml",
@@ -140,4 +150,4 @@
           "https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/v1.18.0/manifests/controller-manager/vsphere-cloud-controller-manager-ds.yaml"]
     }
   }
-}
+}
diff --git a/artifacts/vanilla/vdo-spec.yaml b/artifacts/vanilla/vdo-spec.yaml
@@ -801,7 +801,7 @@ spec:
             configMapKeyRef:
               key: auto-upgrade
               name: compat-matrix-config
-        image: projects.registry.vmware.com/vsphere_kubernetes_driver_operator/vdo:0.5.0
+        image: vmware.com/vdo:0.2.0-30-gd56e895
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -18,4 +18,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: vmware.com/vdo
-  newTag: 0.2.0-22-g86be46c
+  newTag: 0.2.0-30-gd56e895
diff --git a/controllers/vdoconfig_controller.go b/controllers/vdoconfig_controller.go
@@ -108,7 +108,7 @@ var (
 	SessionFn     = session.GetOrCreate
 	GetVMFn       = session.GetVMByIP
 	VDO_NAMESPACE = ""
-	CsiNamespace  = "kube-system"
+	CsiNamespace  = "vmware-system-csi"
 )
 
 // +kubebuilder:rbac:groups=vdo.vmware.com,resources=vdoconfigs,verbs=get;list;watch;create;update;patch;delete

diff --git a/controllers/vdoconfig_controller_test.go b/controllers/vdoconfig_controller_test.go
@@ -21,6 +21,7 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"errors"
+	"fmt"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/vmware-tanzu/vsphere-kubernetes-drivers-operator/api/v1alpha1"
@@ -80,7 +81,7 @@ var _ = Describe("TestReconcileCSIDeploymentStatus", func() {
 				TypeMeta: metav1.TypeMeta{},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "vsphere-csi-node",
-					Namespace: "kube-system",
+					Namespace: "vmware-system-csi",
 					Labels:    map[string]string{"app": "test-label"},
 				},
 				Spec: v1.DaemonSetSpec{},
@@ -96,7 +97,7 @@ var _ = Describe("TestReconcileCSIDeploymentStatus", func() {
 				},
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pod",
-					Namespace: "kube-system",
+					Namespace: "vmware-system-csi",
 					Labels:    map[string]string{"app": "test-label"},
 				},
 				Spec: v12.PodSpec{
@@ -145,7 +146,7 @@ var _ = Describe("TestReconcileCSIDeploymentStatus", func() {
 
 			Expect(r.Create(ctx, daemonSet, &client.CreateOptions{})).NotTo(HaveOccurred())
 
-			_, err := clientSet.CoreV1().Pods("kube-system").Create(ctx, pod1, metav1.CreateOptions{})
+			_, err := clientSet.CoreV1().Pods("vmware-system-csi").Create(ctx, pod1, metav1.CreateOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
 			_, err = clientSet.CoreV1().Nodes().Create(ctx, node, metav1.CreateOptions{})
@@ -165,6 +166,8 @@ var _ = Describe("TestReconcileCSIDeploymentStatus", func() {
 		})
 
 		It("should reconcile deployment status without error", func() {
+			fmt.Println(r.CsiDeploymentYamls)
+			fmt.Println(r.CpiDeploymentYamls)
 			Expect(r.reconcileCSIDeploymentStatus(vdoctx, clientSet)).NotTo(HaveOccurred())
 
 			// Verify verifyCSINodeStatus all scenarios
@@ -805,7 +808,7 @@ var _ = Describe("TestReconcileCSISecret", func() {
 			secret2 := &v12.Secret{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "vsphere-config-secret",
-					Namespace: "kube-system",
+					Namespace: "vmware-system-csi",
 				},
 				Data: map[string][]byte{
 					"username": []byte("vc_user"),
@@ -2030,7 +2033,7 @@ var _ = Describe("TestUpdatingKubeletPath", func() {
 			TypeMeta: metav1.TypeMeta{},
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "vsphere-csi-node",
-				Namespace: "kube-system",
+				Namespace: "vmware-system-csi",
 				Labels:    map[string]string{"app": "test-label"},
 			},
 			Spec: v1.DaemonSetSpec{
@@ -2092,7 +2095,7 @@ var _ = Describe("TestUpdatingKubeletPath", func() {
 		It("Should update DaemonSet without error", func() {
 			Expect(r.updateCSIDaemonSet(vdoctx, "/var/data/kubelet")).Should(Succeed())
 			key := types.NamespacedName{
-				Namespace: DEPLOYMENT_NS,
+				Namespace: "vmware-system-csi",
 				Name:      CSI_DAEMONSET_NAME,
 			}
 			ds := v1.DaemonSet{}
@@ -2132,7 +2135,7 @@ var _ = Describe("TestUpdatingCSIConfigmap", func() {
 			},
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "internal-feature-states.csi.vsphere.vmware.com",
-				Namespace: "kube-system",
+				Namespace: "vmware-system-csi",
 			},
 			Immutable: nil,
 			Data: map[string]string{