Update imports
Signed-off-by: Yi Chen <github@chenyicn.net>
This commit is contained in:
parent
7a08001ee9
commit
12b97522ab
|
@ -49,18 +49,18 @@ import (
|
|||
ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
|
||||
schedulingv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
|
||||
|
||||
sparkoperator "github.com/kubeflow/spark-operator"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/controller/scheduledsparkapplication"
|
||||
"github.com/kubeflow/spark-operator/internal/controller/sparkapplication"
|
||||
"github.com/kubeflow/spark-operator/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/kubescheduler"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/volcano"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/yunikorn"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
sparkoperator "github.com/kubeflow/spark-operator/v2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/controller/scheduledsparkapplication"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/controller/sparkapplication"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/kubescheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/volcano"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/yunikorn"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -22,9 +22,9 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/kubeflow/spark-operator/cmd/operator/controller"
|
||||
"github.com/kubeflow/spark-operator/cmd/operator/version"
|
||||
"github.com/kubeflow/spark-operator/cmd/operator/webhook"
|
||||
"github.com/kubeflow/spark-operator/v2/cmd/operator/controller"
|
||||
"github.com/kubeflow/spark-operator/v2/cmd/operator/version"
|
||||
"github.com/kubeflow/spark-operator/v2/cmd/operator/webhook"
|
||||
)
|
||||
|
||||
func NewCommand() *cobra.Command {
|
||||
|
|
|
@ -19,7 +19,7 @@ package version
|
|||
import (
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
sparkoperator "github.com/kubeflow/spark-operator"
|
||||
sparkoperator "github.com/kubeflow/spark-operator/v2"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -48,15 +48,15 @@ import (
|
|||
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
|
||||
ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
|
||||
|
||||
sparkoperator "github.com/kubeflow/spark-operator"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/controller/mutatingwebhookconfiguration"
|
||||
"github.com/kubeflow/spark-operator/internal/controller/validatingwebhookconfiguration"
|
||||
"github.com/kubeflow/spark-operator/internal/webhook"
|
||||
"github.com/kubeflow/spark-operator/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
sparkoperator "github.com/kubeflow/spark-operator/v2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/controller/mutatingwebhookconfiguration"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/controller/validatingwebhookconfiguration"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/webhook"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/controller"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/certificate"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -41,9 +41,9 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -28,8 +28,8 @@ import (
|
|||
"k8s.io/utils/clock"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("ScheduledSparkApplication Controller", func() {
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
// EventFilter filters out ScheduledSparkApplication events.
|
||||
|
|
|
@ -25,7 +25,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/handler"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
// EventHandler handles events for ScheduledSparkApplication.
|
||||
|
|
|
@ -32,8 +32,8 @@ import (
|
|||
logf "sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log/zap"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -41,14 +41,14 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/kubescheduler"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/volcano"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/yunikorn"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/kubescheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/volcano"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/yunikorn"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -31,10 +31,10 @@ import (
|
|||
"k8s.io/client-go/tools/record"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/controller/sparkapplication"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/controller/sparkapplication"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("SparkApplication Controller", func() {
|
||||
|
|
|
@ -29,9 +29,9 @@ import (
|
|||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// SparkService encapsulates information about the driver UI service.
|
||||
|
|
|
@ -27,8 +27,8 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// sparkPodEventFilter filters Spark pod events.
|
||||
|
|
|
@ -27,10 +27,10 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/handler"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/metrics"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// SparkPodEventHandler watches Spark pods and update the SparkApplication objects accordingly.
|
||||
|
|
|
@ -28,9 +28,9 @@ import (
|
|||
"k8s.io/client-go/util/retry"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
func configPrometheusMonitoring(app *v1beta2.SparkApplication, client client.Client) error {
|
||||
|
|
|
@ -23,9 +23,9 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// submission includes information of a Spark application to be submitted.
|
||||
|
|
|
@ -30,9 +30,9 @@ package sparkapplication
|
|||
// "k8s.io/apimachinery/pkg/api/resource"
|
||||
// metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
// "github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
// "github.com/kubeflow/spark-operator/pkg/common"
|
||||
// "github.com/kubeflow/spark-operator/pkg/util"
|
||||
// "github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
// "github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
// "github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
// )
|
||||
|
||||
// const (
|
||||
|
|
|
@ -32,8 +32,8 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log/zap"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -21,9 +21,9 @@ import (
|
|||
"net/url"
|
||||
"strconv"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
func (r *Reconciler) createWebUIService(app *v1beta2.SparkApplication) (*SparkService, error) {
|
||||
|
|
|
@ -28,7 +28,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/controller"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/certificate"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -23,9 +23,9 @@ import (
|
|||
"github.com/prometheus/client_golang/prometheus"
|
||||
"sigs.k8s.io/controller-runtime/pkg/metrics"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
type SparkApplicationMetrics struct {
|
||||
|
|
|
@ -21,9 +21,9 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
"sigs.k8s.io/controller-runtime/pkg/metrics"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
type SparkExecutorMetrics struct {
|
||||
|
|
|
@ -28,9 +28,9 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
schedulingv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -19,7 +19,7 @@ package kubescheduler
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
func getPodGroupName(app *v1beta2.SparkApplication) string {
|
||||
|
|
|
@ -19,7 +19,7 @@ package scheduler
|
|||
import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -29,10 +29,10 @@ import (
|
|||
"volcano.sh/apis/pkg/apis/scheduling/v1beta1"
|
||||
volcanoclientset "volcano.sh/apis/pkg/client/clientset/versioned"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -22,8 +22,8 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
func TestGetDriverResource(t *testing.T) {
|
||||
|
|
|
@ -19,7 +19,7 @@ package volcano
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
func getPodGroupName(app *v1beta2.SparkApplication) string {
|
||||
|
|
|
@ -21,8 +21,8 @@ import (
|
|||
"math"
|
||||
"strconv"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
func isJavaApp(appType v1beta2.SparkApplicationType) bool {
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
func cpuRequest(cores *int32, coreRequest *string) (string, error) {
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
func TestCpuRequest(t *testing.T) {
|
||||
|
|
|
@ -23,10 +23,10 @@ import (
|
|||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/internal/scheduler/yunikorn/resourceusage"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler"
|
||||
"github.com/kubeflow/spark-operator/v2/internal/scheduler/yunikorn/resourceusage"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -23,8 +23,8 @@ import (
|
|||
"github.com/stretchr/testify/assert"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
func TestSchedule(t *testing.T) {
|
||||
|
|
|
@ -26,9 +26,9 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var javaStringSuffixes = map[string]int64{
|
||||
|
|
|
@ -22,7 +22,7 @@ import (
|
|||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
// +kubebuilder:webhook:admissionReviewVersions=v1,failurePolicy=fail,groups=sparkoperator.k8s.io,matchPolicy=Exact,mutating=false,name=mutate-scheduledsparkapplication.sparkoperator.k8s.io,path=/validate-sparkoperator-k8s-io-v1beta2-sparkapplication,reinvocationPolicy=Never,resources=scheduledsparkapplications,sideEffects=None,verbs=create;update,versions=v1beta2,webhookVersions=v1
|
||||
|
|
|
@ -22,7 +22,7 @@ import (
|
|||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
)
|
||||
|
||||
// NOTE: The 'path' attribute must follow a specific pattern and should not be modified directly here.
|
||||
|
|
|
@ -23,9 +23,9 @@ import (
|
|||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// +kubebuilder:webhook:admissionReviewVersions=v1,failurePolicy=fail,groups=sparkoperator.k8s.io,matchPolicy=Exact,mutating=true,name=mutate-sparkapplication.sparkoperator.k8s.io,path=/mutate-sparkoperator-k8s-io-v1beta2-sparkapplication,reinvocationPolicy=Never,resources=sparkapplications,sideEffects=None,verbs=create;update,versions=v1beta2,webhookVersions=v1
|
||||
|
|
|
@ -26,8 +26,8 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
// NOTE: The 'path' attribute must follow a specific pattern and should not be modified directly here.
|
||||
|
|
|
@ -29,9 +29,9 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -25,8 +25,8 @@ import (
|
|||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
func TestPatchSparkPod_OwnerReference(t *testing.T) {
|
||||
|
|
|
@ -40,8 +40,8 @@ import (
|
|||
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
|
||||
"sigs.k8s.io/controller-runtime/pkg/webhook"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ import (
|
|||
"k8s.io/client-go/util/cert"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -30,8 +30,8 @@ import (
|
|||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
var _ = Describe("Certificate Provider", func() {
|
||||
|
|
|
@ -32,8 +32,8 @@ import (
|
|||
logf "sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log/zap"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ import (
|
|||
|
||||
"k8s.io/client-go/util/cert"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
func NewPrivateKey() (*rsa.PrivateKey, error) {
|
||||
|
|
|
@ -25,8 +25,8 @@ import (
|
|||
|
||||
"k8s.io/client-go/util/cert"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/certificate"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
func TestNewPrivateKey(t *testing.T) {
|
||||
|
|
|
@ -28,8 +28,8 @@ import (
|
|||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
// GetDriverPodName returns name of the driver pod of the given spark application.
|
||||
|
|
|
@ -25,9 +25,9 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("GetDriverPodName", func() {
|
||||
|
|
|
@ -19,7 +19,7 @@ package util
|
|||
import (
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
// IsLaunchedBySparkOperator returns whether the given pod is launched by the Spark Operator.
|
||||
|
|
|
@ -23,8 +23,8 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("IsLaunchedBySparkOperator", func() {
|
||||
|
|
|
@ -25,7 +25,7 @@ import (
|
|||
"golang.org/x/mod/semver"
|
||||
"sigs.k8s.io/yaml"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
)
|
||||
|
||||
var unitMap = map[string]string{
|
||||
|
|
|
@ -24,8 +24,8 @@ import (
|
|||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("GetMasterURL", func() {
|
||||
|
|
|
@ -33,9 +33,9 @@ import (
|
|||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/apimachinery/pkg/util/yaml"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/common"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
)
|
||||
|
||||
var _ = Describe("Example SparkApplication", func() {
|
||||
|
|
|
@ -46,9 +46,9 @@ import (
|
|||
logf "sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log/zap"
|
||||
|
||||
"github.com/kubeflow/spark-operator/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/pkg/util"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta1"
|
||||
"github.com/kubeflow/spark-operator/v2/api/v1beta2"
|
||||
"github.com/kubeflow/spark-operator/v2/pkg/util"
|
||||
// +kubebuilder:scaffold:imports
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue