Rename Go module name to 'github.com/kubeflow/mpi-operator' (#506)

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com> Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
kubeflow · Jan 25, 2023 · cd83424 · cd83424
1 parent 6d0d42c
commit cd83424
Show file tree

Hide file tree

Showing 33 changed files with 68 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ dev_manifest:
 .PHONY: generate
 generate:
 	go generate ./pkg/... ./cmd/... && \
-	openapi-gen --input-dirs github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
+	openapi-gen --input-dirs github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
 
 .PHONY: clean
 clean:

diff --git a/cmd/mpi-operator/app/options/options.go b/cmd/mpi-operator/app/options/options.go
@@ -18,7 +18,7 @@ import (
 	"flag"
 	"os"
 
-	"github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	"github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 )
 
 // ServerOption is the main context object for the controller manager.

diff --git a/cmd/mpi-operator/app/server.go b/cmd/mpi-operator/app/server.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"time"
 
-	kubeflowScheme "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned/scheme"
+	kubeflowScheme "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned/scheme"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	corev1 "k8s.io/api/core/v1"
@@ -44,11 +44,11 @@ import (
 	volcanoinformers "volcano.sh/apis/pkg/client/informers/externalversions"
 	podgroupsinformer "volcano.sh/apis/pkg/client/informers/externalversions/scheduling/v1beta1"
 
-	"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app/options"
-	mpijobclientset "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned"
-	informers "github.com/kubeflow/mpi-operator/v2/pkg/client/informers/externalversions"
-	controllersv1 "github.com/kubeflow/mpi-operator/v2/pkg/controller"
-	"github.com/kubeflow/mpi-operator/v2/pkg/version"
+	"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app/options"
+	mpijobclientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
+	informers "github.com/kubeflow/mpi-operator/pkg/client/informers/externalversions"
+	controllersv1 "github.com/kubeflow/mpi-operator/pkg/controller"
+	"github.com/kubeflow/mpi-operator/pkg/version"
 )
 
 const (

diff --git a/cmd/mpi-operator/main.go b/cmd/mpi-operator/main.go
@@ -21,8 +21,8 @@ import (
 
 	"k8s.io/klog"
 
-	"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app"
-	"github.com/kubeflow/mpi-operator/v2/cmd/mpi-operator/app/options"
+	"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app"
+	"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app/options"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kubeflow/mpi-operator/v2
+module github.com/kubeflow/mpi-operator
 
 go 1.19
 

diff --git a/hack/python-sdk/gen-sdk.sh b/hack/python-sdk/gen-sdk.sh
@@ -32,7 +32,7 @@ fi
 mv pkg/apis/kubeflow/v2beta1/openapi_generated.go pkg/apis/kubeflow/v2beta1/openapi_generated.go.backup
 
 echo "Generating V2 OpenAPI specification ..."
-openapi-gen --input-dirs github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
+openapi-gen --input-dirs github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
 
 echo "Generating V2 swagger file ..."
 go run hack/python-sdk/main.go v2beta1 > ${SWAGGER_V2_CODEGEN_FILE}

diff --git a/hack/python-sdk/main.go b/hack/python-sdk/main.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/klog"
 	"k8s.io/kube-openapi/pkg/common"
 
-	mpijobv2 "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	mpijobv2 "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 )
 
 // Generate OpenAPI spec definitions for MPIJob Resource
@@ -71,7 +71,7 @@ func main() {
 }
 
 func swaggify(name string) string {
-	name = strings.Replace(name, "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/", "", -1)
+	name = strings.Replace(name, "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/", "", -1)
 	name = strings.Replace(name, "github.com/kubeflow/common/pkg/apis/common/", "", -1)
 	name = strings.Replace(name, "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/", "", -1)
 	name = strings.Replace(name, "k8s.io/api/core/", "", -1)

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -31,5 +31,5 @@ CODEGEN_PKG=$(echo `go env GOPATH`"/pkg/mod/k8s.io/code-generator@${CODEGEN_VERS
 chmod +x ${CODEGEN_PKG}/generate-groups.sh
 
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
-  github.com/kubeflow/mpi-operator/v2/pkg/client github.com/kubeflow/mpi-operator/v2/pkg/apis \
+  github.com/kubeflow/mpi-operator/pkg/client github.com/kubeflow/mpi-operator/pkg/apis \
   kubeflow:v2beta1 --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt
diff --git a/pkg/apis/kubeflow/v2beta1/openapi_generated.go b/pkg/apis/kubeflow/v2beta1/openapi_generated.go
diff --git a/pkg/apis/kubeflow/validation/validation.go b/pkg/apis/kubeflow/validation/validation.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	kubeflow "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	kubeflow "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 )
 
 var (

diff --git a/pkg/apis/kubeflow/validation/validation_test.go b/pkg/apis/kubeflow/validation/validation_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	"github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	"github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"

diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go
diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go
diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go
diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
diff --git a/pkg/client/informers/externalversions/kubeflow/interface.go b/pkg/client/informers/externalversions/kubeflow/interface.go
diff --git a/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go
diff --git a/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go
diff --git a/pkg/client/listers/kubeflow/v2beta1/mpijob.go b/pkg/client/listers/kubeflow/v2beta1/mpijob.go
diff --git a/pkg/controller/mpi_job_controller.go b/pkg/controller/mpi_job_controller.go
@@ -56,12 +56,12 @@ import (
 	podgroupslists "volcano.sh/apis/pkg/client/listers/scheduling/v1beta1"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	kubeflow "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
-	"github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/validation"
-	clientset "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned"
-	"github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned/scheme"
-	informers "github.com/kubeflow/mpi-operator/v2/pkg/client/informers/externalversions/kubeflow/v2beta1"
-	listers "github.com/kubeflow/mpi-operator/v2/pkg/client/listers/kubeflow/v2beta1"
+	kubeflow "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
+	"github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/validation"
+	clientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
+	"github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned/scheme"
+	informers "github.com/kubeflow/mpi-operator/pkg/client/informers/externalversions/kubeflow/v2beta1"
+	listers "github.com/kubeflow/mpi-operator/pkg/client/listers/kubeflow/v2beta1"
 )
 
 const (

diff --git a/pkg/controller/mpi_job_controller_status.go b/pkg/controller/mpi_job_controller_status.go
@@ -19,7 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	kubeflow "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	kubeflow "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 )
 
 const (

diff --git a/pkg/controller/mpi_job_controller_test.go b/pkg/controller/mpi_job_controller_test.go
@@ -40,10 +40,10 @@ import (
 	volcanoinformers "volcano.sh/apis/pkg/client/informers/externalversions"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	kubeflow "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
-	"github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned/fake"
-	"github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned/scheme"
-	informers "github.com/kubeflow/mpi-operator/v2/pkg/client/informers/externalversions"
+	kubeflow "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
+	"github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned/fake"
+	"github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned/scheme"
+	informers "github.com/kubeflow/mpi-operator/pkg/client/informers/externalversions"
 )
 
 var (

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	clientset "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned"
+	clientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/test/e2e/mpi_job_test.go b/test/e2e/mpi_job_test.go
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
-	kubeflow "github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1"
+	kubeflow "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1"
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"

diff --git a/test/integration/main_test.go b/test/integration/main_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	clientset "github.com/kubeflow/mpi-operator/v2/pkg/client/clientset/versioned"
+	clientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"