Skip to content

Commit 33a2f3d

Browse files
🌱 fix testdata/project-v4 samples by removing call to generate Lakers controller without resource (#4129)
fix: testdata project-v4 samples by removing call to generate Lakers controller without resource We are removing the Laker from here because we already test the creation of controllers without resource in the multi-group. Also, if we keep it here it will not allow we have a very comprehensive test e2e tests for this sample since it is an edge case and we users need to customize the controller for not see error likes ``` ERROR setup unable to create controller {"controller": "Laker", "error": "one of For() or Named() must be called"} main.main /workspace/cmd/main.go:193 runtime.main /usr/local/go/src/runtime/proc.go:271 ``` We cannot do that manually just for our e2e tests on the samples
1 parent b364462 commit 33a2f3d

File tree

7 files changed

+0
-113
lines changed

7 files changed

+0
-113
lines changed

‎test/testdata/generate.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ function scaffold_test_project {
5353
$kb create api --group crew --version v1 --kind Admiral --controller=true --resource=true --namespaced=false --make=false
5454
$kb create webhook --group crew --version v1 --kind Admiral --defaulting
5555
fi
56-
57-
$kb create api --group crew --version v1 --kind Laker --controller=true --resource=false --make=false
5856
elif [[ $project =~ multigroup ]]; then
5957
header_text 'Switching to multigroup layout ...'
6058
$kb edit --multigroup=true

‎testdata/project-v4/PROJECT

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,4 @@ resources:
4545
webhooks:
4646
defaulting: true
4747
webhookVersion: v1
48-
- controller: true
49-
domain: testproject.org
50-
group: crew
51-
kind: Laker
52-
version: v1
5348
version: "3"

‎testdata/project-v4/cmd/main.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,6 @@ func main() {
186186
os.Exit(1)
187187
}
188188
}
189-
if err = (&controller.LakerReconciler{
190-
Client: mgr.GetClient(),
191-
Scheme: mgr.GetScheme(),
192-
}).SetupWithManager(mgr); err != nil {
193-
setupLog.Error(err, "unable to create controller", "controller", "Laker")
194-
os.Exit(1)
195-
}
196189
// +kubebuilder:scaffold:builder
197190

198191
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

‎testdata/project-v4/config/rbac/role.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ rules:
1010
- admirales
1111
- captains
1212
- firstmates
13-
- lakers
1413
verbs:
1514
- create
1615
- delete
@@ -25,7 +24,6 @@ rules:
2524
- admirales/finalizers
2625
- captains/finalizers
2726
- firstmates/finalizers
28-
- lakers/finalizers
2927
verbs:
3028
- update
3129
- apiGroups:
@@ -34,7 +32,6 @@ rules:
3432
- admirales/status
3533
- captains/status
3634
- firstmates/status
37-
- lakers/status
3835
verbs:
3936
- get
4037
- patch

‎testdata/project-v4/dist/install.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ rules:
410410
- admirales
411411
- captains
412412
- firstmates
413-
- lakers
414413
verbs:
415414
- create
416415
- delete
@@ -425,7 +424,6 @@ rules:
425424
- admirales/finalizers
426425
- captains/finalizers
427426
- firstmates/finalizers
428-
- lakers/finalizers
429427
verbs:
430428
- update
431429
- apiGroups:
@@ -434,7 +432,6 @@ rules:
434432
- admirales/status
435433
- captains/status
436434
- firstmates/status
437-
- lakers/status
438435
verbs:
439436
- get
440437
- patch

‎testdata/project-v4/internal/controller/laker_controller.go

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎testdata/project-v4/internal/controller/laker_controller_test.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)