UPSTREAM: <carry>: Stop ignoring generated openapi definitions

marun · soltysh · commit 5af594b9f817 · 2022-09-20T19:21:59.000+02:00
openshift/origin needs to be able to vendor these definitions so they
need to be committed.

openshift-rebase(v1.24):source=1ca04429c95
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

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ CLEAN_PATTERNS=(`
`26`	`26`	`"doc_tmp"`
`27`	`27`	`"((?!staging\/src\/k8s\.io\/apiextensions-apiserver\/pkg\/generated\/openapi).)*/zz_generated.openapi.go"`
`28`	`28`	`"test/e2e/generated/bindata.go"`
	`29`	`+ # TODO(bentheelder): remove this pattern after bazel is not in any supported releases`
	`30`	`+ # see: https://github.com/kubernetes/enhancements/issues/2420`
	`31`	`+ "bazel-.*"`
`29`	`32`	`)`
`30`	`33`
`31`	`34`	`for pattern in "${CLEAN_PATTERNS[@]}"; do`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Ensure that openapi definitions are not ignored to ensure that`
	`2`	`+# openshift/origin can vendor them.`
	`3`	`+!zz_generated.openapi.go`