Skip to content

Commit 02c686c

Browse files
vitorflorianovitorfloriano
committed
fix(API): move autoupdate/deploy-image/helm plugins to internal
The autoupdate, deploy-image and helm optional plugins are only meant for CLI users. Their packages are not meant for external usage but have been exported to the public API of the SDK. Considering that they are underdocumented and not stable, they need to be moved to internal.
1 parent 5475df7 commit 02c686c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+31
-31
lines changed

‎internal/cli/alpha/internal/generate.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ import (
2525
"strings"
2626

2727
"sigs.k8s.io/kubebuilder/v4/internal/cli/alpha/internal/common"
28+
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/autoupdate/v1alpha"
29+
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/deploy-image/v1alpha1"
30+
helmv1alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/helm/v1alpha"
31+
helmv2alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/helm/v2alpha"
2832
"sigs.k8s.io/kubebuilder/v4/pkg/config"
2933
"sigs.k8s.io/kubebuilder/v4/pkg/config/store"
3034
"sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
3135
"sigs.k8s.io/kubebuilder/v4/pkg/plugin"
3236
"sigs.k8s.io/kubebuilder/v4/pkg/plugin/util"
33-
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1"
34-
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/autoupdate/v1alpha"
3537
grafanav1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha"
36-
helmv1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/helm/v1alpha"
37-
helmv2alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/helm/v2alpha"
3838
)
3939

4040
// Generate store the required info for the command

‎internal/cli/alpha/internal/generate_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525

26+
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/autoupdate/v1alpha"
27+
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/deploy-image/v1alpha1"
2628
"sigs.k8s.io/kubebuilder/v4/pkg/config"
2729
"sigs.k8s.io/kubebuilder/v4/pkg/config/store"
2830
"sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
29-
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1"
30-
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/autoupdate/v1alpha"
3131
"sigs.k8s.io/kubebuilder/v4/test/e2e/utils"
3232
)
3333

‎internal/cli/cmd/cmd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424

2525
"sigs.k8s.io/kubebuilder/v4/internal/cli/version"
2626
"sigs.k8s.io/kubebuilder/v4/internal/logging"
27+
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/autoupdate/v1alpha"
28+
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/deploy-image/v1alpha1"
29+
helmv1alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/helm/v1alpha"
30+
helmv2alpha "sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/helm/v2alpha"
2731
"sigs.k8s.io/kubebuilder/v4/pkg/cli"
2832
cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3"
2933
"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
3034
"sigs.k8s.io/kubebuilder/v4/pkg/plugin"
3135
kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2"
3236
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang"
33-
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1"
3437
golangv4 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4"
35-
autoupdatev1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/autoupdate/v1alpha"
3638
grafanav1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha"
37-
helmv1alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/helm/v1alpha"
38-
helmv2alpha "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/helm/v2alpha"
3939
)
4040

4141
// Run bootstraps & runs the CLI

pkg/plugins/optional/autoupdate/v1alpha/edit.go renamed to internal/plugins/optional/autoupdate/v1alpha/edit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
"github.com/spf13/pflag"
2424

25+
"sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/autoupdate/v1alpha/scaffolds"
2526
"sigs.k8s.io/kubebuilder/v4/pkg/config"
2627
"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
2728
"sigs.k8s.io/kubebuilder/v4/pkg/plugin"
28-
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/autoupdate/v1alpha/scaffolds"
2929
)
3030

3131
var _ plugin.EditSubcommand = &editSubcommand{}

pkg/plugins/optional/autoupdate/v1alpha/edit_test.go renamed to internal/plugins/optional/autoupdate/v1alpha/edit_test.go

File renamed without changes.

pkg/plugins/optional/autoupdate/v1alpha/init.go renamed to internal/plugins/optional/autoupdate/v1alpha/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
"github.com/spf13/pflag"
2424

25+
"sigs.k8s.io/kubebuilder/v4/internal/plugins/optional/autoupdate/v1alpha/scaffolds"
2526
"sigs.k8s.io/kubebuilder/v4/pkg/config"
2627
"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
2728
"sigs.k8s.io/kubebuilder/v4/pkg/plugin"
28-
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/autoupdate/v1alpha/scaffolds"
2929
)
3030

3131
var _ plugin.InitSubcommand = &initSubcommand{}

pkg/plugins/optional/autoupdate/v1alpha/plugin.go renamed to internal/plugins/optional/autoupdate/v1alpha/plugin.go

File renamed without changes.

pkg/plugins/optional/autoupdate/v1alpha/plugin_test.go renamed to internal/plugins/optional/autoupdate/v1alpha/plugin_test.go

File renamed without changes.

pkg/plugins/optional/autoupdate/v1alpha/scaffolds/init.go renamed to internal/plugins/optional/autoupdate/v1alpha/scaffolds/init.go

File renamed without changes.

pkg/plugins/optional/autoupdate/v1alpha/scaffolds/internal/github/auto_update.go renamed to internal/plugins/optional/autoupdate/v1alpha/scaffolds/internal/github/auto_update.go

File renamed without changes.

0 commit comments

Comments
 (0)