Skip to content

Commit f392392

Browse files
cleanup testdata generate.sh
1 parent 4f0e2c3 commit f392392

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

test/testdata/generate.sh

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,22 @@ function scaffold_test_project {
3131
rm -rf $testdata_dir/$project/*
3232
pushd $testdata_dir/$project
3333

34-
# Remove tool binaries for projects of version 2, which don't have locally-configured binaries,
35-
# so the correct versions are used. Also, webhooks in version 2 don't have --make flag
36-
if [[ $init_flags =~ --project-version=2 ]]; then
37-
rm -f "$(command -v controller-gen)"
38-
rm -f "$(command -v kustomize)"
39-
fi
40-
4134
header_text "Generating project ${project} with flags: ${init_flags}"
4235

4336
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
4437

4538
header_text "Initializing project ..."
4639
$kb init $init_flags --domain testproject.org --license apache2 --owner "The Kubernetes authors"
4740

48-
if [ $project == "project-v2" ] || [ $project == "project-v3" ] || [ $project == "project-v3-config" ] || [ $project == "project-v4" ] || [ $project == "project-v4-config" ]; then
41+
if [ $project == "project-v4" ] || [ $project == "project-v4-config" ]; then
4942
header_text 'Creating APIs ...'
5043
$kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false
5144
$kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false --force
5245
$kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation
53-
if [ $project == "project-v3" ]; then
54-
$kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation --force
55-
fi
56-
57-
if [ $project == "project-v2" ]; then
58-
$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
59-
else
60-
$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
61-
fi
46+
$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
6247
$kb create webhook --group crew --version v1 --kind FirstMate --conversion
6348

64-
if [ $project == "project-v3" ] || [ $project == "project-v4" ]; then
49+
if [ $project == "project-v4" ]; then
6550
$kb create api --group crew --version v1 --kind Admiral --plural=admirales --controller=true --resource=true --namespaced=false --make=false
6651
$kb create webhook --group crew --version v1 --kind Admiral --plural=admirales --defaulting
6752
else
@@ -127,7 +112,6 @@ function scaffold_test_project {
127112

128113
build_kb
129114

130-
# [Currently, default CLI plugin] - [Next version, alpha] Project version v4-alpha
131115
scaffold_test_project project-v4 --plugins="go/v4"
132116
scaffold_test_project project-v4-multigroup --plugins="go/v4"
133117
scaffold_test_project project-v4-multigroup-with-deploy-image --plugins="go/v4"

0 commit comments

Comments
 (0)