Remove DefaultForTaskType field from plugin entries (flyteorg#248)

* deprecate enbaled-plugins configuration Signed-off-by: Daniel Rammer <daniel@union.ai> * removed DefaultForTaskType field from plugin entries Signed-off-by: Daniel Rammer <daniel@union.ai> * fixed compilation issues Signed-off-by: Daniel Rammer <daniel@union.ai> * fixed setting default configuration Signed-off-by: Daniel Rammer <daniel@union.ai> * generated new config flags Signed-off-by: Daniel Rammer <daniel@union.ai> * removed EnabledPlugins field Signed-off-by: Daniel Rammer <daniel@union.ai>
eapolinario · Mar 2, 2022 · 9e00636 · 9e00636
1 parent 5a80da6
commit 9e00636
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 213 deletions.
diff --git a/go/tasks/config/config.go b/go/tasks/config/config.go
@@ -2,12 +2,8 @@ package config
 
 import (
 	"github.com/flyteorg/flytestdlib/config"
-
-	"github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/utils"
 )
 
-//go:generate pflags Config
-
 const configSectionKey = "plugins"
 
 var (
@@ -18,12 +14,6 @@ var (
 
 // Top level plugins config.
 type Config struct {
-	EnabledPlugins []string `json:"enabled-plugins" pflag:"[]string{\"*\"},List of enabled plugins, default value is to enable all plugins."`
-}
-
-func (cfg Config) IsEnabled(pluginToCheck string) bool {
-	return cfg.EnabledPlugins != nil && len(cfg.EnabledPlugins) >= 1 &&
-		(cfg.EnabledPlugins[0] == "*" || utils.Contains(cfg.EnabledPlugins, pluginToCheck))
 }
 
 // Retrieves the current config value or default.

diff --git a/go/tasks/config/config_flags.go b/go/tasks/config/config_flags.go
diff --git a/go/tasks/config/config_flags_test.go b/go/tasks/config/config_flags_test.go
diff --git a/go/tasks/config_load_test.go b/go/tasks/config_load_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"
 
-	pluginsConfig "github.com/flyteorg/flyteplugins/go/tasks/config"
 	"github.com/flyteorg/flyteplugins/go/tasks/logs"
 	flyteK8sConfig "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/flytek8s/config"
 	"github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/spark"
@@ -28,10 +27,6 @@ func TestLoadConfig(t *testing.T) {
 	err := configAccessor.UpdateConfig(context.TODO())
 	assert.NoError(t, err)
 
-	t.Run("root-config-test", func(t *testing.T) {
-		assert.Equal(t, 1, len(pluginsConfig.GetConfig().EnabledPlugins))
-	})
-
 	t.Run("k8s-config-test", func(t *testing.T) {
 
 		k8sConfig := flyteK8sConfig.GetK8sPluginConfig()

diff --git a/go/tasks/pluginmachinery/core/plugin.go b/go/tasks/pluginmachinery/core/plugin.go
@@ -28,10 +28,6 @@ type PluginEntry struct {
 	// Boolean that indicates if this plugin can be used as the default for unknown task types. There can only be
 	// one default in the system
 	IsDefault bool
-	// A list of all task types for which this plugin should be default handler when multiple registered plugins
-	// support the same task type. This must be a subset of RegisteredTaskTypes and at most one default per task type
-	// is supported.
-	DefaultForTaskTypes []TaskType
 }
 
 // System level properties that this Plugin supports

diff --git a/go/tasks/pluginmachinery/flytek8s/testdata/config.yaml b/go/tasks/pluginmachinery/flytek8s/testdata/config.yaml
@@ -1,8 +1,5 @@
 # Sample plugins config
 plugins:
-  # Set of enabled plugins at root level
-  enabled-plugins:
-    - container
   # All k8s plugins default configuration
   k8s:
     scheduler-name: flyte-scheduler

diff --git a/go/tasks/pluginmachinery/k8s/plugin.go b/go/tasks/pluginmachinery/k8s/plugin.go
@@ -28,10 +28,6 @@ type PluginEntry struct {
 	// Boolean that indicates if this plugin can be used as the default for unknown task types. There can only be
 	// one default in the system
 	IsDefault bool
-	// A list of all task types for which this plugin should be default handler when multiple registered plugins
-	// support the same task type. This must be a subset of RegisteredTaskTypes and at most one default per task type
-	// is supported.
-	DefaultForTaskTypes []pluginsCore.TaskType
 	// Returns a new KubeClient to be used instead of the internal controller-runtime client.
 	CustomKubeClient func(ctx context.Context) (pluginsCore.KubeClient, error)
 }

diff --git a/go/tasks/plugins/array/awsbatch/executor.go b/go/tasks/plugins/array/awsbatch/executor.go
@@ -192,7 +192,6 @@ func init() {
 			RegisteredTaskTypes: []core.TaskType{arrayTaskType, array.AwsBatchTaskType},
 			LoadPlugin:          createNewExecutorPlugin,
 			IsDefault:           false,
-			DefaultForTaskTypes: []core.TaskType{arrayTaskType, array.AwsBatchTaskType},
 		})
 }
 

diff --git a/go/tasks/plugins/hive/executor.go b/go/tasks/plugins/hive/executor.go
@@ -163,6 +163,5 @@ func init() {
 			RegisteredTaskTypes: []core.TaskType{hiveTaskType},
 			LoadPlugin:          QuboleHiveExecutorLoader,
 			IsDefault:           false,
-			DefaultForTaskTypes: []core.TaskType{hiveTaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go b/go/tasks/plugins/k8s/kfoperators/mpi/mpi.go
@@ -161,6 +161,5 @@ func init() {
 			ResourceToWatch:     &mpi.MPIJob{},
 			Plugin:              mpiOperatorResourceHandler{},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{common.MPITaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go b/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch.go
@@ -142,6 +142,5 @@ func init() {
 			ResourceToWatch:     &ptOp.PyTorchJob{},
 			Plugin:              pytorchOperatorResourceHandler{},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{common.PytorchTaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go b/go/tasks/plugins/k8s/kfoperators/tensorflow/tensorflow.go
@@ -155,6 +155,5 @@ func init() {
 			ResourceToWatch:     &tfOp.TFJob{},
 			Plugin:              tensorflowOperatorResourceHandler{},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{common.TensorflowTaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/pod/plugin.go b/go/tasks/plugins/k8s/pod/plugin.go
@@ -144,7 +144,6 @@ func init() {
 			ResourceToWatch:     &v1.Pod{},
 			Plugin:              podPlugin,
 			IsDefault:           true,
-			DefaultForTaskTypes: []pluginsCore.TaskType{containerTaskType},
 		})
 
 	pluginmachinery.PluginRegistry().RegisterK8sPlugin(
@@ -154,7 +153,6 @@ func init() {
 			ResourceToWatch:     &v1.Pod{},
 			Plugin:              podPlugin,
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{sidecarTaskType},
 		})
 
 	// register podTaskType plugin entry
@@ -165,6 +163,5 @@ func init() {
 			ResourceToWatch:     &v1.Pod{},
 			Plugin:              podPlugin,
 			IsDefault:           true,
-			DefaultForTaskTypes: []pluginsCore.TaskType{containerTaskType, sidecarTaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/sagemaker/plugin.go b/go/tasks/plugins/k8s/sagemaker/plugin.go
@@ -81,7 +81,6 @@ func init() {
 			ResourceToWatch:     &hpojobv1.HyperparameterTuningJob{},
 			Plugin:              awsSagemakerPlugin{TaskType: hyperparameterTuningJobTaskType},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{hyperparameterTuningJobTaskType},
 		})
 
 	// Registering the plugin for standalone TrainingJob
@@ -92,7 +91,6 @@ func init() {
 			ResourceToWatch:     &trainingjobv1.TrainingJob{},
 			Plugin:              awsSagemakerPlugin{TaskType: trainingJobTaskType},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{trainingJobTaskType},
 		})
 
 	// Registering the plugin for custom TrainingJob
@@ -103,6 +101,5 @@ func init() {
 			ResourceToWatch:     &trainingjobv1.TrainingJob{},
 			Plugin:              awsSagemakerPlugin{TaskType: customTrainingJobTaskType},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{customTrainingJobTaskType},
 		})
 }
diff --git a/go/tasks/plugins/k8s/spark/spark.go b/go/tasks/plugins/k8s/spark/spark.go
@@ -445,7 +445,6 @@ func init() {
 			ResourceToWatch:     &sparkOp.SparkApplication{},
 			Plugin:              sparkResourceHandler{},
 			IsDefault:           false,
-			DefaultForTaskTypes: []pluginsCore.TaskType{sparkTaskType},
 		})
 }
 

diff --git a/go/tasks/plugins/presto/executor.go b/go/tasks/plugins/presto/executor.go
@@ -153,6 +153,5 @@ func init() {
 			RegisteredTaskTypes: []core.TaskType{prestoTaskType},
 			LoadPlugin:          ExecutorLoader,
 			IsDefault:           false,
-			DefaultForTaskTypes: []core.TaskType{prestoTaskType},
 		})
 }
diff --git a/go/tasks/testdata/config.yaml b/go/tasks/testdata/config.yaml
@@ -1,8 +1,5 @@
 # Sample plugins config
 plugins:
-  # Set of enabled plugins at root level
-  enabled-plugins:
-    - container
   # All k8s plugins default configuration
   sagemaker:
     roleArn: test-role