diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index bdcba901..f2d7cb48 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,8 +18,4 @@ jobs: with: version: v1.50.1 args: --timeout=5m -# To avoid the following errors, we comment out. -# Error: options working-directory and only-new-issues aren't compatible, Error: options working-directory and only-new-issues aren't compatible -# TODO: Once we move the v2 directory to the top of the repository, we need to uncomment the following. -# only-new-issues: true - working-directory: v2 + only-new-issues: true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56c5592a..c724edc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,24 +26,15 @@ git clone https://github.com/${GITHUB_USER}/mpi-operator.git We use Go v1.15+ for development and use [Go Modules](https://blog.golang.org/using-go-modules) to download and install the dependencies. -## Controller versions - -The main module `github.com/kubeflow/mpi-operator` contains the code of the legacy -controller `v1`. - -The newest iteration of the controller is in the module `github.com/kubeflow/mpi-operator/v2`. - ## Run tests ### Unit and integration tests You can execute all the unit and integration tests via `make test`. -If you only which to run the tests for the v2 controller, you can run `make test_v2`. - You can find the unit tests in the same folders as the functional code. -You can find the integration tests in a separate directory, `v2/test/integration`. +You can find the integration tests in a separate directory, `test/integration`. Integration tests make use of a real kube-apiserver to test the interaction of the controller with a real Kubernetes API. In these tests, other components are not running, including `kubelet` or `kube-controller-manager`. @@ -84,8 +75,7 @@ make images dev_manifest kubectl apply -k manifests/overlays/dev ``` -The image comes bundled with all the controller versions. For example, you can -find the v1 controller binary at `/opt/mpi-operator.v1`. +The controller handles MPIJobs with API version v2beta1 or newer. If you need to use a different registry, or a different tag, you can do: diff --git a/Makefile b/Makefile index 6c531246..01dc6b85 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,6 @@ RELEASE_VERSION?=v0.3.0 CONTROLLER_VERSION?=v2 BASE_IMAGE_SSH_PORT?=2222 IMG_BUILDER=docker -LD_FLAGS=" \ - -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \ - -X '${REPO_PATH}/pkg/version.Built=${Date}' \ - -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VERSION}'" LD_FLAGS_V2=" \ -X '${REPO_PATH}/v2/pkg/version.GitSHA=${GitSHA}' \ -X '${REPO_PATH}/v2/pkg/version.Built=${Date}' \ @@ -31,37 +27,35 @@ all: ${BIN_DIR} fmt tidy lint test mpi-operator.v2 .PHONY: mpi-operator.v2 mpi-operator.v2: - cd v2 && \ - go build -ldflags ${LD_FLAGS_V2} -o ../${BIN_DIR}/mpi-operator.v2 ./cmd/mpi-operator/ + go build -ldflags ${LD_FLAGS_V2} -o ${BIN_DIR}/mpi-operator.v2 ./cmd/mpi-operator/ ${BIN_DIR}: mkdir -p ${BIN_DIR} .PHONY: fmt fmt: - cd v2 && go fmt ./... + go fmt ./... .PHONY: test test: export KUBEBUILDER_ASSETS = ${KUBEBUILDER_ASSETS_PATH} test: bin/kubebuilder - cd v2 && go test -covermode atomic -coverprofile=profile.cov ./... + go test -covermode atomic -coverprofile=profile.cov ./... # Only works with CONTROLLER_VERSION=v2 .PHONY: test_e2e test_e2e: export TEST_MPI_OPERATOR_IMAGE = ${IMAGE_NAME}:${RELEASE_VERSION} test_e2e: bin/kubectl kind images test_images dev_manifest - cd v2 && go test -tags e2e ./test/e2e/... + go test -tags e2e ./test/e2e/... .PHONY: dev_manifest dev_manifest: # Use `~` instead of `/` because image name might contain `/`. sed -e "s~%IMAGE_NAME%~${IMAGE_NAME}~g" -e "s~%IMAGE_TAG%~${RELEASE_VERSION}~g" manifests/overlays/dev/kustomization.yaml.template > manifests/overlays/dev/kustomization.yaml -.PHONY: generate_v2 -generate_v2: - cd v2 && \ +.PHONY: generate +generate: go generate ./pkg/... ./cmd/... && \ - openapi-gen --input-dirs github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2,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/v2/pkg/apis/kubeflow/v2 --go-header-file ../hack/boilerplate/boilerplate.go.txt + 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 .PHONY: clean clean: @@ -84,7 +78,7 @@ test_images: .PHONY: tidy tidy: - cd v2 && go mod tidy -compat 1.17 + go mod tidy -compat 1.17 GOLANGCI_LINT = ./bin/golangci-lint bin/golangci-lint: @@ -106,7 +100,7 @@ bin/kubectl: .PHONY: lint lint: bin/golangci-lint ## Run golangci-lint linter - cd v2 && ../$(GOLANGCI_LINT) run --new-from-rev=origin/master + $(GOLANGCI_LINT) run --new-from-rev=origin/master .PHONY: kind kind: @@ -114,7 +108,7 @@ kind: # Generate CRD crd: controller-gen - cd v2 && $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=crd + $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=crd # Download controller-gen locally if necessary CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen diff --git a/v2/cmd/mpi-operator/app/options/options.go b/cmd/mpi-operator/app/options/options.go similarity index 100% rename from v2/cmd/mpi-operator/app/options/options.go rename to cmd/mpi-operator/app/options/options.go diff --git a/v2/cmd/mpi-operator/app/server.go b/cmd/mpi-operator/app/server.go similarity index 99% rename from v2/cmd/mpi-operator/app/server.go rename to cmd/mpi-operator/app/server.go index e0c73be7..39552f06 100644 --- a/v2/cmd/mpi-operator/app/server.go +++ b/cmd/mpi-operator/app/server.go @@ -48,11 +48,11 @@ import ( 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" - version "github.com/kubeflow/mpi-operator/v2/pkg/version" + "github.com/kubeflow/mpi-operator/v2/pkg/version" ) const ( - apiVersion = "v1" + apiVersion = "v2" RecommendedKubeConfigPathEnv = "KUBECONFIG" controllerName = "mpi-operator" ) diff --git a/v2/cmd/mpi-operator/main.go b/cmd/mpi-operator/main.go similarity index 100% rename from v2/cmd/mpi-operator/main.go rename to cmd/mpi-operator/main.go diff --git a/v2/crd/kubeflow.org_mpijobs.yaml b/crd/kubeflow.org_mpijobs.yaml similarity index 100% rename from v2/crd/kubeflow.org_mpijobs.yaml rename to crd/kubeflow.org_mpijobs.yaml diff --git a/v2/go.mod b/go.mod similarity index 100% rename from v2/go.mod rename to go.mod diff --git a/v2/go.sum b/go.sum similarity index 100% rename from v2/go.sum rename to go.sum diff --git a/hack/python-sdk/gen-sdk.sh b/hack/python-sdk/gen-sdk.sh index 664eebfd..384bf251 100755 --- a/hack/python-sdk/gen-sdk.sh +++ b/hack/python-sdk/gen-sdk.sh @@ -21,7 +21,7 @@ set -o pipefail SWAGGER_JAR_URL="https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.1.0/openapi-generator-cli-5.1.0.jar" SWAGGER_CODEGEN_JAR="hack/python-sdk/openapi-generator-cli.jar" SWAGGER_CODEGEN_CONF="hack/python-sdk/swagger_config.json" -SWAGGER_V2_CODEGEN_FILE="v2/pkg/apis/kubeflow/v2beta1/swagger.json" +SWAGGER_V2_CODEGEN_FILE="pkg/apis/kubeflow/v2beta1/swagger.json" SDK_OUTPUT_PATH="sdk/python" if [ -z "${GOPATH:-}" ]; then @@ -29,10 +29,10 @@ if [ -z "${GOPATH:-}" ]; then fi # Backup existing v2 openapi_generated.go -mv v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go.backup +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,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/v2/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt +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 echo "Generating V2 swagger file ..." go run hack/python-sdk/main.go v2beta1 > ${SWAGGER_V2_CODEGEN_FILE} @@ -46,6 +46,6 @@ echo "Generating V2 Python SDK for Kubeflow MPI-Operator ..." java -jar ${SWAGGER_CODEGEN_JAR} generate -i ${SWAGGER_V2_CODEGEN_FILE} -g python-legacy -o ${SDK_OUTPUT_PATH}/v2beta1 -c ${SWAGGER_CODEGEN_CONF} # Rollback the current V2 openapi_generated.go -mv v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go.backup v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go +mv pkg/apis/kubeflow/v2beta1/openapi_generated.go.backup pkg/apis/kubeflow/v2beta1/openapi_generated.go echo "Kubeflow MPI-Operator Python SDK is generated successfully to folder ${SDK_OUTPUT_PATH}/." diff --git a/hack/python-sdk/openapi-generator-cli.jar b/hack/python-sdk/openapi-generator-cli.jar new file mode 100644 index 00000000..693779b5 Binary files /dev/null and b/hack/python-sdk/openapi-generator-cli.jar differ diff --git a/v2/pkg/apis/kubeflow/v2beta1/constants.go b/pkg/apis/kubeflow/v2beta1/constants.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/constants.go rename to pkg/apis/kubeflow/v2beta1/constants.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/default.go b/pkg/apis/kubeflow/v2beta1/default.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/default.go rename to pkg/apis/kubeflow/v2beta1/default.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/default_test.go b/pkg/apis/kubeflow/v2beta1/default_test.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/default_test.go rename to pkg/apis/kubeflow/v2beta1/default_test.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/doc.go b/pkg/apis/kubeflow/v2beta1/doc.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/doc.go rename to pkg/apis/kubeflow/v2beta1/doc.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go b/pkg/apis/kubeflow/v2beta1/openapi_generated.go similarity index 99% rename from v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go rename to pkg/apis/kubeflow/v2beta1/openapi_generated.go index 125135b8..1a76649d 100644 --- a/v2/pkg/apis/kubeflow/v2beta1/openapi_generated.go +++ b/pkg/apis/kubeflow/v2beta1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2021 The Kubeflow Authors diff --git a/v2/pkg/apis/kubeflow/v2beta1/register.go b/pkg/apis/kubeflow/v2beta1/register.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/register.go rename to pkg/apis/kubeflow/v2beta1/register.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/swagger.json b/pkg/apis/kubeflow/v2beta1/swagger.json similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/swagger.json rename to pkg/apis/kubeflow/v2beta1/swagger.json diff --git a/v2/pkg/apis/kubeflow/v2beta1/types.go b/pkg/apis/kubeflow/v2beta1/types.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/types.go rename to pkg/apis/kubeflow/v2beta1/types.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go b/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go similarity index 100% rename from v2/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go rename to pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go diff --git a/v2/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go b/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go similarity index 97% rename from v2/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go rename to pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go index b07cc5d5..d5edaabd 100644 --- a/v2/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go +++ b/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2020 The Kubeflow Authors. diff --git a/v2/pkg/apis/kubeflow/validation/validation.go b/pkg/apis/kubeflow/validation/validation.go similarity index 100% rename from v2/pkg/apis/kubeflow/validation/validation.go rename to pkg/apis/kubeflow/validation/validation.go diff --git a/v2/pkg/apis/kubeflow/validation/validation_test.go b/pkg/apis/kubeflow/validation/validation_test.go similarity index 100% rename from v2/pkg/apis/kubeflow/validation/validation_test.go rename to pkg/apis/kubeflow/validation/validation_test.go diff --git a/v2/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go similarity index 100% rename from v2/pkg/client/clientset/versioned/clientset.go rename to pkg/client/clientset/versioned/clientset.go diff --git a/v2/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go similarity index 100% rename from v2/pkg/client/clientset/versioned/doc.go rename to pkg/client/clientset/versioned/doc.go diff --git a/v2/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 100% rename from v2/pkg/client/clientset/versioned/fake/clientset_generated.go rename to pkg/client/clientset/versioned/fake/clientset_generated.go diff --git a/v2/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from v2/pkg/client/clientset/versioned/fake/doc.go rename to pkg/client/clientset/versioned/fake/doc.go diff --git a/v2/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go similarity index 100% rename from v2/pkg/client/clientset/versioned/fake/register.go rename to pkg/client/clientset/versioned/fake/register.go diff --git a/v2/pkg/client/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from v2/pkg/client/clientset/versioned/scheme/doc.go rename to pkg/client/clientset/versioned/scheme/doc.go diff --git a/v2/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go similarity index 100% rename from v2/pkg/client/clientset/versioned/scheme/register.go rename to pkg/client/clientset/versioned/scheme/register.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go diff --git a/v2/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 similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go diff --git a/v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go similarity index 100% rename from v2/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go rename to pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go diff --git a/v2/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go similarity index 100% rename from v2/pkg/client/informers/externalversions/factory.go rename to pkg/client/informers/externalversions/factory.go diff --git a/v2/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go similarity index 100% rename from v2/pkg/client/informers/externalversions/generic.go rename to pkg/client/informers/externalversions/generic.go diff --git a/v2/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 100% rename from v2/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go diff --git a/v2/pkg/client/informers/externalversions/kubeflow/interface.go b/pkg/client/informers/externalversions/kubeflow/interface.go similarity index 100% rename from v2/pkg/client/informers/externalversions/kubeflow/interface.go rename to pkg/client/informers/externalversions/kubeflow/interface.go diff --git a/v2/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go similarity index 100% rename from v2/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go rename to pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go diff --git a/v2/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go similarity index 100% rename from v2/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go rename to pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go diff --git a/v2/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go b/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go similarity index 100% rename from v2/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go rename to pkg/client/listers/kubeflow/v2beta1/expansion_generated.go diff --git a/v2/pkg/client/listers/kubeflow/v2beta1/mpijob.go b/pkg/client/listers/kubeflow/v2beta1/mpijob.go similarity index 100% rename from v2/pkg/client/listers/kubeflow/v2beta1/mpijob.go rename to pkg/client/listers/kubeflow/v2beta1/mpijob.go diff --git a/v2/pkg/controller/mpi_job_controller.go b/pkg/controller/mpi_job_controller.go similarity index 100% rename from v2/pkg/controller/mpi_job_controller.go rename to pkg/controller/mpi_job_controller.go diff --git a/v2/pkg/controller/mpi_job_controller_status.go b/pkg/controller/mpi_job_controller_status.go similarity index 100% rename from v2/pkg/controller/mpi_job_controller_status.go rename to pkg/controller/mpi_job_controller_status.go diff --git a/v2/pkg/controller/mpi_job_controller_test.go b/pkg/controller/mpi_job_controller_test.go similarity index 100% rename from v2/pkg/controller/mpi_job_controller_test.go rename to pkg/controller/mpi_job_controller_test.go diff --git a/v2/pkg/version/version.go b/pkg/version/version.go similarity index 100% rename from v2/pkg/version/version.go rename to pkg/version/version.go diff --git a/v2/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go similarity index 99% rename from v2/test/e2e/e2e_suite_test.go rename to test/e2e/e2e_suite_test.go index 072de973..accc9dfd 100644 --- a/v2/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -45,7 +45,7 @@ const ( defaultKindImage = "kindest/node:v1.21.2" openMPIImage = "mpioperator/mpi-pi:openmpi" intelMPIImage = "mpioperator/mpi-pi:intel" - rootPath = "../../.." + rootPath = "../.." kubectlPath = rootPath + "/bin/kubectl" operatorManifestsPath = rootPath + "/manifests/overlays/dev" diff --git a/v2/test/e2e/mpi_job_test.go b/test/e2e/mpi_job_test.go similarity index 100% rename from v2/test/e2e/mpi_job_test.go rename to test/e2e/mpi_job_test.go diff --git a/v2/test/integration/doc.go b/test/integration/doc.go similarity index 100% rename from v2/test/integration/doc.go rename to test/integration/doc.go diff --git a/v2/test/integration/main_test.go b/test/integration/main_test.go similarity index 98% rename from v2/test/integration/main_test.go rename to test/integration/main_test.go index 60d0f531..710bc1e3 100644 --- a/v2/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -41,7 +41,7 @@ var ( func TestMain(m *testing.M) { env := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "manifests", "base")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "manifests", "base")}, } var err error restConfig, err = env.Start() diff --git a/v2/test/integration/mpi_job_controller_test.go b/test/integration/mpi_job_controller_test.go similarity index 99% rename from v2/test/integration/mpi_job_controller_test.go rename to test/integration/mpi_job_controller_test.go index 0ca703e1..7a0bf003 100644 --- a/v2/test/integration/mpi_job_controller_test.go +++ b/test/integration/mpi_job_controller_test.go @@ -312,7 +312,7 @@ func startController(ctx context.Context, kClient kubernetes.Interface, mpiClien go kubeInformerFactory.Start(ctx.Done()) go mpiInformerFactory.Start(ctx.Done()) - go func () { + go func() { if err := ctrl.Run(1, ctx.Done()); err != nil { panic(err) }