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 (
27
27
"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
28
28
"sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
29
29
"sigs.k8s.io/kubebuilder/v4/pkg/plugins"
30
- "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates"
31
30
"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"
32
32
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers"
33
33
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
34
34
)
@@ -111,7 +111,7 @@ func (s *apiScaffolder) Scaffold() error {
111
111
}
112
112
113
113
if err := scaffold .Execute (
114
- & templates .MainUpdater {WireResource : doAPI , WireController : doController },
114
+ & cmd .MainUpdater {WireResource : doAPI , WireController : doController },
115
115
); err != nil {
116
116
return fmt .Errorf ("error updating cmd/main.go: %v" , err )
117
117
}
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ import (
28
28
"sigs.k8s.io/kubebuilder/v4/pkg/plugins"
29
29
kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2"
30
30
"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"
31
32
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/github"
32
33
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
33
34
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e"
@@ -141,7 +142,7 @@ func (s *initScaffolder) Scaffold() error {
141
142
}
142
143
143
144
return scaffold .Execute (
144
- & templates .Main {
145
+ & cmd .Main {
145
146
ControllerRuntimeVersion : ControllerRuntimeVersion ,
146
147
},
147
148
& 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
14
14
limitations under the License.
15
15
*/
16
16
17
- package templates
17
+ package cmd
18
18
19
19
import (
20
20
"fmt"
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ import (
27
27
"sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
28
28
pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util"
29
29
"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 "
31
31
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
32
32
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e"
33
33
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks"
@@ -95,7 +95,7 @@ func (s *webhookScaffolder) Scaffold() error {
95
95
if err := scaffold .Execute (
96
96
& webhooks.Webhook {Force : s .force , IsLegacyPath : s .isLegacy },
97
97
& e2e.WebhookTestUpdater {WireWebhook : true },
98
- & templates .MainUpdater {WireWebhook : true , IsLegacyPath : s .isLegacy },
98
+ & cmd .MainUpdater {WireWebhook : true , IsLegacyPath : s .isLegacy },
99
99
& webhooks.WebhookTest {Force : s .force , IsLegacyPath : s .isLegacy },
100
100
); err != nil {
101
101
return err
You can’t perform that action at this time.
0 commit comments