File tree Expand file tree Collapse file tree 4 files changed +7
-6
lines changed
pkg/plugins/golang/v4/scaffolds Expand file tree Collapse file tree 4 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -27,8 +27,8 @@ import (
2727 "sigs.k8s.io/kubebuilder/v4/pkg/machinery"
2828 "sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
2929 "sigs.k8s.io/kubebuilder/v4/pkg/plugins"
30- "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates"
3130 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/api"
31+ "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd"
3232 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers"
3333 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
3434)
@@ -111,7 +111,7 @@ func (s *apiScaffolder) Scaffold() error {
111111 }
112112
113113 if err := scaffold .Execute (
114- & templates .MainUpdater {WireResource : doAPI , WireController : doController },
114+ & cmd .MainUpdater {WireResource : doAPI , WireController : doController },
115115 ); err != nil {
116116 return fmt .Errorf ("error updating cmd/main.go: %v" , err )
117117 }
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ import (
2828 "sigs.k8s.io/kubebuilder/v4/pkg/plugins"
2929 kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2"
3030 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates"
31+ "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd"
3132 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/github"
3233 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
3334 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e"
@@ -141,7 +142,7 @@ func (s *initScaffolder) Scaffold() error {
141142 }
142143
143144 return scaffold .Execute (
144- & templates .Main {
145+ & cmd .Main {
145146 ControllerRuntimeVersion : ControllerRuntimeVersion ,
146147 },
147148 & templates.GoMod {
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414limitations under the License.
1515*/
1616
17- package templates
17+ package cmd
1818
1919import (
2020 "fmt"
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ import (
2727 "sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
2828 pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util"
2929 "sigs.k8s.io/kubebuilder/v4/pkg/plugins"
30- "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates"
30+ "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd "
3131 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
3232 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e"
3333 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks"
@@ -95,7 +95,7 @@ func (s *webhookScaffolder) Scaffold() error {
9595 if err := scaffold .Execute (
9696 & webhooks.Webhook {Force : s .force , IsLegacyPath : s .isLegacy },
9797 & e2e.WebhookTestUpdater {WireWebhook : true },
98- & templates .MainUpdater {WireWebhook : true , IsLegacyPath : s .isLegacy },
98+ & cmd .MainUpdater {WireWebhook : true , IsLegacyPath : s .isLegacy },
9999 & webhooks.WebhookTest {Force : s .force , IsLegacyPath : s .isLegacy },
100100 ); err != nil {
101101 return err
You can’t perform that action at this time.
0 commit comments