Merge pull request #657 from yifan-gu/cri_label

CRI: Change CRILabels type to map[string]string.
appc · Sep 21, 2016 · 549b066 · 549b066
2 parents 1be68be + 713aa44
commit 549b066
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 77 deletions.
diff --git a/schema/types/app.go b/schema/types/app.go
@@ -91,8 +91,5 @@ func (a *App) assertValid() error {
 	if err := a.Isolators.assertValid(); err != nil {
 		return err
 	}
-	if err := a.CRILabels.assertValid(); err != nil {
-		return err
-	}
 	return nil
 }
diff --git a/schema/types/app_test.go b/schema/types/app_test.go
@@ -212,7 +212,7 @@ func TestAppUnmarshal(t *testing.T) {
 			false,
 		},
 		{
-			`{"Exec":["/a"],"User":"0","Group":"0","CRIAnnotations":{"weird!":"normal?"},"CRILabels":{"one":"two"}}`,
+			`{"Exec":["/a"],"User":"0","Group":"0","CRIAnnotations":{"weird!":"normal?"},"CRILabels":{"one!":"two?"}}`,
 			&App{
 				Exec: Exec{
 					"/a",
@@ -224,16 +224,11 @@ func TestAppUnmarshal(t *testing.T) {
 					"weird!": "normal?",
 				},
 				CRILabels: CRILabels{
-					"one": "two",
+					"one!": "two?",
 				},
 			},
 			false,
 		},
-		{
-			`{"Exec":["/a"],"User":"0","Group":"0","CRIAnnotations":{"weird!":"normal?"},"CRILabels":{"!one":"two"}}`,
-			&App{},
-			true,
-		},
 	}
 	for i, tt := range tests {
 		a := &App{}

diff --git a/schema/types/cri_labels.go b/schema/types/cri_labels.go
@@ -14,18 +14,5 @@
 
 package types
 
-import "fmt"
-
-type CRILabels map[ACIdentifier]string
-
-func (l CRILabels) assertValid() error {
-	for k, _ := range l {
-		if err := k.assertValid(); err != nil {
-			return err
-		}
-		if len(k) > 63 {
-			return fmt.Errorf(`label %q too long`, k)
-		}
-	}
-	return nil
-}
+// CRILabels are arbitrary key-value pairs
+type CRILabels map[string]string
diff --git a/schema/types/cri_labels_test.go b/schema/types/cri_labels_test.go