refactor(api): rename apis to api and add v2 suffix (#6061)

Author: liubog2008

Makefile

@@ -15,7 +15,7 @@
 ROOT = $(CURDIR)
 OUTPUT_DIR = $(ROOT)/_output
 BIN_DIR = $(OUTPUT_DIR)/bin
-CORE_API_PATH = $(ROOT)/apis/core
+API_PATH = $(ROOT)/api
 PD_API_PATH = $(ROOT)/pkg/timanager/apis/pd
 GO_MODULE := github.com/pingcap/tidb-operator
 OVERLAY_PKG_DIR = $(ROOT)/pkg/overlay
@@ -54,12 +54,12 @@ codegen: bin/deepcopy-gen bin/register-gen bin/overlay-gen
 	$(REGISTER_GEN) \
 		--output-file=zz_generated.register.go \
 		--go-header-file=$(BOILERPLATE_FILE) \
-		$(CORE_API_PATH)/...
+		$(API_PATH)/...
 
 	$(DEEPCOPY_GEN) \
 		--output-file=zz_generated.deepcopy.go \
 		--go-header-file=$(BOILERPLATE_FILE) \
-		$(CORE_API_PATH)/...
+		$(API_PATH)/...
 
 	$(REGISTER_GEN) \
 		--output-file=zz_generated.register.go \
@@ -80,16 +80,16 @@ overlaygen: bin/overlay-gen
 
 .PHONY: crd
 crd: bin/controller-gen
-	$(CONTROLLER_GEN) crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=$(ROOT)/manifests/crd paths=$(CORE_API_PATH)/...
+	$(CONTROLLER_GEN) crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=$(ROOT)/manifests/crd paths=$(API_PATH)/...
 
 # Deprecate this generator, rbac generator cannot well handle nonResourceURLs
 .PHONY: rbac
 rbac: bin/controller-gen
-	$(CONTROLLER_GEN) rbac:roleName=tidb-operator output:rbac:artifacts:config=$(ROOT)/manifests/rbac paths=$(CORE_API_PATH)/...
+	$(CONTROLLER_GEN) rbac:roleName=tidb-operator output:rbac:artifacts:config=$(ROOT)/manifests/rbac paths=$(API_PATH)/...
 
 .PHONY: tidy
 tidy:
-	cd $(CORE_API_PATH) && go mod tidy
+	cd $(API_PATH) && go mod tidy
 	go mod tidy
 
 gengo: GEN_DIR ?= ./...

apis/core/v1alpha1/cluster_types.go renamed to api/core/v1alpha1/cluster_types.go

@@ -1,4 +1,4 @@
-module github.com/pingcap/tidb-operator/apis/core
+module github.com/pingcap/tidb-operator/api/v2
 
 go 1.22.0
 

apis/core/v1alpha1/common_types.go renamed to api/core/v1alpha1/common_types.go

@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/controllers/cluster"
 	"github.com/pingcap/tidb-operator/pkg/controllers/pd"

apis/core/v1alpha1/doc.go renamed to api/core/v1alpha1/doc.go

@@ -20,7 +20,7 @@ require (
 	github.com/onsi/gomega v1.34.1
 	github.com/pelletier/go-toml/v2 v2.2.2
 	github.com/pingcap/kvproto v0.0.0-20240403065636-c699538f7aa1
-	github.com/pingcap/tidb-operator/apis/core v0.0.0-00000000000000-000000000000
+	github.com/pingcap/tidb-operator/api/v2 v2.0.0-00000000000000-000000000000
 	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.55.0
@@ -48,7 +48,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-replace github.com/pingcap/tidb-operator/apis/core => ./apis/core
+replace github.com/pingcap/tidb-operator/api/v2 => ./api
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect

apis/core/v1alpha1/errors.go renamed to api/core/v1alpha1/errors.go

@@ -2,5 +2,5 @@ go 1.23.0
 
 use (
 	.
-	./apis/core
+	./api
 )

apis/core/v1alpha1/fake.go renamed to api/core/v1alpha1/fake.go

@@ -10,13 +10,13 @@ ENV GOCACHE=/go/cache
 
 COPY go.mod .
 COPY go.sum .
-COPY apis/core/go.mod apis/core/go.mod
-COPY apis/core/go.sum apis/core/go.sum
+COPY api/go.mod api/go.mod
+COPY api/go.sum api/go.sum
 
 RUN --mount=type=cache,target=/go/pkg/mod/ \
     go mod download -x
 RUN --mount=type=cache,target=/go/pkg/mod/ \
-    cd apis/core && go mod download -x
+    cd api && go mod download -x
 
 COPY . .
 
@@ -61,4 +61,4 @@ COPY --from=builder ./_output/$TARGETPLATFORM/bin/testing-workload testing-workl
 # nonroot user of distroless
 USER 65532:65532
 
-ENTRYPOINT ["/testing-workload"]
+ENTRYPOINT ["/testing-workload"]

apis/core/v1alpha1/pd_types.go renamed to api/core/v1alpha1/pd_types.go

@@ -21,7 +21,7 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/go-logr/logr"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 )
 

apis/core/v1alpha1/tidb_types.go renamed to api/core/v1alpha1/tidb_types.go

@@ -22,7 +22,7 @@ import (
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 )

apis/core/v1alpha1/tiflash_types.go renamed to api/core/v1alpha1/tiflash_types.go

@@ -22,7 +22,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 const (

apis/core/v1alpha1/tikv_types.go renamed to api/core/v1alpha1/tikv_types.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 func TestValidate(t *testing.T) {

apis/core/v1alpha1/zz_generated.deepcopy.go renamed to api/core/v1alpha1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 const (

apis/core/v1alpha1/zz_generated.register.go renamed to api/core/v1alpha1/zz_generated.register.go

@@ -22,7 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 func TestValidate(t *testing.T) {

apis/core/go.mod renamed to api/go.mod

@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 // Config is a subset config of tiflash

apis/core/go.sum renamed to api/go.sum

@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 func TestValidate(t *testing.T) {

cmd/operator/main.go

@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 const (

go.mod

@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 func TestProxyValidate(t *testing.T) {

go.work

@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 type Config struct {

image/Dockerfile

@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 )
 
 func TestValidate(t *testing.T) {

pkg/action/upgrader.go

@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/controllers/cluster/tasks"
 	pdm "github.com/pingcap/tidb-operator/pkg/timanager/pd"

pkg/action/upgrader_test.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/task"
 )

pkg/configs/pd/config.go

@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 	"github.com/pingcap/tidb-operator/pkg/utils/task"

pkg/configs/pd/config_test.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 	"github.com/pingcap/tidb-operator/pkg/utils/task"

pkg/configs/tidb/config.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	pdm "github.com/pingcap/tidb-operator/pkg/timanager/pd"
 	"github.com/pingcap/tidb-operator/pkg/utils/task"

pkg/configs/tidb/config_test.go

@@ -27,7 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/pdapi/v1"
 	"github.com/pingcap/tidb-operator/pkg/timanager"

pkg/configs/tiflash/config.go

@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 )

pkg/configs/tiflash/config_test.go

@@ -17,7 +17,7 @@ package common
 import (
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 )

pkg/configs/tiflash/proxy_config.go

@@ -17,7 +17,7 @@ package common
 import (
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 )
 

pkg/configs/tiflash/proxy_config_test.go

@@ -26,7 +26,7 @@ import (
 	kuberuntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/task/v3"
 )

pkg/configs/tikv/config.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"

pkg/configs/tikv/config_test.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 	"github.com/pingcap/tidb-operator/pkg/utils/task/v3"

pkg/controllers/cluster/controller.go

@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"

pkg/controllers/cluster/tasks/ctx.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 	"github.com/pingcap/tidb-operator/pkg/utils/task/v3"

pkg/controllers/cluster/tasks/ctx_test.go

@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/controllers/pd/tasks"
 	pdv1 "github.com/pingcap/tidb-operator/pkg/timanager/apis/pd/v1"

pkg/controllers/cluster/tasks/finalizer_test.go

@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	pdv1 "github.com/pingcap/tidb-operator/pkg/timanager/apis/pd/v1"
 	pdm "github.com/pingcap/tidb-operator/pkg/timanager/pd"

pkg/controllers/cluster/tasks/status.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	pdcfg "github.com/pingcap/tidb-operator/pkg/configs/pd"
 	"github.com/pingcap/tidb-operator/pkg/utils/hasher"

pkg/controllers/cluster/tasks/status_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/utils/fake"
 	"github.com/pingcap/tidb-operator/pkg/utils/task/v3"

pkg/controllers/common/cond_test.go

@@ -19,7 +19,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/runtime"
 	"github.com/pingcap/tidb-operator/pkg/utils/k8s"

pkg/controllers/common/interfaces.go

@@ -25,7 +25,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/pingcap/tidb-operator/apis/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/client"
 	"github.com/pingcap/tidb-operator/pkg/pdapi/v1"
 	pdm "github.com/pingcap/tidb-operator/pkg/timanager/pd"