configurable data path concurrency: all in one json

Signed-off-by: Lyndon-Li <lyonghui@vmware.com>

pkg/nodeagent/node_agent.go

@@ -61,7 +61,7 @@ type RuledConfigs struct {
 
 type Configs struct {
 	// DataPathConcurrency is the config for data path concurrency per node.
-	DataPathConcurrency *DataPathConcurrency
+	DataPathConcurrency *DataPathConcurrency `json:"dataPathConcurrency,omitempty"`
 }
 
 // IsRunning checks if the node agent daemonset is running properly. If not, return the error found
@@ -128,16 +128,16 @@ func GetConfigs(ctx context.Context, namespace string, kubeClient kubernetes.Int
 		return nil, errors.Errorf("data is not available in config map %s", configName)
 	}
 
-	jsonString, exist := cm.Data[dataPathConConfigName]
-	if !exist {
-		return nil, nil
+	jsonString := ""
+	for _, v := range cm.Data {
+		jsonString = v
 	}
 
-	concurrencyConfigs := &DataPathConcurrency{}
-	err = json.Unmarshal([]byte(jsonString), concurrencyConfigs)
+	configs := &Configs{}
+	err = json.Unmarshal([]byte(jsonString), configs)
 	if err != nil {
-		return nil, errors.Wrapf(err, "error to unmarshall data path concurrency configs from %s", configName)
+		return nil, errors.Wrapf(err, "error to unmarshall configs from %s", configName)
 	}
 
-	return &Configs{DataPathConcurrency: concurrencyConfigs}, nil
+	return configs, nil
 }

pkg/nodeagent/node_agent_test.go

@@ -242,16 +242,16 @@ func TestGetPodSpec(t *testing.T) {
 
 func TestGetConfigs(t *testing.T) {
 	cm := builder.ForConfigMap("fake-ns", "node-agent-configs").Result()
-	cmWithInvalidData := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("fake-key", "fake-value").Result()
-	cmWithInvalidDataFormat := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("data-path-concurrency", "wrong").Result()
-	cmWithValidData := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("data-path-concurrency", "{\"globalConfig\": 5}").Result()
+	cmWithInvalidDataFormat := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("fake-key", "wrong").Result()
+	cmWithoutCocurrentData := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("fake-key", "{\"someothers\":{\"someother\": 10}}").Result()
+	cmWithValidData := builder.ForConfigMap("fake-ns", "node-agent-configs").Data("fake-key", "{\"dataPathConcurrency\":{\"globalConfig\": 5}}").Result()
 
 	tests := []struct {
 		name          string
 		kubeClientObj []runtime.Object
 		namespace     string
 		kubeReactors  []reactor
-		expectResult  *DataPathConcurrency
+		expectResult  *Configs
 		expectErr     string
 	}{
 		{
@@ -280,20 +280,21 @@ func TestGetConfigs(t *testing.T) {
 			},
 			expectErr: "data is not available in config map node-agent-configs",
 		},
-		{
-			name:      "cm's data is not found",
-			namespace: "fake-ns",
-			kubeClientObj: []runtime.Object{
-				cmWithInvalidData,
-			},
-		},
 		{
 			name:      "cm's data is with invalid format",
 			namespace: "fake-ns",
 			kubeClientObj: []runtime.Object{
 				cmWithInvalidDataFormat,
 			},
-			expectErr: "error to unmarshall data path concurrency configs from node-agent-configs: invalid character 'w' looking for beginning of value",
+			expectErr: "error to unmarshall configs from node-agent-configs: invalid character 'w' looking for beginning of value",
+		},
+		{
+			name:      "concurrency configs are not found",
+			namespace: "fake-ns",
+			kubeClientObj: []runtime.Object{
+				cmWithoutCocurrentData,
+			},
+			expectResult: &Configs{nil},
 		},
 		{
 			name:      "success",
@@ -301,8 +302,10 @@ func TestGetConfigs(t *testing.T) {
 			kubeClientObj: []runtime.Object{
 				cmWithValidData,
 			},
-			expectResult: &DataPathConcurrency{
-				GlobalConfig: 5,
+			expectResult: &Configs{
+				DataPathConcurrency: &DataPathConcurrency{
+					GlobalConfig: 5,
+				},
 			},
 		},
 	}
@@ -321,8 +324,10 @@ func TestGetConfigs(t *testing.T) {
 
 				if test.expectResult == nil {
 					assert.Nil(t, result)
+				} else if test.expectResult.DataPathConcurrency == nil {
+					assert.Nil(t, result.DataPathConcurrency)
 				} else {
-					assert.Equal(t, *test.expectResult, *result.DataPathConcurrency)
+					assert.Equal(t, *test.expectResult.DataPathConcurrency, *result.DataPathConcurrency)
 				}
 			} else {
 				assert.EqualError(t, err, test.expectErr)