Merge pull request #625 from yue9944882/move-v2-pkg

Chore: Move sources to dir v2
kubernetes-sigs · Apr 3, 2022 · 035797f · 035797f
2 parents e8140aa + 18fb6af
commit 035797f
Show file tree

Hide file tree

Showing 36 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,7 +79,7 @@ jobs:
         env:
           GOPATH: ${{ github.workspace }}/go
         run: |
-          go build -o ${GOPATH}/bin/apiserver-boot ./cmd/apiserver-boot/main.go
+          make install
       - name: Install controller-tools
         env:
           GO111MODULE: on
@@ -133,7 +133,7 @@ jobs:
           GOPATH: ${{ github.workspace }}/go
         run: |
           mkdir -p bin
-          go build -o ${GOPATH}/bin/apiserver-boot ./cmd/apiserver-boot/main.go
+          make install
       - name: Install controller-tools
         env:
           GO111MODULE: on

diff --git a/Makefile b/Makefile
@@ -30,15 +30,15 @@ default: install
 
 .PHONY: test
 test:
-	go test ./pkg/... ./cmd/...
+	go test ./v2/...
 
 .PHONY: install
 install: build
 	@echo "Installing apiserver-builder suite tools..."
 	@echo "GOOS: $(GOOS)"
 	@echo "GOARCH: $(GOARCH)"
 	@echo "ARCH: $(ARCH)"
-	go install ./cmd/apiserver-boot
+	go install ./v2/cmd/apiserver-boot
 
 .PHONY: clean
 clean:
@@ -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 ./cmd/apiserver-boot
+	go build -o bin/apiserver-boot ./v2/cmd/apiserver-boot
 
 release-binary:
 	mkdir -p bin
@@ -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 ./cmd/apiserver-boot
+ 		-o bin/apiserver-boot ./v2/cmd/apiserver-boot
 	tar czvf apiserver-boot-${GOOS}-${GOARCH}.tar.gz bin/apiserver-boot
 
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/apiserver-builder-alpha/v2
+module sigs.k8s.io/apiserver-builder-alpha
 
 go 1.17
 

diff --git a/cmd/apiserver-boot/main.go → v2/cmd/apiserver-boot/main.go b/cmd/apiserver-boot/main.go → v2/cmd/apiserver-boot/main.go
diff --git a/pkg/boot/build/build.go → v2/pkg/boot/build/build.go b/pkg/boot/build/build.go → v2/pkg/boot/build/build.go
diff --git a/pkg/boot/build/build_container.go → v2/pkg/boot/build/build_container.go b/pkg/boot/build/build_container.go → v2/pkg/boot/build/build_container.go
diff --git a/pkg/boot/build/build_executables.go → v2/pkg/boot/build/build_executables.go b/pkg/boot/build/build_executables.go → v2/pkg/boot/build/build_executables.go
diff --git a/pkg/boot/build/build_resource_config.go → v2/pkg/boot/build/build_resource_config.go b/pkg/boot/build/build_resource_config.go → v2/pkg/boot/build/build_resource_config.go
diff --git a/pkg/boot/build/docs.go → v2/pkg/boot/build/docs.go b/pkg/boot/build/docs.go → v2/pkg/boot/build/docs.go
diff --git a/pkg/boot/build/util.go → v2/pkg/boot/build/util.go b/pkg/boot/build/util.go → v2/pkg/boot/build/util.go
diff --git a/pkg/boot/create/create.go → v2/pkg/boot/create/create.go b/pkg/boot/create/create.go → v2/pkg/boot/create/create.go
diff --git a/pkg/boot/create/group.go → v2/pkg/boot/create/group.go b/pkg/boot/create/group.go → v2/pkg/boot/create/group.go
diff --git a/pkg/boot/create/resource.go → v2/pkg/boot/create/resource.go b/pkg/boot/create/resource.go → v2/pkg/boot/create/resource.go
diff --git a/pkg/boot/create/subresource.go → v2/pkg/boot/create/subresource.go b/pkg/boot/create/subresource.go → v2/pkg/boot/create/subresource.go
diff --git a/pkg/boot/create/util.go → v2/pkg/boot/create/util.go b/pkg/boot/create/util.go → v2/pkg/boot/create/util.go
diff --git a/pkg/boot/create/version.go → v2/pkg/boot/create/version.go b/pkg/boot/create/version.go → v2/pkg/boot/create/version.go
diff --git a/pkg/boot/init_repo/init.go → v2/pkg/boot/init_repo/init.go b/pkg/boot/init_repo/init.go → v2/pkg/boot/init_repo/init.go
diff --git a/pkg/boot/init_repo/repo.go → v2/pkg/boot/init_repo/repo.go b/pkg/boot/init_repo/repo.go → v2/pkg/boot/init_repo/repo.go
diff --git a/pkg/boot/init_repo/template.go → v2/pkg/boot/init_repo/template.go b/pkg/boot/init_repo/template.go → v2/pkg/boot/init_repo/template.go
diff --git a/pkg/boot/init_repo/templates/api.doc.tpl → v2/pkg/boot/init_repo/templates/api.doc.tpl b/pkg/boot/init_repo/templates/api.doc.tpl → v2/pkg/boot/init_repo/templates/api.doc.tpl
diff --git a/pkg/boot/init_repo/templates/apiserver.tpl → ...kg/boot/init_repo/templates/apiserver.tpl b/pkg/boot/init_repo/templates/apiserver.tpl → ...kg/boot/init_repo/templates/apiserver.tpl
diff --git a/pkg/boot/init_repo/templates/go.mod.tpl → v2/pkg/boot/init_repo/templates/go.mod.tpl b/pkg/boot/init_repo/templates/go.mod.tpl → v2/pkg/boot/init_repo/templates/go.mod.tpl
diff --git a/pkg/boot/init_repo/templates/package.doc.tpl → .../boot/init_repo/templates/package.doc.tpl b/pkg/boot/init_repo/templates/package.doc.tpl → .../boot/init_repo/templates/package.doc.tpl
diff --git a/pkg/boot/run/in_cluster.go → v2/pkg/boot/run/in_cluster.go b/pkg/boot/run/in_cluster.go → v2/pkg/boot/run/in_cluster.go
diff --git a/pkg/boot/run/local.go → v2/pkg/boot/run/local.go b/pkg/boot/run/local.go → v2/pkg/boot/run/local.go
diff --git a/pkg/boot/run/run.go → v2/pkg/boot/run/run.go b/pkg/boot/run/run.go → v2/pkg/boot/run/run.go
diff --git a/pkg/boot/show/cmd.go → v2/pkg/boot/show/cmd.go b/pkg/boot/show/cmd.go → v2/pkg/boot/show/cmd.go
diff --git a/pkg/boot/show/cmd_apiserver.go → v2/pkg/boot/show/cmd_apiserver.go b/pkg/boot/show/cmd_apiserver.go → v2/pkg/boot/show/cmd_apiserver.go
diff --git a/pkg/boot/show/cmd_resource.go → v2/pkg/boot/show/cmd_resource.go b/pkg/boot/show/cmd_resource.go → v2/pkg/boot/show/cmd_resource.go
diff --git a/pkg/boot/util/repo.go → v2/pkg/boot/util/repo.go b/pkg/boot/util/repo.go → v2/pkg/boot/util/repo.go
diff --git a/pkg/boot/util/untar.go → v2/pkg/boot/util/untar.go b/pkg/boot/util/untar.go → v2/pkg/boot/util/untar.go
diff --git a/pkg/boot/util/util.go → v2/pkg/boot/util/util.go b/pkg/boot/util/util.go → v2/pkg/boot/util/util.go
diff --git a/pkg/boot/util/x509.go → v2/pkg/boot/util/x509.go b/pkg/boot/util/x509.go → v2/pkg/boot/util/x509.go
diff --git a/pkg/boot/version/version.go → v2/pkg/boot/version/version.go b/pkg/boot/version/version.go → v2/pkg/boot/version/version.go
diff --git a/pkg/utils/portforward.go → v2/pkg/utils/portforward.go b/pkg/utils/portforward.go → v2/pkg/utils/portforward.go
diff --git a/pkg/utils/prefixwriter.go → v2/pkg/utils/prefixwriter.go b/pkg/utils/prefixwriter.go → v2/pkg/utils/prefixwriter.go