avoid error when the node has local-config

api/resmap/factory.go

@@ -152,11 +152,11 @@ func (rmF *Factory) NewResMapFromRNodeSlice(rnodes []*yaml.RNode) (ResMap, error
 		if err != nil {
 			return nil, err
 		}
-		r, err := rmF.resF.FromBytes([]byte(s))
+		r, err := rmF.resF.SliceFromBytes([]byte(s))
 		if err != nil {
 			return nil, err
 		}
-		resources = append(resources, r)
+		resources = append(resources, r...)
 	}
 	return newResMapFromResourceSlice(resources)
 }

api/resmap/factory_test.go

@@ -277,7 +277,17 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 }
 
 func TestFromRNodeSlice(t *testing.T) {
-	input := `apiVersion: rbac.authorization.k8s.io/v1
+	type testcase struct {
+		input    string
+		expected ResMap
+	}
+	testcases := map[string]testcase{
+		"no resource": {
+			input:    "---",
+			expected: resmaptest_test.NewRmBuilder(t, rf).ResMap(),
+		},
+		"single resource": {
+			input: `apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: namespace-reader
@@ -290,42 +300,54 @@ rules:
   - get
   - watch
   - list
-  `
-	rnodes := []*yaml.RNode{
-		yaml.MustParse(input),
-	}
-
-	rm, err := rmF.NewResMapFromRNodeSlice(rnodes)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	expected := resmaptest_test.NewRmBuilder(t, rf).Add(
-		map[string]interface{}{
-			"apiVersion": "rbac.authorization.k8s.io/v1",
-			"kind":       "ClusterRole",
-			"metadata": map[string]interface{}{
-				"name": "namespace-reader",
-			},
-			"rules": []interface{}{
+      `,
+			expected: resmaptest_test.NewRmBuilder(t, rf).Add(
 				map[string]interface{}{
-					"apiGroups": []interface{}{
-						"",
+					"apiVersion": "rbac.authorization.k8s.io/v1",
+					"kind":       "ClusterRole",
+					"metadata": map[string]interface{}{
+						"name": "namespace-reader",
 					},
-					"resources": []interface{}{
-						"namespaces",
+					"rules": []interface{}{
+						map[string]interface{}{
+							"apiGroups": []interface{}{
+								"",
+							},
+							"resources": []interface{}{
+								"namespaces",
+							},
+							"verbs": []interface{}{
+								"get",
+								"watch",
+								"list",
+							},
+						},
 					},
-					"verbs": []interface{}{
-						"get",
-						"watch",
-						"list",
-					},
-				},
-			},
-		}).ResMap()
-
-	if err = expected.ErrorIfNotEqualLists(rm); err != nil {
-		t.Fatalf("error: %s", err)
+				}).ResMap(),
+		},
+		"local config": {
+			// local config should be ignored
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my-config
+  annotations:
+    config.kubernetes.io/local-config: 'true'
+`,
+			expected: resmaptest_test.NewRmBuilder(t, rf).ResMap(),
+		},
+	}
+	for name, tc := range testcases {
+		rnodes := []*yaml.RNode{
+			yaml.MustParse(tc.input),
+		}
+		rm, err := rmF.NewResMapFromRNodeSlice(rnodes)
+		if err != nil {
+			t.Fatalf("unexpected error in test case [%s]: %v", name, err)
+		}
+		if err = tc.expected.ErrorIfNotEqualLists(rm); err != nil {
+			t.Fatalf("error in test case [%s]: %s", name, err)
+		}
 	}
 }