From 9e7fbf42c856e3e7a506e54e95a4f73f2de99ac7 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 20 Jul 2018 10:16:08 -0400 Subject: [PATCH] Move api rules list under api-approvers-owned package --- {hack/testdata => api}/api-rules/README.md | 0 {hack/testdata => api}/api-rules/violation_exceptions.list | 0 build/root/Makefile.generated_files | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {hack/testdata => api}/api-rules/README.md (100%) rename {hack/testdata => api}/api-rules/violation_exceptions.list (100%) diff --git a/hack/testdata/api-rules/README.md b/api/api-rules/README.md similarity index 100% rename from hack/testdata/api-rules/README.md rename to api/api-rules/README.md diff --git a/hack/testdata/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list similarity index 100% rename from hack/testdata/api-rules/violation_exceptions.list rename to api/api-rules/violation_exceptions.list diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files index cce8b60cbad..763dd0c3753 100644 --- a/build/root/Makefile.generated_files +++ b/build/root/Makefile.generated_files @@ -404,8 +404,8 @@ OPENAPI_FILENAME := $(OPENAPI_BASENAME).go OPENAPI_OUTPUT_PKG := pkg/generated/openapi BOILERPLATE_FILENAME := vendor/k8s.io/code-generator/hack/boilerplate.go.txt REPORT_FILENAME := $(OUT_DIR)/violations.report -KNOWN_VIOLATION_FILENAME := hack/testdata/api-rules/violation_exceptions.list -API_RULE_CHECK_FAILURE_MESSAGE := "Error: API rules check failed. Reported violations \"$(REPORT_FILENAME)\" differ from known violations \"$(KNOWN_VIOLATION_FILENAME)\". Please fix API source file if new violation is detected, or update known violations \"$(KNOWN_VIOLATION_FILENAME)\" if existing violation is being fixed. Please refer to hack/testdata/api-rules/README.md and https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators/rules for more information about the API rules being enforced." +KNOWN_VIOLATION_FILENAME := api/api-rules/violation_exceptions.list +API_RULE_CHECK_FAILURE_MESSAGE := "Error: API rules check failed. Reported violations \"$(REPORT_FILENAME)\" differ from known violations \"$(KNOWN_VIOLATION_FILENAME)\". Please fix API source file if new violation is detected, or update known violations \"$(KNOWN_VIOLATION_FILENAME)\" if existing violation is being fixed. Please refer to api/api-rules/README.md and https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators/rules for more information about the API rules being enforced." # The tool used to generate open apis. OPENAPI_GEN := $(BIN_DIR)/openapi-gen