UPSTREAM: <carry>: Stop ignoring generated openapi definitions

openshift/origin needs to be able to vendor these definitions so they need to be committed.
openshift · Dec 6, 2021 · 72f9bb3 · 72f9bb3
1 parent 0745c94
commit 72f9bb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/hack/make-rules/clean.sh b/hack/make-rules/clean.sh
@@ -26,6 +26,9 @@ CLEAN_PATTERNS=(
   "doc_tmp"
   "((?!staging\/src\/k8s\.io\/apiextensions-apiserver\/pkg\/generated\/openapi).)*/zz_generated.openapi.go"
   "test/e2e/generated/bindata.go"
+  # TODO(bentheelder): remove this pattern after bazel is not in any supported releases
+  # see: https://github.com/kubernetes/enhancements/issues/2420
+  "bazel-.*"
 )
 
 for pattern in "${CLEAN_PATTERNS[@]}"; do

diff --git a/pkg/generated/openapi/.gitignore b/pkg/generated/openapi/.gitignore
@@ -0,0 +1,3 @@
+# Ensure that openapi definitions are not ignored to ensure that
+# openshift/origin can vendor them.
+!zz_generated.openapi.go