From aa24b475a47e8edfb020296800961abb20b4b458 Mon Sep 17 00:00:00 2001 From: Mauricio Harley Date: Fri, 6 Dec 2024 13:06:04 +0000 Subject: [PATCH 1/3] Reenabling CRD Schema Validator Signed-off-by: Mauricio Harley --- hack/crd-schema-checker.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/crd-schema-checker.sh b/hack/crd-schema-checker.sh index 245ac0d..c431ae5 100755 --- a/hack/crd-schema-checker.sh +++ b/hack/crd-schema-checker.sh @@ -16,7 +16,6 @@ for crd in config/crd/bases/*.yaml; do mkdir -p "$(dirname "$TMP_DIR/$crd")" git show "$BASE_REF:$crd" > "$TMP_DIR/$crd" $CHECKER check-manifests \ - --disabled-validators=NoBools,NoNewRequiredFields \ --existing-crd-filename="$TMP_DIR/$crd" \ --new-crd-filename="$crd" done From 9a7610accb911dcf10b1a316841861dfbfec7b35 Mon Sep 17 00:00:00 2001 From: Mauricio Harley Date: Fri, 6 Dec 2024 13:06:04 +0000 Subject: [PATCH 2/3] Reenabling CRD Schema Validator Signed-off-by: Mauricio Harley --- controllers/barbican_common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/barbican_common.go b/controllers/barbican_common.go index 417e55d..c4166b6 100644 --- a/controllers/barbican_common.go +++ b/controllers/barbican_common.go @@ -119,7 +119,7 @@ func GeneratePKCS11TemplateMap( // Checking if a supported HSM type has been provided. if !slices.Contains(barbicanv1beta1.HSMTypes, strings.ToLower(pkcs11.Type)) { - return nil, errors.New("no valid HSM type provided!map[string]interface{}") + return nil, errors.New("No valid HSM type provided!") } tempMap["P11Enabled"] = true From 941f2208b55097e9dbb311fbfb2a712c3104a969 Mon Sep 17 00:00:00 2001 From: Mauricio Harley Date: Fri, 6 Dec 2024 13:06:04 +0000 Subject: [PATCH 3/3] Reenabling CRD Schema Validator Signed-off-by: Mauricio Harley --- controllers/barbican_common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/barbican_common.go b/controllers/barbican_common.go index c4166b6..c424787 100644 --- a/controllers/barbican_common.go +++ b/controllers/barbican_common.go @@ -119,7 +119,7 @@ func GeneratePKCS11TemplateMap( // Checking if a supported HSM type has been provided. if !slices.Contains(barbicanv1beta1.HSMTypes, strings.ToLower(pkcs11.Type)) { - return nil, errors.New("No valid HSM type provided!") + return nil, errors.New("no valid HSM type provided") } tempMap["P11Enabled"] = true