Skip to content

Commit 5da27b8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2007 from camilamacedo86/v2intorelease-2
:seeding: rebase v2 into release-2
2 parents 8b53abe + 1c598b4 commit 5da27b8

File tree

249 files changed

+308
-305
lines changed

Some content is hidden

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

249 files changed

+308
-305
lines changed

‎build/.goreleaser.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
builds:
1818
- main: ./cmd
1919
binary: kubebuilder
20-
ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
20+
ldflags: -s -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
2121
goos:
2222
- darwin
2323
- linux

‎cmd/api.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"github.com/spf13/cobra"
3030
flag "github.com/spf13/pflag"
3131

32-
"sigs.k8s.io/kubebuilder/cmd/internal"
33-
"sigs.k8s.io/kubebuilder/internal/config"
34-
"sigs.k8s.io/kubebuilder/pkg/model"
35-
"sigs.k8s.io/kubebuilder/pkg/model/resource"
36-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
37-
"sigs.k8s.io/kubebuilder/plugins/addon"
32+
"sigs.k8s.io/kubebuilder/v2/cmd/internal"
33+
"sigs.k8s.io/kubebuilder/v2/internal/config"
34+
"sigs.k8s.io/kubebuilder/v2/pkg/model"
35+
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
36+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
37+
"sigs.k8s.io/kubebuilder/v2/plugins/addon"
3838
)
3939

4040
type apiError struct {

‎cmd/edit.go‎

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

2525
"github.com/spf13/cobra"
2626

27-
"sigs.k8s.io/kubebuilder/internal/config"
28-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
27+
"sigs.k8s.io/kubebuilder/v2/internal/config"
28+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
2929
)
3030

3131
type editError struct {

‎cmd/init.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"github.com/spf13/cobra"
3030
flag "github.com/spf13/pflag"
3131

32-
"sigs.k8s.io/kubebuilder/cmd/internal"
33-
"sigs.k8s.io/kubebuilder/internal/config"
34-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
32+
"sigs.k8s.io/kubebuilder/v2/cmd/internal"
33+
"sigs.k8s.io/kubebuilder/v2/internal/config"
34+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
3535
)
3636

3737
type initError struct {

‎cmd/internal/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"log"
2222
"os"
2323

24-
"sigs.k8s.io/kubebuilder/internal/config"
24+
"sigs.k8s.io/kubebuilder/v2/internal/config"
2525
)
2626

2727
const (

‎cmd/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"sigs.k8s.io/kubebuilder/cmd/internal"
25-
"sigs.k8s.io/kubebuilder/cmd/version"
26-
"sigs.k8s.io/kubebuilder/internal/config"
27-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
24+
"sigs.k8s.io/kubebuilder/v2/cmd/internal"
25+
"sigs.k8s.io/kubebuilder/v2/cmd/version"
26+
"sigs.k8s.io/kubebuilder/v2/internal/config"
27+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
2828
)
2929

3030
// commandOptions represent the types used to implement the different commands

‎cmd/update.go‎

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

2525
"github.com/spf13/cobra"
2626

27-
"sigs.k8s.io/kubebuilder/internal/config"
28-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
27+
"sigs.k8s.io/kubebuilder/v2/internal/config"
28+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
2929
)
3030

3131
type updateError struct {

‎cmd/webhook.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626

2727
"github.com/spf13/cobra"
2828

29-
"sigs.k8s.io/kubebuilder/cmd/internal"
30-
"sigs.k8s.io/kubebuilder/internal/config"
31-
"sigs.k8s.io/kubebuilder/pkg/model/resource"
32-
"sigs.k8s.io/kubebuilder/pkg/scaffold"
29+
"sigs.k8s.io/kubebuilder/v2/cmd/internal"
30+
"sigs.k8s.io/kubebuilder/v2/internal/config"
31+
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
32+
"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
3333
)
3434

3535
type webhookError struct {

‎common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function build_kb {
149149
opts=""
150150
else
151151
# TODO: what does this thing do.
152-
opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
152+
opts=-ldflags "-X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
153153
fi
154154

155155
GO111MODULE=on go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd

‎generate_testdata.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -e
1919
source common.sh
2020

2121
build_kb() {
22-
go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/cmd
22+
go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/v2/cmd
2323
}
2424

2525

@@ -103,6 +103,9 @@ scaffold_test_project() {
103103
header_text 'initializing project-v2-addon ...'
104104
$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
105105

106+
# pin the version of the declarative pattern to make tests pass
107+
go get sigs.k8s.io/kubebuilder-declarative-pattern@v0.0.0-20200317144824-bbf1fb2a4a9a
108+
106109
header_text 'enableling --pattern flag ...'
107110
export KUBEBUILDER_ENABLE_PLUGINS=1
108111
header_text 'Creating APIs ...'

0 commit comments

Comments
 (0)