Add clientset for MPIJob, PytorchJob, MXJob, and XGBoostJob (#1610)

Makefile

@@ -1,4 +1,3 @@
-
 # Image URL to use all building/pushing image targets
 IMG ?= kubeflow/training-operator:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
@@ -45,6 +44,7 @@ generate: controller-gen ## Generate apidoc, sdk and code containing DeepCopy, D
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/..."
 	hack/update-codegen.sh
 	hack/python-sdk/gen-sdk.sh
+	$(MAKE) apidoc
 
 apidoc:
 	hack/generate-apidoc.sh
@@ -69,7 +69,7 @@ HAS_SETUP_ENVTEST := $(shell command -v setup-envtest;)
 testall: manifests generate fmt vet golangci-lint test ## Run tests.
 
 test: envtest
-	KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell setup-envtest --arch=amd64 use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
 envtest:
 ifndef HAS_SETUP_ENVTEST

PROJECT

@@ -9,30 +9,30 @@ resources:
   controller: true
   group: kubeflow.org
   kind: XGBoostJob
-  path: github.com/kubeflow/training-operator/pkg/apis/xgboost/v1
+  path: github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1
   version: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   group: kubeflow.org
   kind: PyTorchJob
-  path: github.com/kubeflow/training-operator/pkg/apis/pytorch/v1
+  path: github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1
   version: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   group: kubeflow.org
   kind: TFJob
-  path: github.com/kubeflow/training-operator/pkg/apis/tensorflow/v1
+  path: github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1
   version: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   group: kubeflow.org
   kind: MXJob
-  path: github.com/kubeflow/training-operator/pkg/apis/mxnet/v1
+  path: github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1
   version: v1
 version: "3"

README.md

@@ -12,11 +12,11 @@ run distributed or non-distributed TensorFlow/PyTorch/Apache MXNet/XGBoost/MPI j
 > Note: Before v1.2 release, Kubeflow Training Operator only supports TFJob on Kubernetes.
 
 - For a complete reference of the custom resource definitions, please refer to the API Definition.
-  - [TensorFlow API Definition](pkg/apis/tensorflow/v1/types.go)
-  - [PyTorch API Definition](pkg/apis/pytorch/v1/types.go)
-  - [Apache MXNet API Definition](pkg/apis/mxnet/v1/types.go)
-  - [XGBoost API Definition](pkg/apis/xgboost/v1/types.go)
-  - [MPI API Definition](pkg/apis/mpi/v1/types.go)
+  - [TensorFlow API Definition](pkg/apis/kubeflow.org/v1/tensorflow_types.go)
+  - [PyTorch API Definition](pkg/apis/kubeflow.org/v1/pytorch_types.go)
+  - [Apache MXNet API Definition](pkg/apis/kubeflow.org/v1/mxnet_types.go)
+  - [XGBoost API Definition](pkg/apis/kubeflow.org/v1/xgboost_types.go)
+  - [MPI API Definition](pkg/apis/kubeflow.org/v1/mpi_types.go)
 - For details on API design, please refer to the [v1alpha2 design doc](https://github.com/kubeflow/community/blob/master/proposals/tf-operator-design-v1alpha2.md).
 - For details of all-in-one operator design, please refer to the [All-in-one Kubeflow Training Operator](https://docs.google.com/document/d/1x1JPDQfDMIbnoQRftDH1IzGU0qvHGSU4W6Jl4rJLPhI/edit#heading=h.e33ufidnl8z6)
 - For details on its observability, please refer to the [monitoring design doc](docs/monitoring/README.md).
@@ -67,11 +67,7 @@ Please refer to the [quick-start-v1.md](docs/quick-start-v1.md) and [Kubeflow Tr
 
 Please refer to following API Documentation:
 
-- [TensorFlow API Documentation](docs/api/tensorflow_generated.asciidoc)
-- [PyTorch API Documentation](docs/api/pytorch_generated.asciidoc)
-- [Apache MXNet API Documentation](docs/api/mxnet_generated.asciidoc)
-- [XGBoost API Documentation](docs/api/xgboost_generated.asciidoc)
-- [MPI API Documentation](docs/api/mpi_generated.asciidoc)
+- [Kubeflow.org v1 API Documentation](docs/api/kubeflow.org_v1_generated.asciidoc)
 
 ## Community
 

cmd/training-operator.v1/main.go

@@ -31,11 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	commonutil "github.com/kubeflow/common/pkg/util"
-	mpiv1 "github.com/kubeflow/training-operator/pkg/apis/mpi/v1"
-	mxnetv1 "github.com/kubeflow/training-operator/pkg/apis/mxnet/v1"
-	pytorchv1 "github.com/kubeflow/training-operator/pkg/apis/pytorch/v1"
-	tensorflowv1 "github.com/kubeflow/training-operator/pkg/apis/tensorflow/v1"
-	xgboostv1 "github.com/kubeflow/training-operator/pkg/apis/xgboost/v1"
+	kubeflowv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1"
 	"github.com/kubeflow/training-operator/pkg/config"
 	controllerv1 "github.com/kubeflow/training-operator/pkg/controller.v1"
 	//+kubebuilder:scaffold:imports
@@ -48,11 +44,7 @@ var (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(xgboostv1.AddToScheme(scheme))
-	utilruntime.Must(pytorchv1.AddToScheme(scheme))
-	utilruntime.Must(tensorflowv1.AddToScheme(scheme))
-	utilruntime.Must(mxnetv1.AddToScheme(scheme))
-	utilruntime.Must(mpiv1.AddToScheme(scheme))
+	utilruntime.Must(kubeflowv1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

docs/api/autogen/config.yaml

@@ -1,2 +1,2 @@
 render:
-  kubernetesVersion: "1.19"
+  kubernetesVersion: "1.22"