From 7303df0b2161600c47f49034e120fa2065ef539c Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Thu, 29 Aug 2019 22:49:00 -0700 Subject: [PATCH] fix nit --- .../pkg/apis/apiextensions/validation/validation.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go index b92f5c2ceae..2f10a029df5 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go @@ -800,10 +800,10 @@ func ValidateCustomResourceDefinitionOpenAPISchema(schema *apiextensions.JSONSch allErrs = append(allErrs, field.NotSupported(fldPath.Child("x-kubernetes-list-type"), *schema.XListType, []string{"atomic", "set", "map"})) } - if len(schema.XListMapKeys) > 0 && (schema.XListType == nil || *schema.XListType != "map") { + if len(schema.XListMapKeys) > 0 { if schema.XListType == nil { allErrs = append(allErrs, field.Required(fldPath.Child("x-kubernetes-list-type"), "must be map if x-kubernetes-list-map-keys is non-empty")) - } else { + } else if *schema.XListType != "map" { allErrs = append(allErrs, field.Invalid(fldPath.Child("x-kubernetes-list-type"), *schema.XListType, "must be map if x-kubernetes-list-map-keys is non-empty")) } }