UPSTREAM: <carry>: Stop ignoring test/e2e/generated/bindata.go

This needs to be maintained can committed in our fork so that it can be vendored by origin. UPSTREAM: <carry>: (squash) Stop ignoring generated openapi definitions openshift/origin needs to be able to vendor these definitions so they need to be committed. Should be squashed with UPSTREAM: <carry>: Stop ignoring test/e2e/generated/bindata.go
openshift · Sep 8, 2021 · 02f6407 · 02f6407
1 parent c38487b
commit 02f6407
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/hack/make-rules/clean.sh b/hack/make-rules/clean.sh
@@ -25,7 +25,6 @@ CLEAN_PATTERNS=(
   "_tmp"
   "doc_tmp"
   "((?!staging\/src\/k8s\.io\/apiextensions-apiserver\/pkg\/generated\/openapi).)*/zz_generated.openapi.go"
-  "test/e2e/generated/bindata.go"
 )
 
 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
diff --git a/test/e2e/generated/.gitignore b/test/e2e/generated/.gitignore
@@ -0,0 +1,2 @@
+# Ensure that bindata is not ignored to ensure openshift/origin can vendor it.
+!bindata.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Ensure that bindata is not ignored to ensure openshift/origin can vendor it.
		!bindata.go