Merge pull request #3086 from Kavinjsir/ci/refact-e2e-test

🌱 ci: refact testdata

Author: k8s-ci-robot

docs/book/src/plugins/declarative-v1.md

@@ -50,7 +50,7 @@ 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 Captain --controller=true --resource=true --make=false --force
     $kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation
-    if [ $project == "project-v3" ] || [ $project == "project-v3-with-kustomize-v2" ]; then
+    if [ $project == "project-v3" ]; then
       $kb create webhook --group crew --version v1 --kind Captain --defaulting --programmatic-validation --force
     fi
 
@@ -102,7 +102,7 @@ function scaffold_test_project {
       $kb create api --version v1 --kind Lakers --controller=true --resource=true --make=false
       $kb create webhook --version v1 --kind Lakers --defaulting --programmatic-validation
     fi
-  elif [[ $project =~ addon ]]; then
+  elif [[ $project =~ declarative ]]; 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 FirstMate --controller=true --resource=true --make=false
@@ -113,7 +113,7 @@ function scaffold_test_project {
       $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false
       header_text 'Creating Memcached webhook ...'
       $kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
-  elif [[ $project == "project-v3" || $project == "project-v4" ]]; then
+  elif [[ $project =~ "with-metrics" ]]; then
      header_text 'Editing project with Grafana plugin ...'
       $kb edit --plugins=grafana.kubebuilder.io/v1-alpha
   fi
@@ -132,14 +132,16 @@ scaffold_test_project project-v2 --project-version=2
 # [Currently, default CLI plugin] - 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-and-grafana --plugins="go/v3,declarative,grafana/v1-alpha"
+scaffold_test_project project-v3-declarative-v1 --plugins="go/v3,declarative,grafana/v1-alpha"
 scaffold_test_project project-v3-config --component-config
 scaffold_test_project project-v3-with-deploy-image
+scaffold_test_project project-v3-with-metrics
 
 # [Next version, alpha] Project version v4-alpha
 scaffold_test_project project-v4 --plugins="go/v4-alpha"
 scaffold_test_project project-v4-multigroup --plugins="go/v4-alpha"
-scaffold_test_project project-v4-addon-and-grafana --plugins="go/v4-alpha,declarative,grafana/v1-alpha"
+scaffold_test_project project-v4-declarative-v1 --plugins="go/v4-alpha,declarative,grafana/v1-alpha"
 scaffold_test_project project-v4-config --component-config --plugins="go/v4-alpha"
 scaffold_test_project project-v4-with-deploy-image --plugins="go/v4-alpha"
+scaffold_test_project project-v4-with-metrics
 

docs/book/src/plugins/grafana-v1-alpha.md

@@ -33,13 +33,15 @@ build_kb
 # Test project v3
 test_project project-v3
 test_project project-v3-multigroup
-test_project project-v3-addon-and-grafana
+test_project project-v3-declarative-v1
 test_project project-v3-config
 test_project project-v3-with-deploy-image
+test_project project-v3-with-metrics
 
 # Project version v4-alpha
 test_project project-v4
 test_project project-v4-multigroup
-test_project project-v4-addon-and-grafana
+test_project project-v4-declarative-v1
 test_project project-v4-config
 test_project project-v4-with-deploy-image
+test_project project-v4-with-metrics

test/testdata/generate.sh

@@ -19,8 +19,8 @@ plugins:
       kind: Admiral
       version: v1
   grafana.kubebuilder.io/v1-alpha: {}
-projectName: project-v3-addon-and-grafana
-repo: sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana
+projectName: project-v3-declarative-v1
+repo: sigs.k8s.io/kubebuilder/testdata/project-v3-declarative-v1
 resources:
 - api:
     crdVersion: v1
@@ -29,7 +29,7 @@ resources:
   domain: testproject.org
   group: crew
   kind: Captain
-  path: sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana/api/v1
+  path: sigs.k8s.io/kubebuilder/testdata/project-v3-declarative-v1/api/v1
   version: v1
 - api:
     crdVersion: v1
@@ -38,14 +38,14 @@ resources:
   domain: testproject.org
   group: crew
   kind: FirstMate
-  path: sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana/api/v1
+  path: sigs.k8s.io/kubebuilder/testdata/project-v3-declarative-v1/api/v1
   version: v1
 - api:
     crdVersion: v1
   controller: true
   domain: testproject.org
   group: crew
   kind: Admiral
-  path: sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana/api/v1
+  path: sigs.k8s.io/kubebuilder/testdata/project-v3-declarative-v1/api/v1
   version: v1
 version: "3"