Skip to content

Commit 022fe5b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1822 from Adirio/plugins
⚠ Re-organize pkg/plugin directory
2 parents cd3cb2a + 34af697 commit 022fe5b

File tree

121 files changed

+80
-84
lines changed

Some content is hidden

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

121 files changed

+80
-84
lines changed

‎cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"log"
2121

2222
"sigs.k8s.io/kubebuilder/v2/pkg/cli"
23-
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2"
24-
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3"
23+
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2"
24+
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3"
2525
)
2626

2727
func main() {

‎pkg/plugin/helpers.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ import (
2424
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
2525
)
2626

27-
// DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
28-
const DefaultNameQualifier = ".kubebuilder.io"
29-
3027
// Key returns a unique identifying string for a plugin's name and version.
3128
func Key(name, version string) string {
3229
if version == "" {

‎pkg/plugin/scaffold/interface.go‎ renamed to ‎pkg/plugins/domain.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package scaffold
17+
package plugins
1818

19-
// Scaffolder interface creates files to set up a controller manager
20-
type Scaffolder interface {
21-
// Scaffold performs the scaffolding
22-
Scaffold() error
23-
}
19+
// DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
20+
const DefaultNameQualifier = ".kubebuilder.io"

‎pkg/plugin/v2/api.go‎ renamed to ‎pkg/plugins/golang/v2/api.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
3232
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
3333
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
34-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
35-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
36-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
34+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
35+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
36+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
3737
"sigs.k8s.io/kubebuilder/v2/plugins/addon"
3838
)
3939

‎pkg/plugin/v2/edit.go‎ renamed to ‎pkg/plugins/golang/v2/edit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
2525
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
26-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
27-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
26+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
27+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
2828
)
2929

3030
type editSubcommand struct {

‎pkg/plugin/v2/init.go‎ renamed to ‎pkg/plugins/golang/v2/init.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
2828
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
2929
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
30-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
31-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
32-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
30+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
31+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
32+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
3333
)
3434

3535
type initSubcommand struct {

‎pkg/plugin/v2/plugin.go‎ renamed to ‎pkg/plugins/golang/v2/plugin.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ package v2
1919
import (
2020
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
2121
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
22+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins"
2223
)
2324

24-
const pluginName = "go" + plugin.DefaultNameQualifier
25+
const pluginName = "go" + plugins.DefaultNameQualifier
2526

2627
var (
2728
supportedProjectVersions = []string{config.Version2, config.Version3Alpha}

‎pkg/plugin/v2/scaffolds/api.go‎ renamed to ‎pkg/plugins/golang/v2/scaffolds/api.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import (
2222
"sigs.k8s.io/kubebuilder/v2/pkg/model"
2323
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
2424
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
26-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
27-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates"
28-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/api"
29-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd"
30-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd/patches"
31-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
32-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/samples"
33-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/controllers"
25+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates"
26+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/api"
27+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd"
28+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/patches"
29+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/rbac"
30+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/samples"
31+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers"
32+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
33+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
3434
)
3535

3636
// KbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version

‎pkg/plugin/v2/scaffolds/doc.go‎ renamed to ‎pkg/plugins/golang/v2/scaffolds/doc.go‎

File renamed without changes.

‎pkg/plugin/v2/scaffolds/edit.go‎ renamed to ‎pkg/plugins/golang/v2/scaffolds/edit.go‎

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

2424
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
25+
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
2626
)
2727

2828
var _ cmdutil.Scaffolder = &editScaffolder{}

0 commit comments

Comments
 (0)