Merge pull request #2741 from camilamacedo86/reduce-testdata-samples

🌱 clean up samples by removing deprecated options
kubernetes-sigs · Jun 17, 2022 · 44718e7 · 44718e7
2 parents 631e5f3 + 5397fba
commit 44718e7
Show file tree

Hide file tree

Showing 244 changed files with 1 addition and 9,694 deletions.
diff --git a/test/testdata/generate.sh b/test/testdata/generate.sh
@@ -107,10 +107,6 @@ function scaffold_test_project {
     $kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false
     $kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
     $kb create api --group crew --version v1 --kind Admiral --controller=true --resource=true --namespaced=false --make=false
-  elif [[ $project =~ v1beta1 ]]; then
-    header_text 'Creating APIs ...'
-    $kb create api --group crew --version v1 --kind Admiral --controller=true --resource=true --namespaced=false --make=false --crd-version=v1beta1
-    $kb create webhook --group crew --version v1 --kind Admiral --defaulting --webhook-version=v1beta1
   fi
 
   make generate manifests
@@ -123,12 +119,9 @@ build_kb
 
 # Project version 2 uses plugin go/v2 (default).
 scaffold_test_project project-v2 --project-version=2
-scaffold_test_project project-v2-multigroup --project-version=2
-scaffold_test_project project-v2-addon --project-version=3 --plugins="go/v2,declarative"
 # Project version 3 (default) uses plugin go/v3 (default).
 scaffold_test_project project-v3
 scaffold_test_project project-v3-multigroup
 scaffold_test_project project-v3-addon --plugins="go/v3,declarative"
 scaffold_test_project project-v3-config --component-config
-scaffold_test_project project-v3-v1beta1
 scaffold_test_project project-v3-with-kustomize-v2 --plugins="kustomize/v2-alpha,base.go.kubebuilder.io/v3"
diff --git a/test/testdata/test_legacy.sh b/test/testdata/test_legacy.sh
@@ -34,5 +34,4 @@ build_kb
 tools_k8s_version="1.19.2"
 fetch_tools
 test_project project-v2
-test_project project-v2-multigroup
-test_project project-v2-addon
+
diff --git a/testdata/project-v2-addon/.gitignore b/testdata/project-v2-addon/.gitignore
diff --git a/testdata/project-v2-addon/Dockerfile b/testdata/project-v2-addon/Dockerfile
diff --git a/testdata/project-v2-addon/Makefile b/testdata/project-v2-addon/Makefile
diff --git a/testdata/project-v2-addon/PROJECT b/testdata/project-v2-addon/PROJECT
diff --git a/testdata/project-v2-addon/api/v1/admiral_types.go b/testdata/project-v2-addon/api/v1/admiral_types.go