Skip to content

Commit

Permalink
Merge pull request #626 from yue9944882/revert-v2-path
Browse files Browse the repository at this point in the history 
Revert v2 path
  • Loading branch information
@yue9944882
yue9944882 authored Apr 3, 2022
2 parents 035797f + 3e39b46 commit 10fd778
Show file tree
Hide file tree
Showing 34 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ default: install

.PHONY: test
test:
go test ./v2/...
go test ./cmd/... ./pkg/...

.PHONY: install
install: build
@echo "Installing apiserver-builder suite tools..."
@echo "GOOS: $(GOOS)"
@echo "GOARCH: $(GOARCH)"
@echo "ARCH: $(ARCH)"
go install ./v2/cmd/apiserver-boot
go install ./cmd/apiserver-boot

.PHONY: clean
clean:
Expand All @@ -47,7 +47,7 @@ clean:
.PHONY: build
build: clean ## Create release artefacts for darwin:amd64, linux:amd64 and windows:amd64. Requires etcd, glide, hg.
mkdir -p bin
go build -o bin/apiserver-boot ./v2/cmd/apiserver-boot
go build -o bin/apiserver-boot ./cmd/apiserver-boot

release-binary:
mkdir -p bin
Expand All @@ -59,6 +59,6 @@ release-binary:
-X 'sigs.k8s.io/apiserver-builder-alpha/cmd/apiserver-boot/boot/version.apiserverBuilderVersion=${VERSION}' \
-X 'sigs.k8s.io/apiserver-builder-alpha/cmd/apiserver-boot/boot/version.gitCommit=${COMMIT}' \
" \
-o bin/apiserver-boot ./v2/cmd/apiserver-boot
-o bin/apiserver-boot ./cmd/apiserver-boot
tar czvf apiserver-boot-${GOOS}-${GOARCH}.tar.gz bin/apiserver-boot

12 changes: 6 additions & 6 deletions v2/cmd/apiserver-boot/main.go → cmd/apiserver-boot/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ package main
import (
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/create"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/init_repo"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/run"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/show"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/version"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/create"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/init_repo"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/run"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/show"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/version"
)

func main() {
Expand Down
0 v2/pkg/boot/build/build.go → pkg/boot/build/build.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/pkg/boot/build/build_container.go → pkg/boot/build/build_container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"
"io/ioutil"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var Image string
Expand Down
0 v2/pkg/boot/build/build_executables.go → pkg/boot/build/build_executables.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/pkg/boot/build/build_resource_config.go → pkg/boot/build/build_resource_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var Name, Namespace string
Expand Down
0 v2/pkg/boot/build/docs.go → pkg/boot/build/docs.go
View file
File renamed without changes.
0 v2/pkg/boot/build/util.go → pkg/boot/build/util.go
View file
File renamed without changes.
0 v2/pkg/boot/create/create.go → pkg/boot/create/create.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/pkg/boot/create/group.go → pkg/boot/create/group.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/cobra"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var createGroupCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/boot/create/resource.go → pkg/boot/create/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/spf13/afero"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
config "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/boot/create/subresource.go → pkg/boot/create/subresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var subresourceName string
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/boot/create/util.go → pkg/boot/create/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/spf13/cobra"
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

func ValidateResourceFlags() {
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/boot/create/version.go → pkg/boot/create/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/spf13/cobra"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var versionName string
Expand Down
0 v2/pkg/boot/init_repo/init.go → pkg/boot/init_repo/init.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/pkg/boot/init_repo/repo.go → pkg/boot/init_repo/repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/spf13/afero"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
config "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds"
Expand Down
0 v2/pkg/boot/init_repo/template.go → pkg/boot/init_repo/template.go
View file
File renamed without changes.
0 v2/pkg/boot/init_repo/templates/api.doc.tpl → pkg/boot/init_repo/templates/api.doc.tpl
View file
File renamed without changes.
0 ...kg/boot/init_repo/templates/apiserver.tpl → pkg/boot/init_repo/templates/apiserver.tpl
View file
File renamed without changes.
0 v2/pkg/boot/init_repo/templates/go.mod.tpl → pkg/boot/init_repo/templates/go.mod.tpl
View file
File renamed without changes.
0 .../boot/init_repo/templates/package.doc.tpl → pkg/boot/init_repo/templates/package.doc.tpl
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/pkg/boot/run/in_cluster.go → pkg/boot/run/in_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var runInClusterCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/boot/run/local.go → pkg/boot/run/local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
)

var localCmd = &cobra.Command{
Expand Down
0 v2/pkg/boot/run/run.go → pkg/boot/run/run.go
View file
File renamed without changes.
0 v2/pkg/boot/show/cmd.go → pkg/boot/show/cmd.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion v2/pkg/boot/show/cmd_apiserver.go → pkg/boot/show/cmd_apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/utils"
"sigs.k8s.io/apiserver-builder-alpha/pkg/utils"
)

var showApiserverCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/boot/show/cmd_resource.go → pkg/boot/show/cmd_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/client-go/kubernetes"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/utils"
"sigs.k8s.io/apiserver-builder-alpha/pkg/utils"
)

var showResourceCmd = &cobra.Command{
Expand Down
0 v2/pkg/boot/util/repo.go → pkg/boot/util/repo.go
View file
File renamed without changes.
0 v2/pkg/boot/util/untar.go → pkg/boot/util/untar.go
View file
File renamed without changes.
0 v2/pkg/boot/util/util.go → pkg/boot/util/util.go
View file
File renamed without changes.
0 v2/pkg/boot/util/x509.go → pkg/boot/util/x509.go
View file
File renamed without changes.
0 v2/pkg/boot/version/version.go → pkg/boot/version/version.go
View file
File renamed without changes.
0 v2/pkg/utils/portforward.go → pkg/utils/portforward.go
View file
File renamed without changes.
0 v2/pkg/utils/prefixwriter.go → pkg/utils/prefixwriter.go
View file
File renamed without changes.

0 comments on commit 10fd778

Please sign in to comment.