PWX-21520 : Add custom namespace during configmap creation

k8s/core/configmap/configmap.go

@@ -21,6 +21,7 @@ func New(
 	lockAttempts uint,
 	v2LockRefreshDuration time.Duration,
 	v2LockK8sLockTTL time.Duration,
+	nameSpace string,
 ) (ConfigMap, error) {
 	if data == nil {
 		data = make(map[string]string)
@@ -30,11 +31,14 @@ func New(
 		configMapUserLabelKey: TruncateLabel(name),
 	}
 	data[pxOwnerKey] = ""
+	if nameSpace == "" {
+		nameSpace = k8sSystemNamespace
+	}
 
 	cm := &corev1.ConfigMap{
 		ObjectMeta: meta_v1.ObjectMeta{
 			Name:      name,
-			Namespace: k8sSystemNamespace,
+			Namespace: nameSpace,
 			Labels:    labels,
 		},
 		Data: data,
@@ -61,13 +65,14 @@ func New(
 		lockAttempts:           lockAttempts,
 		lockRefreshDuration:    v2LockRefreshDuration,
 		lockK8sLockTTL:         v2LockK8sLockTTL,
+		nameSpace:              nameSpace,
 	}, nil
 }
 
 func (c *configMap) Get() (map[string]string, error) {
 	cm, err := core.Instance().GetConfigMap(
 		c.name,
-		k8sSystemNamespace,
+		c.nameSpace,
 	)
 	if err != nil {
 		return nil, err
@@ -79,7 +84,7 @@ func (c *configMap) Get() (map[string]string, error) {
 func (c *configMap) Delete() error {
 	return core.Instance().DeleteConfigMap(
 		c.name,
-		k8sSystemNamespace,
+		c.nameSpace,
 	)
 }
 
@@ -91,7 +96,7 @@ func (c *configMap) Patch(data map[string]string) error {
 	for retries := 0; retries < maxConflictRetries; retries++ {
 		cm, err = core.Instance().GetConfigMap(
 			c.name,
-			k8sSystemNamespace,
+			c.nameSpace,
 		)
 		if err != nil {
 			return err
@@ -122,7 +127,7 @@ func (c *configMap) Update(data map[string]string) error {
 	for retries := 0; retries < maxConflictRetries; retries++ {
 		cm, err = core.Instance().GetConfigMap(
 			c.name,
-			k8sSystemNamespace,
+			c.nameSpace,
 		)
 		if err != nil {
 			return err

k8s/core/configmap/configmap_lock_v1.go

@@ -60,7 +60,7 @@ func (c *configMap) Unlock() error {
 	for retries := 0; retries < maxConflictRetries; retries++ {
 		cm, err = core.Instance().GetConfigMap(
 			c.name,
-			k8sSystemNamespace,
+			c.nameSpace,
 		)
 		if err != nil {
 			// A ConfigMap should always be created.
@@ -95,7 +95,7 @@ func (c *configMap) tryLockV1(id string, refresh bool) (string, error) {
 	// Get the existing ConfigMap
 	cm, err := core.Instance().GetConfigMap(
 		c.name,
-		k8sSystemNamespace,
+		c.nameSpace,
 	)
 	if err != nil {
 		// A ConfigMap should always be created.

k8s/core/configmap/configmap_lock_v1_test.go

@@ -13,7 +13,7 @@ import (
 func TestLock(t *testing.T) {
 	fakeClient := fakek8sclient.NewSimpleClientset()
 	coreops.SetInstance(coreops.New(fakeClient))
-	cm, err := New("px-configmaps-test", nil, lockTimeout, 5, 0, 0)
+	cm, err := New("px-configmaps-test", nil, lockTimeout, 5, 0, 0, "test-namespace")
 	require.NoError(t, err, "Unexpected error on New")
 	fmt.Println("testLock")
 
@@ -112,7 +112,7 @@ func TestLockWithHoldTimeout(t *testing.T) {
 	customHoldTimeout := defaultHoldTimeout + v1DefaultK8sLockRefreshDuration + 10*time.Second
 	fakeClient := fakek8sclient.NewSimpleClientset()
 	coreops.SetInstance(coreops.New(fakeClient))
-	cm, err := New("px-configmaps-test", nil, defaultHoldTimeout, 5, 0, 0)
+	cm, err := New("px-configmaps-test", nil, defaultHoldTimeout, 5, 0, 0, "")
 	require.NoError(t, err, "Unexpected error on New")
 	fmt.Println("TestLockWithHoldTimeout")
 

k8s/core/configmap/configmap_lock_v2.go

@@ -89,7 +89,7 @@ func (c *configMap) UnlockWithKey(key string) error {
 	for retries := 0; retries < maxConflictRetries; retries++ {
 		cm, err = core.Instance().GetConfigMap(
 			c.name,
-			k8sSystemNamespace,
+			c.nameSpace,
 		)
 		if err != nil {
 			// A ConfigMap should always be created.
@@ -140,7 +140,7 @@ func (c *configMap) IsKeyLocked(key string) (bool, string, error) {
 	// Get the existing ConfigMap
 	cm, err := core.Instance().GetConfigMap(
 		c.name,
-		k8sSystemNamespace,
+		c.nameSpace,
 	)
 	if err != nil {
 		return false, "", err
@@ -174,7 +174,7 @@ func (c *configMap) tryLock(owner string, key string) (string, error) {
 	// Get the existing ConfigMap
 	cm, err := core.Instance().GetConfigMap(
 		c.name,
-		k8sSystemNamespace,
+		c.nameSpace,
 	)
 	if err != nil {
 		// A ConfigMap should always be created.

k8s/core/configmap/configmap_lock_v2_test.go

@@ -17,7 +17,7 @@ const (
 func TestMultilock(t *testing.T) {
 	fakeClient := fakek8sclient.NewSimpleClientset()
 	coreops.SetInstance(coreops.New(fakeClient))
-	cm, err := New("px-configmaps-test", nil, lockTimeout, 3, 0, 0)
+	cm, err := New("px-configmaps-test", nil, lockTimeout, 3, 0, 0, "")
 	require.NoError(t, err, "Unexpected error on New")
 
 	fmt.Println("testMultilock")

k8s/core/configmap/configmap_test.go

@@ -0,0 +1,89 @@
+package configmap
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	coreops "github.com/portworx/sched-ops/k8s/core"
+	fakek8sclient "k8s.io/client-go/kubernetes/fake"
+)
+
+func TestGetConfigMap(t *testing.T) {
+	fakeClient := fakek8sclient.NewSimpleClientset()
+	coreops.SetInstance(coreops.New(fakeClient))
+
+	configData := map[string]string{
+		"key1": "val1",
+	}
+	cm, err := New("px-configmaps-test", configData, lockTimeout, 5, 0, 0, "test-namespace")
+	require.NoError(t, err, "Unexpected error in creating configmap")
+
+	resultMap, err := cm.Get()
+	require.NoError(t, err, "Unexpected error in getting configmap")
+	require.Contains(t, resultMap, "key1")
+	fmt.Println(resultMap)
+}
+
+func TestDeleteConfigMap(t *testing.T) {
+	fakeClient := fakek8sclient.NewSimpleClientset()
+	coreops.SetInstance(coreops.New(fakeClient))
+
+	configData := map[string]string{
+		"key1": "val1",
+	}
+
+	cm, err := New("px-configmaps-test", configData, lockTimeout, 5, 0, 0, "test-namespace")
+	require.NoError(t, err, "Unexpected error in creating configmap")
+
+	err = cm.Delete()
+	require.NoError(t, err, "Unexpected error in delete")
+
+}
+
+func TestPatchConfigMap(t *testing.T) {
+	fakeClient := fakek8sclient.NewSimpleClientset()
+	coreops.SetInstance(coreops.New(fakeClient))
+
+	configData := map[string]string{
+		"key1": "val1",
+	}
+
+	cm, err := New("px-configmaps-test", configData, lockTimeout, 5, 0, 0, "test-namespace")
+	require.NoError(t, err, "Unexpected error in creating configmap")
+
+	dummyData := map[string]string{
+		"key2": "val2",
+	}
+
+	err = cm.Patch(dummyData)
+	require.NoError(t, err, "Unexpected error in Patch")
+	resultMap, err := cm.Get()
+	require.Contains(t, resultMap, "key1")
+	require.Contains(t, resultMap, "key2")
+	fmt.Println(resultMap)
+}
+
+func TestUpdateConfigMap(t *testing.T) {
+	fakeClient := fakek8sclient.NewSimpleClientset()
+	coreops.SetInstance(coreops.New(fakeClient))
+
+	configData := map[string]string{
+		"key1": "val1",
+	}
+
+	cm, err := New("px-configmaps-test", configData, lockTimeout, 5, 0, 0, "test-namespace")
+	require.NoError(t, err, "Unexpected error in creating configmap")
+
+	dummyData := map[string]string{
+		"key2": "val2",
+	}
+
+	err = cm.Update(dummyData)
+	require.NoError(t, err, "Unexpected error in Update")
+	resultMap, err := cm.Get()
+	require.NotContains(t, resultMap, "key1")
+	require.Contains(t, resultMap, "key2")
+	fmt.Println(resultMap)
+}

k8s/core/configmap/types.go

@@ -67,6 +67,7 @@ type configMap struct {
 	lockAttempts           uint
 	lockRefreshDuration    time.Duration
 	lockK8sLockTTL         time.Duration
+	nameSpace              string
 }
 
 type k8sLock struct {