cleanup testdata genearte

kubernetes-sigs · May 21, 2024 · 12fa1ad · 12fa1ad
1 parent 4f0e2c3
commit 12fa1ad
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/test/testdata/generate.sh b/test/testdata/generate.sh
@@ -31,37 +31,22 @@ function scaffold_test_project {
   rm -rf $testdata_dir/$project/*
   pushd $testdata_dir/$project
 
-  # Remove tool binaries for projects of version 2, which don't have locally-configured binaries,
-  # so the correct versions are used. Also, webhooks in version 2 don't have --make flag
-  if [[ $init_flags =~ --project-version=2 ]]; then
-    rm -f "$(command -v controller-gen)"
-    rm -f "$(command -v kustomize)"
-  fi
-
   header_text "Generating project ${project} with flags: ${init_flags}"
 
   go mod init sigs.k8s.io/kubebuilder/testdata/$project  # our repo autodetection will traverse up to the kb module if we don't do this
 
   header_text "Initializing project ..."
   $kb init $init_flags --domain testproject.org --license apache2 --owner "The Kubernetes authors"
 
-  if [ $project == "project-v2" ] || [ $project == "project-v3" ] || [ $project == "project-v3-config" ] || [ $project == "project-v4" ] || [ $project == "project-v4-config" ]; then
+  if [ $project == "project-v4" ] || [ $project == "project-v4-config" ]; then
     header_text 'Creating APIs ...'
     $kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false
     $kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false --force
     $kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation
-    if [ $project == "project-v3" ]; then
-      $kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation --force
-    fi
-
-    if [ $project == "project-v2" ]; then
-      $kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
-    else
-      $kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
-    fi
+    $kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
     $kb create webhook --group crew --version v1 --kind FirstMate --conversion
 
-    if [ $project == "project-v3" ] || [ $project == "project-v4" ]; then
+    if [ $project == "project-v4" ]; then
       $kb create api --group crew --version v1 --kind Admiral --plural=admirales --controller=true --resource=true --namespaced=false --make=false
       $kb create webhook --group crew --version v1 --kind Admiral --plural=admirales --defaulting
     else