diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43931a4529..b0cc5bae9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,7 +89,7 @@ To fully test the proposed plugin: 3. Create `generate_test.go` ([ref](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/v4/generate_test.go)). That should: - Introduce/Receive a `TextContext` instance - Trigger the plugin's bound subcommands. See [Init](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L213), [CreateAPI](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/test/e2e/utils/test_context.go#L222) - - Use [PluginUtil](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin/util) to verify the scaffolded outputs. See [InsertCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/pkg/plugin/util/util.go#L67), [ReplaceInFile](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L196), [UncommendCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L86) + - Use [PluginUtil](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin/util) to verify the scaffolded outputs. See [InsertCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/pkg/plugin/util/util.go#L67), [ReplaceInFile](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L196), [UncommendCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L86) 4. Create `plugin_cluster_test.go` ([ref](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/v4/plugin_cluster_test.go)). That should: - 4.1. Setup testing environment, e.g: @@ -103,7 +103,7 @@ To fully test the proposed plugin: - Execute commands in your `Makefile`. See [Make](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L240) - Temporary load image of the testing controller. See [LoadImageToKindCluster](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L283) - - Call Kubectl to validate running resources. See [utils.Kubectl](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/test/e2e/utils#Kubectl) + - Call Kubectl to validate running resources. See [utils.Kubectl](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/test/e2e/utils#Kubectl) - 4.4. Delete temporary resources after testing exited, e.g: - Uninstall prerequisites CRDs: See [UninstallPrometheusOperManager](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L183) diff --git a/cmd/main.go b/cmd/main.go index 3bca2992f8..64a25502cd 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -19,17 +19,17 @@ package main import ( "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/cli" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/cli" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" //nolint:staticcheck - deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1" - golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4" - grafanav1alpha1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/optional/grafana/v1alpha" + deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1" + golangv4 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4" + grafanav1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha" ) func init() { diff --git a/docs/book/src/plugins/creating-plugins.md b/docs/book/src/plugins/creating-plugins.md index 3f301a59c2..1b1a3882ac 100644 --- a/docs/book/src/plugins/creating-plugins.md +++ b/docs/book/src/plugins/creating-plugins.md @@ -150,7 +150,7 @@ Such object that implements the machinery interface will later pass to the [exec Similar, you may also design your code of plugin implementation by such reference. You can also view the other parts of the code file given by the links above. -If your plugin is expected to modify part of the existing files with its scaffold, you may use functions provided by [sigs.k8s.io/kubebuilder/v3/pkg/plugin/util][kb-util]. +If your plugin is expected to modify part of the existing files with its scaffold, you may use functions provided by [sigs.k8s.io/kubebuilder/v4/pkg/plugin/util][kb-util]. See [example of deploy-image][example-of-deploy-image-2]. In brief, the util package helps you customize your scaffold in a lower level. @@ -203,7 +203,7 @@ Alternatively, you can create a plugin bundle to include the target plugins. For [deploy-image]: https://github.com/kubernetes-sigs/kubebuilder/tree/v3.7.0/pkg/plugins/golang/deploy-image/v1alpha1 [grafana]: https://github.com/kubernetes-sigs/kubebuilder/tree/v3.7.0/pkg/plugins/optional/grafana/v1alpha [extending-cli]: ./extending-cli.md -[kb-util]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin/util +[kb-util]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin/util [example-of-deploy-image-1]: https://github.com/kubernetes-sigs/kubebuilder/blob/df1ed6ccf19df40bd929157a91eaae6a9215bfc6/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go#L58 [example-of-deploy-image-2]: https://github.com/kubernetes-sigs/kubebuilder/blob/master/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go#L170-L266 [example-of-deploy-image-3]: https://github.com/kubernetes-sigs/kubebuilder/blob/master/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go#L77-L98 @@ -219,4 +219,4 @@ Alternatively, you can create a plugin bundle to include the target plugins. For [kubebuilder-machinery]: https://github.com/kubernetes-sigs/kubebuilder/blob/3bfc84ec8767fa760d1771ce7a0cb05a9a8f6286/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go#L28 [go-v3-settemplatedefault]: https://github.com/kubernetes-sigs/kubebuilder/blob/3bfc84ec8767fa760d1771ce7a0cb05a9a8f6286/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go#L40 [go-v3-scaffold-execute]: https://github.com/kubernetes-sigs/kubebuilder/blob/3bfc84ec8767fa760d1771ce7a0cb05a9a8f6286/pkg/plugins/golang/v3/scaffolds/init.go#L120 -[kubebuilder-machinery-pkg]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/machinery#section-documentation +[kubebuilder-machinery-pkg]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/machinery#section-documentation diff --git a/docs/book/src/plugins/extending-cli.md b/docs/book/src/plugins/extending-cli.md index 6bf7d5a396..3cf272dd8d 100644 --- a/docs/book/src/plugins/extending-cli.md +++ b/docs/book/src/plugins/extending-cli.md @@ -18,13 +18,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/cli" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" - deployimage "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1" - golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4" + "sigs.k8s.io/kubebuilder/v4/pkg/cli" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" + deployimage "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1" + golangv4 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4" ) @@ -198,15 +198,15 @@ kubebuider init --plugins=myplugin.example/v1 - And then, runs init `sub-command` of the plugin C [project-file-config]: ../reference/project-config.md -[plugin-interface]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Plugin -[go-dev-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3 -[plugin-sub-command]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Subcommand +[plugin-interface]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Plugin +[go-dev-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4 +[plugin-sub-command]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Subcommand [project-file]: ../reference/project-config.md -[plugin-subc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Subcommand +[plugin-subc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Subcommand [cobra]:https://pkg.go.dev/github.com/spf13/cobra -[kb-go-plugin]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3 -[bundle-plugin-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Bundle -[deprecate-plugin-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Deprecated -[plugin-update-meta]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#UpdatesMetadata -[cli]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/cli -[plugin-version-type]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin#Version +[kb-go-plugin]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v3 +[bundle-plugin-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Bundle +[deprecate-plugin-doc]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Deprecated +[plugin-update-meta]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#UpdatesMetadata +[cli]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/cli +[plugin-version-type]: https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin#Version diff --git a/docs/book/src/plugins/testing-plugins.md b/docs/book/src/plugins/testing-plugins.md index 32e2b1d3fc..d22028a8a9 100644 --- a/docs/book/src/plugins/testing-plugins.md +++ b/docs/book/src/plugins/testing-plugins.md @@ -7,12 +7,12 @@ You can test your plugin in two dimension: ## Write E2E Tests -You can check [Kubebuilder/v3/test/e2e/utils](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/test/e2e/utils) package that offers `TestContext` of rich methods: +You can check [Kubebuilder/v3/test/e2e/utils](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/test/e2e/utils) package that offers `TestContext` of rich methods: - [NewTestContext](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L51) helps define: - Temporary folder for testing projects - Temporary controller-manager image - - [Kubectl execution method](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/test/e2e/utils#Kubectl) + - [Kubectl execution method](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/test/e2e/utils#Kubectl) - The cli executable (`kubebuilder`, `operator-sdk`, OR your extended-cli) Once defined, you can use `TestContext` to: @@ -22,11 +22,11 @@ Once defined, you can use `TestContext` to: - Install prerequisites CRDs: See [InstallCertManager](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L138), [InstallPrometheusManager](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/test/e2e/utils/test_context.go#L171) 2. Validate the plugin behavior, e.g: - Trigger the plugin's bound subcommands. See [Init](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L213), [CreateAPI](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/test/e2e/utils/test_context.go#L222) - - Use [PluginUtil](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/pkg/plugin/util) to verify the scaffolded outputs. See [InsertCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/pkg/plugin/util/util.go#L67), [ReplaceInFile](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L196), [UncommendCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L86) + - Use [PluginUtil](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/pkg/plugin/util) to verify the scaffolded outputs. See [InsertCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/pkg/plugin/util/util.go#L67), [ReplaceInFile](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L196), [UncommendCode](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.6.0/pkg/plugin/util/util.go#L86) 3. Further make sure the scaffolded output works, e.g: - Execute commands in your `Makefile`. See [Make](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L240) - Temporary load image of the testing controller. See [LoadImageToKindCluster](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L283) - - Call Kubectl to validate running resources. See [utils.Kubectl](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v3/test/e2e/utils#Kubectl) + - Call Kubectl to validate running resources. See [utils.Kubectl](https://pkg.go.dev/sigs.k8s.io/kubebuilder/v4/test/e2e/utils#Kubectl) 4. Delete temporary resources after testing exited, e.g: - Uninstall prerequisites CRDs: See [UninstallPrometheusOperManager](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L183) - Delete temp dir. See [Destroy](https://github.com/kubernetes-sigs/kubebuilder/blob/v3.7.0/test/e2e/utils/test_context.go#L255) diff --git a/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.sum b/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.sum index 5f06e21806..db9b4cf19d 100644 --- a/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.sum +++ b/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.sum @@ -44,6 +44,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M= sigs.k8s.io/kubebuilder/v3 v3.14.2 h1:LMZW8Y5eItnP4kh9tpp4Gs2Gd5V3DgLgzbNnXfMAShY= sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/go.mod b/go.mod index a23973767e..fd8619915f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kubebuilder/v3 +module sigs.k8s.io/kubebuilder/v4 go 1.22 diff --git a/hack/docs/generate_samples.go b/hack/docs/generate_samples.go index 720a5b9f94..92d3aa2991 100644 --- a/hack/docs/generate_samples.go +++ b/hack/docs/generate_samples.go @@ -19,8 +19,8 @@ package main import ( log "github.com/sirupsen/logrus" - cronjob "sigs.k8s.io/kubebuilder/v3/hack/docs/internal/cronjob-tutorial" - gettingstarted "sigs.k8s.io/kubebuilder/v3/hack/docs/internal/getting-started" + cronjob "sigs.k8s.io/kubebuilder/v4/hack/docs/internal/cronjob-tutorial" + gettingstarted "sigs.k8s.io/kubebuilder/v4/hack/docs/internal/getting-started" ) // Make sure executing `build_kb` to generate kb executable from the source code diff --git a/hack/docs/internal/cronjob-tutorial/generate_cronjob.go b/hack/docs/internal/cronjob-tutorial/generate_cronjob.go index 3de1859c66..6889a64e92 100644 --- a/hack/docs/internal/cronjob-tutorial/generate_cronjob.go +++ b/hack/docs/internal/cronjob-tutorial/generate_cronjob.go @@ -24,8 +24,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) type Sample struct { diff --git a/hack/docs/internal/getting-started/generate_getting_started.go b/hack/docs/internal/getting-started/generate_getting_started.go index b78d9d36ca..48167e8c80 100644 --- a/hack/docs/internal/getting-started/generate_getting_started.go +++ b/hack/docs/internal/getting-started/generate_getting_started.go @@ -21,7 +21,7 @@ import ( "os/exec" log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) type Sample struct { diff --git a/pkg/cli/alpha.go b/pkg/cli/alpha.go index 7f4d1f1289..65147e4852 100644 --- a/pkg/cli/alpha.go +++ b/pkg/cli/alpha.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/cli/alpha" + "sigs.k8s.io/kubebuilder/v4/pkg/cli/alpha" ) const ( diff --git a/pkg/cli/alpha/generate.go b/pkg/cli/alpha/generate.go index d35a4219b1..48e991fbda 100644 --- a/pkg/cli/alpha/generate.go +++ b/pkg/cli/alpha/generate.go @@ -17,7 +17,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/rescaffold" + "sigs.k8s.io/kubebuilder/v4/pkg/rescaffold" ) // NewScaffoldCommand return a new scaffold command diff --git a/pkg/cli/api.go b/pkg/cli/api.go index 6d4f8a1796..2d43aeec17 100644 --- a/pkg/cli/api.go +++ b/pkg/cli/api.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const apiErrorMsg = "failed to create API" diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go index a5d08b4296..15602ca626 100644 --- a/pkg/cli/cli.go +++ b/pkg/cli/cli.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - yamlstore "sigs.k8s.io/kubebuilder/v3/pkg/config/store/yaml" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + yamlstore "sigs.k8s.io/kubebuilder/v4/pkg/config/store/yaml" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const ( diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go index ff886fa324..3fe5cfab34 100644 --- a/pkg/cli/cli_test.go +++ b/pkg/cli/cli_test.go @@ -27,12 +27,12 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - goPluginV4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + goPluginV4 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4" ) func makeMockPluginsFor(projectVersion config.Version, pluginKeys ...string) []plugin.Plugin { diff --git a/pkg/cli/cmd_helpers.go b/pkg/cli/cmd_helpers.go index cbcb1c7e90..a800806eb6 100644 --- a/pkg/cli/cmd_helpers.go +++ b/pkg/cli/cmd_helpers.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/config/store" - yamlstore "sigs.k8s.io/kubebuilder/v3/pkg/config/store/yaml" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config/store" + yamlstore "sigs.k8s.io/kubebuilder/v4/pkg/config/store/yaml" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) // noResolvedPluginError is returned by subcommands that require a plugin when none was resolved. diff --git a/pkg/cli/edit.go b/pkg/cli/edit.go index 8f86779041..b5a4b8ce70 100644 --- a/pkg/cli/edit.go +++ b/pkg/cli/edit.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const editErrorMsg = "failed to edit project" diff --git a/pkg/cli/init.go b/pkg/cli/init.go index 38837e5441..1ad2a67835 100644 --- a/pkg/cli/init.go +++ b/pkg/cli/init.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const initErrorMsg = "failed to initialize project" diff --git a/pkg/cli/options.go b/pkg/cli/options.go index 54222ea7b2..856744f0af 100644 --- a/pkg/cli/options.go +++ b/pkg/cli/options.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/external" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/external" ) var retrievePluginsRoot = getPluginsRoot diff --git a/pkg/cli/options_test.go b/pkg/cli/options_test.go index 562c562c02..994b759345 100644 --- a/pkg/cli/options_test.go +++ b/pkg/cli/options_test.go @@ -28,10 +28,10 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) var _ = Describe("Discover external plugins", func() { diff --git a/pkg/cli/resource.go b/pkg/cli/resource.go index e181fcc2d1..87973f2cbd 100644 --- a/pkg/cli/resource.go +++ b/pkg/cli/resource.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) const ( diff --git a/pkg/cli/resource_test.go b/pkg/cli/resource_test.go index 817da08173..f1d646ebde 100644 --- a/pkg/cli/resource_test.go +++ b/pkg/cli/resource_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var _ = Describe("resourceOptions", func() { diff --git a/pkg/cli/suite_test.go b/pkg/cli/suite_test.go index fa7289dec4..b25970be22 100644 --- a/pkg/cli/suite_test.go +++ b/pkg/cli/suite_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) func TestCLI(t *testing.T) { diff --git a/pkg/cli/webhook.go b/pkg/cli/webhook.go index bea5b0b17a..ad4ae80e46 100644 --- a/pkg/cli/webhook.go +++ b/pkg/cli/webhook.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const webhookErrorMsg = "failed to create webhook" diff --git a/pkg/config/errors.go b/pkg/config/errors.go index 4bbbd43da2..cede46cce1 100644 --- a/pkg/config/errors.go +++ b/pkg/config/errors.go @@ -19,7 +19,7 @@ package config import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // UnsupportedVersionError is returned by New when a project configuration version is not supported. diff --git a/pkg/config/errors_test.go b/pkg/config/errors_test.go index e77faaf1f0..5ec02ad257 100644 --- a/pkg/config/errors_test.go +++ b/pkg/config/errors_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var _ = Describe("UnsupportedVersionError", func() { diff --git a/pkg/config/interface.go b/pkg/config/interface.go index 8d14d8d3d3..9ce7da8ba2 100644 --- a/pkg/config/interface.go +++ b/pkg/config/interface.go @@ -17,7 +17,7 @@ limitations under the License. package config import ( - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // Config defines the interface that project configuration types must follow. diff --git a/pkg/config/store/interface.go b/pkg/config/store/interface.go index 8014bcaa24..f615d513e0 100644 --- a/pkg/config/store/interface.go +++ b/pkg/config/store/interface.go @@ -17,7 +17,7 @@ limitations under the License. package store import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) // Store represents a persistence backend for config.Config diff --git a/pkg/config/store/yaml/store.go b/pkg/config/store/yaml/store.go index 8f3531dc65..3f3bd766bd 100644 --- a/pkg/config/store/yaml/store.go +++ b/pkg/config/store/yaml/store.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/afero" "sigs.k8s.io/yaml" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/config/store" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config/store" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) const ( diff --git a/pkg/config/store/yaml/store_test.go b/pkg/config/store/yaml/store_test.go index 2f3cb6abaa..b939e17827 100644 --- a/pkg/config/store/yaml/store_test.go +++ b/pkg/config/store/yaml/store_test.go @@ -21,15 +21,15 @@ import ( "os" "testing" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/config/store" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config/store" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) func TestConfigStoreYaml(t *testing.T) { diff --git a/pkg/config/v3/config.go b/pkg/config/v3/config.go index 77c416a5a7..a3420bb3e6 100644 --- a/pkg/config/v3/config.go +++ b/pkg/config/v3/config.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // Version is the config.Version for project configuration 3 diff --git a/pkg/config/v3/config_test.go b/pkg/config/v3/config_test.go index 48528e80f3..e8fac688fd 100644 --- a/pkg/config/v3/config_test.go +++ b/pkg/config/v3/config_test.go @@ -24,8 +24,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) func TestConfigV3(t *testing.T) { diff --git a/pkg/config/version.go b/pkg/config/version.go index 9d6cd86ed6..d2f11c8e4b 100644 --- a/pkg/config/version.go +++ b/pkg/config/version.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) var ( diff --git a/pkg/config/version_test.go b/pkg/config/version_test.go index 0fcaad14a6..8b72f1bf1c 100644 --- a/pkg/config/version_test.go +++ b/pkg/config/version_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) var _ = Describe("Version", func() { diff --git a/pkg/machinery/injector.go b/pkg/machinery/injector.go index 9fedfa13fc..84593d6459 100644 --- a/pkg/machinery/injector.go +++ b/pkg/machinery/injector.go @@ -17,8 +17,8 @@ limitations under the License. package machinery import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // injector is used to inject certain fields to file templates. diff --git a/pkg/machinery/injector_test.go b/pkg/machinery/injector_test.go index 525fe26633..8296ceb769 100644 --- a/pkg/machinery/injector_test.go +++ b/pkg/machinery/injector_test.go @@ -20,9 +20,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) type templateBase struct { diff --git a/pkg/machinery/interfaces.go b/pkg/machinery/interfaces.go index 5659757980..4b83e219f7 100644 --- a/pkg/machinery/interfaces.go +++ b/pkg/machinery/interfaces.go @@ -19,7 +19,7 @@ package machinery import ( "text/template" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // Builder defines the basic methods that any file builder must implement diff --git a/pkg/machinery/mixins.go b/pkg/machinery/mixins.go index cd1339a2f4..0f14935288 100644 --- a/pkg/machinery/mixins.go +++ b/pkg/machinery/mixins.go @@ -17,7 +17,7 @@ limitations under the License. package machinery import ( - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // PathMixin provides file builders with a path field diff --git a/pkg/machinery/mixins_test.go b/pkg/machinery/mixins_test.go index eb4de6eab3..dda7bdcc10 100644 --- a/pkg/machinery/mixins_test.go +++ b/pkg/machinery/mixins_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) type mockTemplate struct { diff --git a/pkg/machinery/scaffold.go b/pkg/machinery/scaffold.go index ffc5ba1c2e..3c016033a7 100644 --- a/pkg/machinery/scaffold.go +++ b/pkg/machinery/scaffold.go @@ -28,8 +28,8 @@ import ( "github.com/spf13/afero" "golang.org/x/tools/imports" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) const ( diff --git a/pkg/machinery/scaffold_test.go b/pkg/machinery/scaffold_test.go index 6cf14ddebd..e32797bf7f 100644 --- a/pkg/machinery/scaffold_test.go +++ b/pkg/machinery/scaffold_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/gomega" "github.com/spf13/afero" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var _ = Describe("Scaffold", func() { diff --git a/pkg/model/resource/gvk.go b/pkg/model/resource/gvk.go index a17e7fd287..c673bc2f81 100644 --- a/pkg/model/resource/gvk.go +++ b/pkg/model/resource/gvk.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/internal/validation" + "sigs.k8s.io/kubebuilder/v4/pkg/internal/validation" ) const ( diff --git a/pkg/model/resource/resource.go b/pkg/model/resource/resource.go index b2b9504a20..7d4a9c4092 100644 --- a/pkg/model/resource/resource.go +++ b/pkg/model/resource/resource.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/internal/validation" + "sigs.k8s.io/kubebuilder/v4/pkg/internal/validation" ) // Resource contains the information required to scaffold files for a resource. diff --git a/pkg/plugin/bundle.go b/pkg/plugin/bundle.go index 493458a9fc..f5dd6fc6cc 100644 --- a/pkg/plugin/bundle.go +++ b/pkg/plugin/bundle.go @@ -19,7 +19,7 @@ package plugin import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) type bundle struct { diff --git a/pkg/plugin/bundle_test.go b/pkg/plugin/bundle_test.go index 1c3306b450..5f8ea14ce8 100644 --- a/pkg/plugin/bundle_test.go +++ b/pkg/plugin/bundle_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) var _ = Describe("Bundle", func() { diff --git a/pkg/plugin/external/types.go b/pkg/plugin/external/types.go index e9ac27d746..914ab054d6 100644 --- a/pkg/plugin/external/types.go +++ b/pkg/plugin/external/types.go @@ -16,7 +16,7 @@ limitations under the License. package external -import "sigs.k8s.io/kubebuilder/v3/pkg/plugin" +import "sigs.k8s.io/kubebuilder/v4/pkg/plugin" // PluginRequest contains all information kubebuilder received from the CLI // and plugins executed before it. diff --git a/pkg/plugin/filter.go b/pkg/plugin/filter.go index 041c5e1c6b..d678b081ec 100644 --- a/pkg/plugin/filter.go +++ b/pkg/plugin/filter.go @@ -19,7 +19,7 @@ package plugin import ( "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) // FilterPluginsByKey returns the set of plugins that match the provided key (may be not-fully qualified) diff --git a/pkg/plugin/filter_test.go b/pkg/plugin/filter_test.go index 626de97773..555a35d3c9 100644 --- a/pkg/plugin/filter_test.go +++ b/pkg/plugin/filter_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) var ( diff --git a/pkg/plugin/helpers.go b/pkg/plugin/helpers.go index 11e2fe4519..4898358c7b 100644 --- a/pkg/plugin/helpers.go +++ b/pkg/plugin/helpers.go @@ -22,8 +22,8 @@ import ( "sort" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/internal/validation" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/internal/validation" ) // KeyFor returns a Plugin's unique identifying string. diff --git a/pkg/plugin/helpers_test.go b/pkg/plugin/helpers_test.go index 981265231a..b3541ed6d8 100644 --- a/pkg/plugin/helpers_test.go +++ b/pkg/plugin/helpers_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) const ( diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go index 564c238b34..0a22ac0cf0 100644 --- a/pkg/plugin/plugin.go +++ b/pkg/plugin/plugin.go @@ -17,7 +17,7 @@ limitations under the License. package plugin import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) // Plugin is an interface that defines the common base for all plugins. diff --git a/pkg/plugin/subcommand.go b/pkg/plugin/subcommand.go index 30985f3dd8..acf5f0d455 100644 --- a/pkg/plugin/subcommand.go +++ b/pkg/plugin/subcommand.go @@ -19,9 +19,9 @@ package plugin import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) // UpdatesMetadata is an interface that implements the optional metadata update method. diff --git a/pkg/plugin/suite_test.go b/pkg/plugin/suite_test.go index 0938ede0fa..28c51857fb 100644 --- a/pkg/plugin/suite_test.go +++ b/pkg/plugin/suite_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) func TestPlugin(t *testing.T) { diff --git a/pkg/plugin/version.go b/pkg/plugin/version.go index 8f8a4bed43..fb4c0e8349 100644 --- a/pkg/plugin/version.go +++ b/pkg/plugin/version.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) var ( diff --git a/pkg/plugin/version_test.go b/pkg/plugin/version_test.go index 771c766034..1fe8ff9073 100644 --- a/pkg/plugin/version_test.go +++ b/pkg/plugin/version_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" ) var _ = Describe("Version", func() { diff --git a/pkg/plugins/common/kustomize/v2/api.go b/pkg/plugins/common/kustomize/v2/api.go index 98059f0ae3..5ca0ca6197 100644 --- a/pkg/plugins/common/kustomize/v2/api.go +++ b/pkg/plugins/common/kustomize/v2/api.go @@ -17,9 +17,9 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds" ) var _ plugin.CreateAPISubcommand = &createAPISubcommand{} diff --git a/pkg/plugins/common/kustomize/v2/create.go b/pkg/plugins/common/kustomize/v2/create.go index a0aac27649..cc96b4d862 100644 --- a/pkg/plugins/common/kustomize/v2/create.go +++ b/pkg/plugins/common/kustomize/v2/create.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) type createSubcommand struct { diff --git a/pkg/plugins/common/kustomize/v2/init.go b/pkg/plugins/common/kustomize/v2/init.go index 297fb36e37..9f67953e00 100644 --- a/pkg/plugins/common/kustomize/v2/init.go +++ b/pkg/plugins/common/kustomize/v2/init.go @@ -24,11 +24,11 @@ import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/internal/validation" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/internal/validation" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds" ) var _ plugin.InitSubcommand = &initSubcommand{} diff --git a/pkg/plugins/common/kustomize/v2/plugin.go b/pkg/plugins/common/kustomize/v2/plugin.go index 9f709fb088..001c92c2f4 100644 --- a/pkg/plugins/common/kustomize/v2/plugin.go +++ b/pkg/plugins/common/kustomize/v2/plugin.go @@ -17,11 +17,11 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" ) // KustomizeVersion is the kubernetes-sigs/kustomize version to be used in the project diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/api.go b/pkg/plugins/common/kustomize/v2/scaffolds/api.go index 57cd089a05..e0b4b64749 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/api.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/api.go @@ -20,16 +20,16 @@ import ( "fmt" "strings" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd" log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples" ) var _ plugins.Scaffolder = &apiScaffolder{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/init.go b/pkg/plugins/common/kustomize/v2/scaffolds/init.go index c7c6bbb7db..b3a5c1a72f 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/init.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/init.go @@ -19,13 +19,13 @@ package scaffolds import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac" ) const ( diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate.go index 6a53763133..04bf0cdd12 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Certificate{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomization.go index 2e31a62d4a..446a694b8e 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomization.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go index 981fe79c2e..974303b819 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &KustomizeConfig{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go index badbb55cd4..b77d2137b9 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var ( diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go index c5006e2b10..00376b0be1 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &KustomizeConfig{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go index 526f17da52..0ef72c5004 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go @@ -19,7 +19,7 @@ package patches import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &EnableCAInjectionPatch{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go index 28452cc968..3bb955e53d 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go @@ -19,7 +19,7 @@ package patches import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &EnableWebhookPatch{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enable_matrics_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enable_matrics_patch.go index 56caa76980..768950bbf0 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enable_matrics_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enable_matrics_patch.go @@ -19,7 +19,7 @@ package kdefault import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ManagerMetricsPatch{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go index 8420149f34..b327b2de2c 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go @@ -19,7 +19,7 @@ package kdefault import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &WebhookCAInjectionPatch{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go index d85781b75d..99cf94f958 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go @@ -19,7 +19,7 @@ package kdefault import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go index 7f993dbd31..61ff789108 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go @@ -19,7 +19,7 @@ package kdefault import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ManagerWebhookPatch{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go index d010423e58..000c3901a2 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Config{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/kustomization.go index dcc5157905..1331da9011 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/kustomization.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/kustomization.go index 76bf6e1c5e..65547bdf41 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/kustomization.go @@ -19,7 +19,7 @@ package prometheus import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go index dbae8fdfb8..d53b0b18a5 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go @@ -19,7 +19,7 @@ package prometheus import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Monitor{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go index e1fc2b9ed4..c7668c821b 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &CRDEditorRole{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go index 505e5ea4b9..18d3f0a578 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &CRDViewerRole{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/kustomization.go index b2ce8b8ebc..92859d83b8 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/kustomization.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role.go index 059c900c4c..df0fc5cb73 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &LeaderElectionRole{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go index 8a080f95a4..374377f1a7 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &LeaderElectionRoleBinding{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/metrics_service.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/metrics_service.go index 8ab5b4d6c3..7a0619cf6a 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/metrics_service.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/metrics_service.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &MetricsService{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role.go index 1a80d1db5a..e48a1ef56b 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Role{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role_binding.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role_binding.go index 5dd937b7eb..aae5b22db7 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role_binding.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role_binding.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &RoleBinding{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go index 19373ba97c..d65487db3e 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go @@ -19,7 +19,7 @@ package rbac import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ServiceAccount{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go index 1c3b53d756..89150f8cd4 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go @@ -19,7 +19,7 @@ package samples import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &CRDSample{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go index 9b0f528d5a..f5b19b307e 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var ( diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go index 3f55f70a12..2904854410 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Kustomization{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go index 167fa852e3..625dc1aa63 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &KustomizeConfig{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go index 1b96404a00..1c085dc737 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Service{} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go b/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go index 976a2c7018..e451b7b909 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go @@ -20,17 +20,17 @@ import ( "fmt" log "github.com/sirupsen/logrus" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches" - - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches" + + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook" ) var _ plugins.Scaffolder = &webhookScaffolder{} diff --git a/pkg/plugins/common/kustomize/v2/webhook.go b/pkg/plugins/common/kustomize/v2/webhook.go index d7964b2c08..21e35177d7 100644 --- a/pkg/plugins/common/kustomize/v2/webhook.go +++ b/pkg/plugins/common/kustomize/v2/webhook.go @@ -17,9 +17,9 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds" ) var _ plugin.CreateWebhookSubcommand = &createWebhookSubcommand{} diff --git a/pkg/plugins/external/api.go b/pkg/plugins/external/api.go index bff39f6741..4a06c8044e 100644 --- a/pkg/plugins/external/api.go +++ b/pkg/plugins/external/api.go @@ -19,10 +19,10 @@ package external import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) var _ plugin.CreateAPISubcommand = &createAPISubcommand{} diff --git a/pkg/plugins/external/edit.go b/pkg/plugins/external/edit.go index b048bbd550..0cb7a9ee5b 100644 --- a/pkg/plugins/external/edit.go +++ b/pkg/plugins/external/edit.go @@ -19,9 +19,9 @@ package external import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) var _ plugin.EditSubcommand = &editSubcommand{} diff --git a/pkg/plugins/external/external_test.go b/pkg/plugins/external/external_test.go index 8941a2b19c..327e338900 100644 --- a/pkg/plugins/external/external_test.go +++ b/pkg/plugins/external/external_test.go @@ -28,9 +28,9 @@ import ( "github.com/spf13/afero" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) func TestExternalPlugin(t *testing.T) { diff --git a/pkg/plugins/external/helpers.go b/pkg/plugins/external/helpers.go index a1bc759317..abf7489aa9 100644 --- a/pkg/plugins/external/helpers.go +++ b/pkg/plugins/external/helpers.go @@ -30,9 +30,9 @@ import ( "github.com/spf13/afero" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) var outputGetter ExecOutputGetter = &execOutputGetter{} diff --git a/pkg/plugins/external/init.go b/pkg/plugins/external/init.go index 221eef95ea..176b9b044e 100644 --- a/pkg/plugins/external/init.go +++ b/pkg/plugins/external/init.go @@ -19,9 +19,9 @@ package external import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) var _ plugin.InitSubcommand = &initSubcommand{} diff --git a/pkg/plugins/external/plugin.go b/pkg/plugins/external/plugin.go index 8b94b70d56..6a1bd1646d 100644 --- a/pkg/plugins/external/plugin.go +++ b/pkg/plugins/external/plugin.go @@ -17,8 +17,8 @@ limitations under the License. package external import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) var _ plugin.Full = Plugin{} diff --git a/pkg/plugins/external/webhook.go b/pkg/plugins/external/webhook.go index af49ee0664..259d42822e 100644 --- a/pkg/plugins/external/webhook.go +++ b/pkg/plugins/external/webhook.go @@ -19,10 +19,10 @@ package external import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/external" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/external" ) var _ plugin.CreateWebhookSubcommand = &createWebhookSubcommand{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/api.go b/pkg/plugins/golang/deploy-image/v1alpha1/api.go index fd96a860ee..eacd1da38c 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/api.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/api.go @@ -25,13 +25,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - goPlugin "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + goPlugin "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds" ) var _ plugin.CreateAPISubcommand = &createAPISubcommand{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/plugin.go b/pkg/plugins/golang/deploy-image/v1alpha1/plugin.go index 8356de8335..55047cae02 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/plugin.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/plugin.go @@ -17,11 +17,11 @@ limitations under the License. package v1alpha1 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" ) const pluginName = "deploy-image." + golang.DefaultNameQualifier diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go index ca4fc870f9..f9a8eeb17f 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go @@ -24,16 +24,16 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - kustomizev2scaffolds "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers" - golangv4scaffolds "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + kustomizev2scaffolds "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers" + golangv4scaffolds "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds" ) var _ plugins.Scaffolder = &apiScaffolder{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go index cb966bc037..2da620073e 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Types{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go index 397a2fed18..030b52c8a2 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go @@ -18,7 +18,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &CRDSample{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go index f5d45c4e28..e6b50239da 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ControllerTest{} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go index 7f927384fd..6ddaeeb1d5 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Controller{} diff --git a/pkg/plugins/golang/domain.go b/pkg/plugins/golang/domain.go index 0922608560..048b07cb36 100644 --- a/pkg/plugins/golang/domain.go +++ b/pkg/plugins/golang/domain.go @@ -16,7 +16,7 @@ limitations under the License. package golang -import "sigs.k8s.io/kubebuilder/v3/pkg/plugins" +import "sigs.k8s.io/kubebuilder/v4/pkg/plugins" // DefaultNameQualifier is the suffix appended to all kubebuilder plugin names for Golang operators. const DefaultNameQualifier = "go." + plugins.DefaultNameQualifier diff --git a/pkg/plugins/golang/options.go b/pkg/plugins/golang/options.go index f3cc87cce4..865f613794 100644 --- a/pkg/plugins/golang/options.go +++ b/pkg/plugins/golang/options.go @@ -19,8 +19,8 @@ package golang import ( "path" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var ( diff --git a/pkg/plugins/golang/options_test.go b/pkg/plugins/golang/options_test.go index 09ba607668..f77b93560d 100644 --- a/pkg/plugins/golang/options_test.go +++ b/pkg/plugins/golang/options_test.go @@ -22,9 +22,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var _ = Describe("Options", func() { diff --git a/pkg/plugins/golang/v4/api.go b/pkg/plugins/golang/v4/api.go index 6ca63051d2..3f0f27958d 100644 --- a/pkg/plugins/golang/v4/api.go +++ b/pkg/plugins/golang/v4/api.go @@ -25,13 +25,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - goPlugin "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + goPlugin "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds" ) // DefaultMainPath is default file path of main.go diff --git a/pkg/plugins/golang/v4/edit.go b/pkg/plugins/golang/v4/edit.go index 438c016815..a53c12b161 100644 --- a/pkg/plugins/golang/v4/edit.go +++ b/pkg/plugins/golang/v4/edit.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds" ) var _ plugin.EditSubcommand = &editSubcommand{} diff --git a/pkg/plugins/golang/v4/init.go b/pkg/plugins/golang/v4/init.go index 564ffdc528..26de76c523 100644 --- a/pkg/plugins/golang/v4/init.go +++ b/pkg/plugins/golang/v4/init.go @@ -26,12 +26,12 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds" ) // Variables and function to check Go version requirements. diff --git a/pkg/plugins/golang/v4/plugin.go b/pkg/plugins/golang/v4/plugin.go index 704912cf33..fdc341f277 100644 --- a/pkg/plugins/golang/v4/plugin.go +++ b/pkg/plugins/golang/v4/plugin.go @@ -17,11 +17,11 @@ limitations under the License. package v4 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" ) const pluginName = "base." + golang.DefaultNameQualifier diff --git a/pkg/plugins/golang/v4/scaffolds/api.go b/pkg/plugins/golang/v4/scaffolds/api.go index 7e65326d8e..58dd0dde53 100755 --- a/pkg/plugins/golang/v4/scaffolds/api.go +++ b/pkg/plugins/golang/v4/scaffolds/api.go @@ -23,14 +23,14 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/api" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/api" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" ) var _ plugins.Scaffolder = &apiScaffolder{} diff --git a/pkg/plugins/golang/v4/scaffolds/edit.go b/pkg/plugins/golang/v4/scaffolds/edit.go index 2d2ab1c563..17d015393d 100644 --- a/pkg/plugins/golang/v4/scaffolds/edit.go +++ b/pkg/plugins/golang/v4/scaffolds/edit.go @@ -19,9 +19,9 @@ package scaffolds import ( "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" ) var _ plugins.Scaffolder = &editScaffolder{} diff --git a/pkg/plugins/golang/v4/scaffolds/init.go b/pkg/plugins/golang/v4/scaffolds/init.go index 21a7000b52..8fa8c86d3b 100644 --- a/pkg/plugins/golang/v4/scaffolds/init.go +++ b/pkg/plugins/golang/v4/scaffolds/init.go @@ -22,15 +22,15 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils" ) const ( diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/group.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/group.go index 4e692b7055..716e52d755 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/group.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/group.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Group{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go index 55961e2b53..b417232a35 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Types{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook.go index 6bcbab2436..54778afa77 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook.go @@ -22,7 +22,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Webhook{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go index e603921235..ced8d7ae5d 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go @@ -22,7 +22,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &WebhookSuite{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go index 9a23081f9e..d3123b1d82 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go @@ -23,7 +23,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &WebhookTest{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go index 3842da93b6..fc117c8148 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Controller{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go index 462989cf6b..cafb287a0e 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go @@ -22,7 +22,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &SuiteTest{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go index abe04cffb8..2ff84220a3 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ControllerTest{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go index 8b4ce99476..ceb4876051 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Dockerfile{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go index dbdb8172d7..04d541e3f2 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &DockerIgnore{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go index a2d7ad8c78..7080926deb 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &GitIgnore{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go index 7696421806..a7a01a45f5 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Golangci{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go index 402633e850..28d40f4f5f 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &GoMod{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/hack/boilerplate.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/hack/boilerplate.go index 15584e7753..24469331f5 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/hack/boilerplate.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/hack/boilerplate.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) // DefaultBoilerplatePath is the default path to the boilerplate file diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go index 9da4fdea4f..000cfc623c 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) const defaultMainPath = "cmd/main.go" diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go index 7a475e7216..9b5e4858b9 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Makefile{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go index 72ce25d8e8..ab8c88ebaf 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Readme{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go index 5dfe394be1..6d3915ff41 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go @@ -17,7 +17,7 @@ limitations under the License. package e2e import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &SuiteTest{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go index 54f4b148db..d6de3ed830 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go @@ -17,7 +17,7 @@ limitations under the License. package e2e import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &SuiteTest{} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go index b19f086218..e979a50428 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go @@ -17,7 +17,7 @@ limitations under the License. package utils import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Utils{} diff --git a/pkg/plugins/golang/v4/scaffolds/webhook.go b/pkg/plugins/golang/v4/scaffolds/webhook.go index ab853d8f55..8b46a17e61 100644 --- a/pkg/plugins/golang/v4/scaffolds/webhook.go +++ b/pkg/plugins/golang/v4/scaffolds/webhook.go @@ -22,13 +22,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/api" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/api" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack" ) var _ plugins.Scaffolder = &webhookScaffolder{} diff --git a/pkg/plugins/golang/v4/webhook.go b/pkg/plugins/golang/v4/webhook.go index c12c6248d1..9fe89cb334 100644 --- a/pkg/plugins/golang/v4/webhook.go +++ b/pkg/plugins/golang/v4/webhook.go @@ -21,13 +21,13 @@ import ( "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - goPlugin "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + goPlugin "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds" ) var _ plugin.CreateWebhookSubcommand = &createWebhookSubcommand{} diff --git a/pkg/plugins/optional/grafana/v1alpha/commons.go b/pkg/plugins/optional/grafana/v1alpha/commons.go index a372a94e98..27f8bc0d35 100644 --- a/pkg/plugins/optional/grafana/v1alpha/commons.go +++ b/pkg/plugins/optional/grafana/v1alpha/commons.go @@ -19,7 +19,7 @@ package v1alpha import ( "errors" - "sigs.k8s.io/kubebuilder/v3/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config" ) func InsertPluginMetaToConfig(target config.Config, cfg pluginConfig) error { diff --git a/pkg/plugins/optional/grafana/v1alpha/edit.go b/pkg/plugins/optional/grafana/v1alpha/edit.go index 2205e8df9f..e49513ede6 100644 --- a/pkg/plugins/optional/grafana/v1alpha/edit.go +++ b/pkg/plugins/optional/grafana/v1alpha/edit.go @@ -19,10 +19,10 @@ package v1alpha import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/optional/grafana/v1alpha/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha/scaffolds" ) var _ plugin.EditSubcommand = &editSubcommand{} diff --git a/pkg/plugins/optional/grafana/v1alpha/init.go b/pkg/plugins/optional/grafana/v1alpha/init.go index b824bfcb22..2df721a953 100644 --- a/pkg/plugins/optional/grafana/v1alpha/init.go +++ b/pkg/plugins/optional/grafana/v1alpha/init.go @@ -19,10 +19,10 @@ package v1alpha import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/optional/grafana/v1alpha/scaffolds" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha/scaffolds" ) var _ plugin.InitSubcommand = &initSubcommand{} diff --git a/pkg/plugins/optional/grafana/v1alpha/plugin.go b/pkg/plugins/optional/grafana/v1alpha/plugin.go index 3f386dba4b..f3d8c1f322 100644 --- a/pkg/plugins/optional/grafana/v1alpha/plugin.go +++ b/pkg/plugins/optional/grafana/v1alpha/plugin.go @@ -17,11 +17,11 @@ limitations under the License. package v1alpha import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" ) const pluginName = "grafana." + plugins.DefaultNameQualifier diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go index 0773fa1e03..670850486d 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go @@ -24,9 +24,9 @@ import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates" "sigs.k8s.io/yaml" ) diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/init.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/init.go index 07eeacea94..7c220a578b 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/init.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/init.go @@ -19,9 +19,9 @@ package scaffolds import ( log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates" ) var _ plugins.Scaffolder = &initScaffolder{} diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go index 2e4e0810ec..1dfe4af97e 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go @@ -17,7 +17,7 @@ limitations under the License. package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &CustomMetricsConfigManifest{} diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go index 2a1d532dd2..711946ea73 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go @@ -23,7 +23,7 @@ import ( "strings" "text/template" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) type CustomMetricsConfig struct { diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go index fa19c5de26..8bd61f2bb6 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go @@ -19,7 +19,7 @@ package templates import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &ResourcesManifest{} diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go index 01c2e856fe..f5b1ca4646 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go @@ -19,7 +19,7 @@ package templates import ( "path/filepath" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &RuntimeManifest{} diff --git a/pkg/plugins/scaffolder.go b/pkg/plugins/scaffolder.go index b738caa999..76ba282379 100644 --- a/pkg/plugins/scaffolder.go +++ b/pkg/plugins/scaffolder.go @@ -17,7 +17,7 @@ limitations under the License. package plugins import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) // Scaffolder interface creates files to set up a controller manager diff --git a/pkg/rescaffold/migrate.go b/pkg/rescaffold/migrate.go index af2c4eaa67..f277bced5d 100644 --- a/pkg/rescaffold/migrate.go +++ b/pkg/rescaffold/migrate.go @@ -23,13 +23,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/afero" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/config/store" - "sigs.k8s.io/kubebuilder/v3/pkg/config/store/yaml" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/config/store" + "sigs.k8s.io/kubebuilder/v4/pkg/config/store/yaml" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1" ) type MigrateOptions struct { diff --git a/test/e2e/alphagenerate/generate_test.go b/test/e2e/alphagenerate/generate_test.go index 5745cdad17..30379d84b0 100644 --- a/test/e2e/alphagenerate/generate_test.go +++ b/test/e2e/alphagenerate/generate_test.go @@ -22,12 +22,12 @@ import ( "os" "path/filepath" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { diff --git a/test/e2e/deployimage/plugin_cluster_test.go b/test/e2e/deployimage/plugin_cluster_test.go index 03ef702319..5bf57af8cd 100644 --- a/test/e2e/deployimage/plugin_cluster_test.go +++ b/test/e2e/deployimage/plugin_cluster_test.go @@ -24,12 +24,12 @@ import ( "strings" "time" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { diff --git a/test/e2e/externalplugin/generate_test.go b/test/e2e/externalplugin/generate_test.go index 17bbd66b25..092e855bfb 100644 --- a/test/e2e/externalplugin/generate_test.go +++ b/test/e2e/externalplugin/generate_test.go @@ -19,7 +19,7 @@ package externalplugin import ( "path/filepath" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -28,7 +28,7 @@ import ( // nolint:revive //nolint:golint // nolint:revive - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { diff --git a/test/e2e/grafana/generate_test.go b/test/e2e/grafana/generate_test.go index a2b762a221..39ee429c1a 100644 --- a/test/e2e/grafana/generate_test.go +++ b/test/e2e/grafana/generate_test.go @@ -19,13 +19,13 @@ package grafana import ( "path/filepath" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go index 5bea28a3b7..012a4e5af3 100644 --- a/test/e2e/utils/test_context.go +++ b/test/e2e/utils/test_context.go @@ -25,7 +25,7 @@ import ( "strings" log "github.com/sirupsen/logrus" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" ) diff --git a/test/e2e/v4/e2e_suite_test.go b/test/e2e/v4/e2e_suite_test.go index 91f0e02636..9db4f11f32 100644 --- a/test/e2e/v4/e2e_suite_test.go +++ b/test/e2e/v4/e2e_suite_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/v4/generate_test.go b/test/e2e/v4/generate_test.go index 544b672624..6e425bad7c 100644 --- a/test/e2e/v4/generate_test.go +++ b/test/e2e/v4/generate_test.go @@ -24,13 +24,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" //nolint:golint // nolint:revive //nolint:golint // nolint:revive - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) // GenerateV4 implements a go/v4 plugin project defined by a TestContext. diff --git a/test/e2e/v4/plugin_cluster_test.go b/test/e2e/v4/plugin_cluster_test.go index b8f1ae4c64..6c3fcddda1 100644 --- a/test/e2e/v4/plugin_cluster_test.go +++ b/test/e2e/v4/plugin_cluster_test.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) var _ = Describe("kubebuilder", func() {