Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/config/v3/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,7 @@ var _ = Describe("cfg", func() {
},
},
}
// TODO: include cases with Plural, Path, API.namespaced, Controller, Webhooks.Defaulting,
// Webhooks.Validation and Webhooks.Conversion when added
// TODO: include cases with Path when added
s1 = `domain: my.domain
layout: go.kubebuilder.io/v2
projectName: ProjectName
Expand Down
6 changes: 0 additions & 6 deletions pkg/plugins/golang/v2/scaffolds/internal/templates/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ const (
`
controllerImportCodeFragment = `"%s/controllers"
`
// TODO(v3): `&%scontrollers` should be used instead of `&%scontroller` as there may be multiple
// controller for different Kinds in the same group. However, this is a backwards incompatible
// change, and thus should be done for next project version.
multiGroupControllerImportCodeFragment = `%scontroller "%s/controllers/%s"
`
addschemeCodeFragment = `utilruntime.Must(%s.AddToScheme(scheme))
Expand All @@ -108,9 +105,6 @@ const (
os.Exit(1)
}
`
// TODO(v3): loggers for the same Kind controllers from different groups use the same logger.
// `.WithName("controllers").WithName(GROUP).WithName(KIND)` should be used instead. However,
// this is a backwards incompatible change, and thus should be done for next project version.
multiGroupReconcilerSetupCodeFragment = `if err = (&%scontroller.%sReconciler{
Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("%s"),
Expand Down