diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/doc.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/doc.go
index 69f76061773..293af6aab3b 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/doc.go
@@ -26,7 +26,7 @@ import "k8s.io/code-generator/cmd/validation-gen/testscheme"
 var localSchemeBuilder = testscheme.New()
 
 type Tother struct {
-	// +k8s:validateFalse={"flags":[], "msg":"Tother, no flags"}
+	// +k8s:validateFalse="Tother, no flags"
 	OS string `json:"os"`
 }
 
@@ -43,80 +43,80 @@ type T00 struct {
 	PT       *Tother `json:"pt"`
 }
 
-// +k8s:validateFalse={"flags":[], "msg":"T01, no flags"}
+// +k8s:validateFalse="T01, no flags"
 type T01 struct {
 	TypeMeta int
-	// +k8s:validateFalse={"flags":[], "msg":"T01.S, no flags"}
+	// +k8s:validateFalse="T01.S, no flags"
 	S string `json:"s"`
-	// +k8s:validateFalse={"flags":[], "msg":"T01.PS, no flags"}
+	// +k8s:validateFalse="T01.PS, no flags"
 	PS *string `json:"ps"`
-	// +k8s:validateFalse={"flags":[], "msg":"T01.T, no flags"}
+	// +k8s:validateFalse="T01.T, no flags"
 	T Tother `json:"t"`
-	// +k8s:validateFalse={"flags":[], "msg":"T01.PT, no flags"}
+	// +k8s:validateFalse="T01.PT, no flags"
 	PT *Tother `json:"pt"`
 }
 
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T02, ShortCircuit"}
+// +k8s:validateFalse(flags: "ShortCircuit")="T02, ShortCircuit"
 type T02 struct {
 	TypeMeta int
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T02.S, ShortCircuit"}
+	// +k8s:validateFalse(flags: "ShortCircuit")="T02.S, ShortCircuit"
 	S string `json:"s"`
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T02.PS, ShortCircuit"}
+	// +k8s:validateFalse(flags: "ShortCircuit")="T02.PS, ShortCircuit"
 	PS *string `json:"ps"`
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T02.T, ShortCircuit"}
+	// +k8s:validateFalse(flags: "ShortCircuit")="T02.T, ShortCircuit"
 	T Tother `json:"t"`
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T02.PT, ShortCircuit"}
+	// +k8s:validateFalse(flags: "ShortCircuit")="T02.PT, ShortCircuit"
 	PT *Tother `json:"pt"`
 }
 
-// +k8s:validateFalse={"flags":[], "msg":"T03, no flags"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T03, ShortCircuit"}
+// +k8s:validateFalse="T03, no flags"
+// +k8s:validateFalse(flags: "ShortCircuit")="T03, ShortCircuit"
 type T03 struct {
 	TypeMeta int
-	// +k8s:validateFalse={"flags":[], "msg":"T03.S, no flags"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T03.S, ShortCircuit"}
+	// +k8s:validateFalse="T03.S, no flags"
+	// +k8s:validateFalse(flags: "ShortCircuit")="T03.S, ShortCircuit"
 	S string `json:"s"`
-	// +k8s:validateFalse={"flags":[], "msg":"T03.PS, no flags"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T03.PS, ShortCircuit"}
+	// +k8s:validateFalse="T03.PS, no flags"
+	// +k8s:validateFalse(flags: "ShortCircuit")="T03.PS, ShortCircuit"
 	PS *string `json:"ps"`
-	// +k8s:validateFalse={"flags":[], "msg":"T03.T, no flags"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T03.T, ShortCircuit"}
+	// +k8s:validateFalse="T03.T, no flags"
+	// +k8s:validateFalse(flags: "ShortCircuit")="T03.T, ShortCircuit"
 	T Tother `json:"t"`
-	// +k8s:validateFalse={"flags":[], "msg":"T03.PT, no flags"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"T03.PT, ShortCircuit"}
+	// +k8s:validateFalse="T03.PT, no flags"
+	// +k8s:validateFalse(flags: "ShortCircuit")="T03.PT, ShortCircuit"
 	PT *Tother `json:"pt"`
 }
 
 // Note: these are intentionally in the wrong final order.
-// +k8s:validateFalse={"flags":[], "msg":"TMultiple, no flags 1"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple, ShortCircuit 1"}
+// +k8s:validateFalse="TMultiple, no flags 1"
+// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple, ShortCircuit 1"
 // +k8s:validateFalse="T0, string payload"
-// +k8s:validateFalse={"flags":[], "msg":"TMultiple, no flags 2"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple, ShortCircuit 2"}
+// +k8s:validateFalse="TMultiple, no flags 2"
+// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple, ShortCircuit 2"
 type TMultiple struct {
 	TypeMeta int
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.S, no flags 1"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.S, ShortCircuit 1"}
+	// +k8s:validateFalse="TMultiple.S, no flags 1"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.S, ShortCircuit 1"
 	// +k8s:validateFalse="T0, string payload"
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.S, no flags 2"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.S, ShortCircuit 2"}
+	// +k8s:validateFalse="TMultiple.S, no flags 2"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.S, ShortCircuit 2"
 	S string `json:"s"`
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.PS, no flags 1"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.PS, ShortCircuit 1"}
+	// +k8s:validateFalse="TMultiple.PS, no flags 1"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.PS, ShortCircuit 1"
 	// +k8s:validateFalse="T0, string payload"
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.PS, no flags 2"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.PS, ShortCircuit 2"}
+	// +k8s:validateFalse="TMultiple.PS, no flags 2"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.PS, ShortCircuit 2"
 	PS *string `json:"ps"`
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.T, no flags 1"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.T, ShortCircuit 1"}
+	// +k8s:validateFalse="TMultiple.T, no flags 1"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.T, ShortCircuit 1"
 	// +k8s:validateFalse="T0, string payload"
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.T, no flags 2"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.T, ShortCircuit 2"}
+	// +k8s:validateFalse="TMultiple.T, no flags 2"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.T, ShortCircuit 2"
 	T Tother `json:"t"`
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.PT, no flags 1"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.PT, ShortCircuit 1"}
+	// +k8s:validateFalse="TMultiple.PT, no flags 1"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.PT, ShortCircuit 1"
 	// +k8s:validateFalse="T0, string payload"
-	// +k8s:validateFalse={"flags":[], "msg":"TMultiple.PT, no flags 2"}
-	// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"TMultiple.PT, ShortCircuit 2"}
+	// +k8s:validateFalse="TMultiple.PT, no flags 2"
+	// +k8s:validateFalse(flags: "ShortCircuit")="TMultiple.PT, ShortCircuit 2"
 	PT *Tother `json:"pt"`
 }
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/doc.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/doc.go
index 14a712fff86..0178edb2b95 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/doc.go
@@ -32,20 +32,20 @@ var localSchemeBuilder = testscheme.New()
 // Note: No validations.
 type E00 string
 
-// +k8s:validateFalse={"flags":[], "msg":"E01, no flags"}
+// +k8s:validateFalse="E01, no flags"
 type E01 string
 
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"E02, ShortCircuit"}
+// +k8s:validateFalse(flags: "ShortCircuit")="E02, ShortCircuit"
 type E02 string
 
-// +k8s:validateFalse={"flags":[], "msg":"E03, no flags"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"E03, ShortCircuit"}
+// +k8s:validateFalse="E03, no flags"
+// +k8s:validateFalse(flags: "ShortCircuit")="E03, ShortCircuit"
 type E03 string
 
 // Note: these are intentionally in the wrong final order.
-// +k8s:validateFalse={"flags":[], "msg":"EMultiple, no flags 1"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"EMultiple, ShortCircuit 1"}
+// +k8s:validateFalse="EMultiple, no flags 1"
+// +k8s:validateFalse(flags: "ShortCircuit")="EMultiple, ShortCircuit 1"
 // +k8s:validateFalse="E0, string payload"
-// +k8s:validateFalse={"flags":[], "msg":"EMultiple, no flags 2"}
-// +k8s:validateFalse={"flags":["ShortCircuit"], "msg":"EMultiple, ShortCircuit 2"}
+// +k8s:validateFalse="EMultiple, no flags 2"
+// +k8s:validateFalse(flags: "ShortCircuit")="EMultiple, ShortCircuit 2"
 type EMultiple string
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/doc.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/doc.go
index 4595627c7df..1cd1bb5d249 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/doc.go
@@ -34,21 +34,21 @@ var localSchemeBuilder = testscheme.New()
 type T1 struct {
 	TypeMeta int
 
-	// +k8s:validateFalse={"typeArg":"k8s.io/code-generator/cmd/validation-gen/output_tests/primitives.T1", "msg":"T1.S1"}
+	// +k8s:validateFalse(typeArg: "k8s.io/code-generator/cmd/validation-gen/output_tests/primitives.T1")="T1.S1"
 	S1 *primitives.T1 `json:"s1"`
-	// +k8s:validateFalse={"typeArg":"k8s.io/code-generator/cmd/validation-gen/output_tests/primitives.T1", "msg":"PT1.PS1"}
+	// +k8s:validateFalse(typeArg: "k8s.io/code-generator/cmd/validation-gen/output_tests/primitives.T1")="PT1.PS1"
 	PS1 *primitives.T1 `json:"ps1"`
 
-	// +k8s:validateFalse={"typeArg":"k8s.io/code-generator/cmd/validation-gen/output_tests/type_args.E1", "msg":"T1.E1"}
+	// +k8s:validateFalse(typeArg: "k8s.io/code-generator/cmd/validation-gen/output_tests/type_args.E1")="T1.E1"
 	E1 E1 `json:"e1"`
-	// +k8s:validateTrue={"typeArg":"k8s.io/code-generator/cmd/validation-gen/output_tests/type_args.E1", "msg":"T1.PE1"}
+	// +k8s:validateTrue(typeArg: "k8s.io/code-generator/cmd/validation-gen/output_tests/type_args.E1")="T1.PE1"
 	PE1 *E1 `json:"pe1"`
 
-	// +k8s:validateFalse={"typeArg":"int", "msg":"T1.I1"}
+	// +k8s:validateFalse(typeArg: "int")="T1.I1"
 	I1 int `json:"i1"`
-	// +k8s:validateTrue={"typeArg":"int", "msg":"T1.PI1"}
+	// +k8s:validateTrue(typeArg: "int")="T1.PI1"
 	PI1 *int `json:"pi1"`
 }
 
-// +k8s:validateFalse={"msg": "type E1"}
+// +k8s:validateFalse="type E1"
 type E1 string