chore: removed deprecated kubelet executor. Fixes #7803 (#8215)

* chore: remove deprecated kubelet executor. Fixes #7803 Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * chore: removed kubelet refs Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * chore: remove BaseLayerArtifact refs Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * fix: restore manifests Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * fix: cleanup Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * fix: removed unused vars Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * docs: updated workflow-controller-configmap.yaml Signed-off-by: Rohan Kumar <rohankmr414@gmail.com> * docs: updated workflow-executors.md Signed-off-by: Rohan Kumar <rohankmr414@gmail.com>
argoproj · Mar 27, 2022 · 8dbd45c · 8dbd45c
1 parent 800a247
commit 8dbd45c
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 533 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -108,9 +108,6 @@ jobs:
           - test: test-executor
             containerRuntimeExecutor: emissary
             profile: minimal
-          - test: test-executor
-            containerRuntimeExecutor: kubelet
-            profile: minimal
           - test: test-executor
             containerRuntimeExecutor: pns
             profile: minimal

diff --git a/cmd/argoexec/commands/root.go b/cmd/argoexec/commands/root.go
@@ -24,7 +24,6 @@ import (
 	"github.com/argoproj/argo-workflows/v3/workflow/common"
 	"github.com/argoproj/argo-workflows/v3/workflow/executor"
 	"github.com/argoproj/argo-workflows/v3/workflow/executor/emissary"
-	"github.com/argoproj/argo-workflows/v3/workflow/executor/kubelet"
 	"github.com/argoproj/argo-workflows/v3/workflow/executor/pns"
 )
 
@@ -112,8 +111,6 @@ func initExecutor() *executor.WorkflowExecutor {
 	var cre executor.ContainerRuntimeExecutor
 	log.Infof("Creating a %s executor", executorType)
 	switch executorType {
-	case common.ContainerRuntimeExecutorKubelet:
-		cre, err = kubelet.NewKubeletExecutor(namespace, podName)
 	case common.ContainerRuntimeExecutorPNS:
 		cre, err = pns.NewPNSExecutor(clientset, podName, namespace)
 	default:

diff --git a/config/config.go b/config/config.go
@@ -37,12 +37,6 @@ type Config struct {
 
 	ContainerRuntimeExecutors ContainerRuntimeExecutors `json:"containerRuntimeExecutors,omitempty"`
 
-	// KubeletPort is needed when using the kubelet containerRuntimeExecutor, default to 10250
-	KubeletPort int `json:"kubeletPort,omitempty"`
-
-	// KubeletInsecure disable the TLS verification of the kubelet containerRuntimeExecutor, default to false
-	KubeletInsecure bool `json:"kubeletInsecure,omitempty"`
-
 	// ArtifactRepository contains the default location of an artifact repository for container artifacts
 	ArtifactRepository wfv1.ArtifactRepository `json:"artifactRepository,omitempty"`
 

diff --git a/docs/workflow-controller-configmap.yaml b/docs/workflow-controller-configmap.yaml
@@ -172,7 +172,7 @@ data:
   # (available v2.4-v3.3)
   dockerSockPath: /var/someplace/else/docker.sock
 
-  # kubelet port when using kubelet executor (default: 10250)
+  # kubelet port when using kubelet executor (default: 10250) (kubelet executor will be deprecated use emissary instead)
   kubeletPort: 10250
 
   # disable the TLS verification of the kubelet executor (default: false)

diff --git a/docs/workflow-executors.md b/docs/workflow-executors.md
@@ -67,6 +67,8 @@ The emissary will exit with code 64 if it fails. This may indicate a bug in the
 
 ## Kubelet (kubelet)
 
+⚠️Deprecated.
+
 * Secure
     * No `privileged` access
     * Cannot escape the privileges of the pod's service account

diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go
@@ -854,7 +854,6 @@ func (s *ArgoServerSuite) TestWorkflowService() {
 	})
 
 	s.Run("Terminate", func() {
-		s.Need(fixtures.None(fixtures.Kubelet))
 		s.e().PUT("/api/v1/workflows/argo/" + name + "/terminate").
 			Expect().
 			Status(200)
@@ -873,7 +872,6 @@ func (s *ArgoServerSuite) TestWorkflowService() {
 	})
 
 	s.Run("Resubmit", func() {
-		s.Need(fixtures.BaseLayerArtifacts)
 		s.e().PUT("/api/v1/workflows/argo/" + name + "/resubmit").
 			WithBytes([]byte(`{"memoized": true}`)).
 			Expect().
@@ -1347,7 +1345,6 @@ spec:
 	})
 
 	s.Run("Resubmit", func() {
-		s.Need(fixtures.BaseLayerArtifacts)
 		s.e().PUT("/api/v1/archived-workflows/{uid}/resubmit", uid).
 			WithBytes([]byte(`{"namespace": "argo", "memoized": false}`)).
 			Expect().

diff --git a/test/e2e/artifacts_test.go b/test/e2e/artifacts_test.go
@@ -36,7 +36,6 @@ func (s *ArtifactsSuite) TestOutputOnMount() {
 }
 
 func (s *ArtifactsSuite) TestOutputOnInput() {
-	s.Need(fixtures.BaseLayerArtifacts) // I believe this would work on both K8S and Kubelet, but validation does not allow it
 	s.Given().
 		Workflow("@testdata/output-on-input-workflow.yaml").
 		When().
@@ -45,7 +44,6 @@ func (s *ArtifactsSuite) TestOutputOnInput() {
 }
 
 func (s *ArtifactsSuite) TestArtifactPassing() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow("@smoke/artifact-passing.yaml").
 		When().
@@ -54,7 +52,6 @@ func (s *ArtifactsSuite) TestArtifactPassing() {
 }
 
 func (s *ArtifactsSuite) TestDefaultParameterOutputs() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow(`
 apiVersion: argoproj.io/v1alpha1
@@ -107,7 +104,6 @@ spec:
 }
 
 func (s *ArtifactsSuite) TestSameInputOutputPathOptionalArtifact() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow("@testdata/same-input-output-path-optional.yaml").
 		When().
@@ -146,7 +142,6 @@ func (s *ArtifactsSuite) TestMainLog() {
 				}
 			})
 	})
-	s.Need(fixtures.None(fixtures.Kubelet))
 	s.Run("ActiveDeadlineSeconds", func() {
 		s.Given().
 			Workflow("@expectedfailures/timeouts-step.yaml").

diff --git a/test/e2e/fixtures/needs.go b/test/e2e/fixtures/needs.go
@@ -10,12 +10,7 @@ var (
 	CI Need = func(s *E2ESuite) (bool, string) {
 		return os.Getenv("CI") != "", "CI"
 	}
-	BaseLayerArtifacts Need = func(s *E2ESuite) (bool, string) {
-		met, _ := None(Kubelet)(s)
-		return met, "base layer artifact support"
-	}
 	Emissary = Executor("emissary")
-	Kubelet  = Executor("kubelet")
 	PNS      = Executor("pns")
 )
 

diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
@@ -24,7 +24,6 @@ type FunctionalSuite struct {
 }
 
 func (s *FunctionalSuite) TestArchiveStrategies() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow(`@testdata/archive-strategies.yaml`).
 		When().
@@ -388,7 +387,6 @@ func (s *FunctionalSuite) TestEventOnPVCFail() {
 }
 
 func (s *FunctionalSuite) TestArtifactRepositoryRef() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow("@testdata/artifact-repository-ref.yaml").
 		When().
@@ -536,7 +534,6 @@ spec:
 }
 
 func (s *FunctionalSuite) TestParameterAggregation() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow("@functional/param-aggregation.yaml").
 		When().
@@ -860,7 +857,6 @@ spec:
 }
 
 func (s *FunctionalSuite) TestOutputArtifactS3BucketCreationEnabled() {
-	s.Need(fixtures.BaseLayerArtifacts)
 	s.Given().
 		Workflow("@testdata/output-artifact-with-s3-bucket-creation-enabled.yaml").
 		When().

diff --git a/test/e2e/run_as_not_root_test.go b/test/e2e/run_as_not_root_test.go
@@ -24,7 +24,6 @@ func (s *RunAsNonRootSuite) TestRunAsNonRootWorkflow() {
 }
 
 func (s *RunAsNonRootSuite) TestRunAsNonRootWithOutputParams() {
-	s.Need(fixtures.None(fixtures.Kubelet))
 	s.Given().
 		Workflow("@smoke/runasnonroot-output-params-pipeline.yaml").
 		When().

diff --git a/test/e2e/signals_test.go b/test/e2e/signals_test.go
@@ -24,12 +24,6 @@ type SignalsSuite struct {
 	fixtures.E2ESuite
 }
 
-func (s *SignalsSuite) SetupSuite() {
-	s.E2ESuite.SetupSuite()
-	// Because k8ssapi and kubelet execute `sh -c 'kill 15 1'` to they do not work.
-	s.Need(fixtures.None(fixtures.Kubelet))
-}
-
 func (s *SignalsSuite) TestStopBehavior() {
 	s.Given().
 		Workflow("@functional/stop-terminate.yaml").

diff --git a/workflow/common/common.go b/workflow/common/common.go
@@ -150,9 +150,6 @@ const (
 	// EnvAgentPatchRate is the rate that the Argo Agent will patch the Workflow TaskSet
 	EnvAgentPatchRate = "ARGO_AGENT_PATCH_RATE"
 
-	// ContainerRuntimeExecutorKubelet to use the kubelet as container runtime executor
-	ContainerRuntimeExecutorKubelet = "kubelet"
-
 	// ContainerRuntimeExecutorPNS indicates to use process namespace sharing as the container runtime executor
 	ContainerRuntimeExecutorPNS = "pns"
 

diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
@@ -7512,11 +7512,6 @@ func TestGetContainerRuntimeExecutor(t *testing.T) {
 		executor := controller.GetContainerRuntimeExecutor(labels.Set{})
 		assert.Equal(t, common.ContainerRuntimeExecutorEmissary, executor)
 	})
-	t.Run("CLIParameter", func(t *testing.T) {
-		controller.containerRuntimeExecutor = common.ContainerRuntimeExecutorKubelet
-		executor := controller.GetContainerRuntimeExecutor(labels.Set{})
-		assert.Equal(t, common.ContainerRuntimeExecutorKubelet, executor)
-	})
 	controller.Config.ContainerRuntimeExecutor = "pns"
 	controller.Config.ContainerRuntimeExecutors = config.ContainerRuntimeExecutors{
 		{

diff --git a/workflow/controller/workflowpod.go b/workflow/controller/workflowpod.go
@@ -601,27 +601,6 @@ func (woc *wfOperationCtx) createEnvVars() []apiv1.EnvVar {
 	if woc.controller.Config.Executor != nil {
 		execEnvVars = append(execEnvVars, woc.controller.Config.Executor.Env...)
 	}
-	switch woc.getContainerRuntimeExecutor() {
-	case common.ContainerRuntimeExecutorKubelet:
-		execEnvVars = append(execEnvVars,
-			apiv1.EnvVar{
-				Name: common.EnvVarDownwardAPINodeIP,
-				ValueFrom: &apiv1.EnvVarSource{
-					FieldRef: &apiv1.ObjectFieldSelector{
-						FieldPath: "status.hostIP",
-					},
-				},
-			},
-			apiv1.EnvVar{
-				Name:  common.EnvVarKubeletPort,
-				Value: strconv.Itoa(woc.controller.Config.KubeletPort),
-			},
-			apiv1.EnvVar{
-				Name:  common.EnvVarKubeletInsecure,
-				Value: strconv.FormatBool(woc.controller.Config.KubeletInsecure),
-			},
-		)
-	}
 	return execEnvVars
 }
 

diff --git a/workflow/controller/workflowpod_test.go b/workflow/controller/workflowpod_test.go
@@ -715,30 +715,6 @@ func TestVolumeAndVolumeMounts(t *testing.T) {
 		},
 	}
 
-	// For Kubelet executor
-	t.Run("Kubelet", func(t *testing.T) {
-		ctx := context.Background()
-		woc := newWoc()
-		woc.volumes = volumes
-		woc.execWf.Spec.Templates[0].Container.VolumeMounts = volumeMounts
-		woc.controller.Config.ContainerRuntimeExecutor = common.ContainerRuntimeExecutorKubelet
-
-		tmplCtx, err := woc.createTemplateContext(wfv1.ResourceScopeLocal, "")
-		assert.NoError(t, err)
-		_, err = woc.executeContainer(ctx, woc.execWf.Spec.Entrypoint, tmplCtx.GetTemplateScope(), &woc.execWf.Spec.Templates[0], &wfv1.WorkflowStep{}, &executeTemplateOpts{})
-		assert.NoError(t, err)
-		pods, err := listPods(woc)
-		assert.NoError(t, err)
-		assert.Len(t, pods.Items, 1)
-		pod := pods.Items[0]
-		assert.Equal(t, 2, len(pod.Spec.Volumes))
-		assert.Equal(t, "var-run-argo", pod.Spec.Volumes[0].Name)
-		assert.Equal(t, "volume-name", pod.Spec.Volumes[1].Name)
-		assert.Equal(t, 2, len(pod.Spec.Containers[1].VolumeMounts))
-		assert.Equal(t, "volume-name", pod.Spec.Containers[1].VolumeMounts[0].Name)
-		assert.Equal(t, "var-run-argo", pod.Spec.Containers[1].VolumeMounts[1].Name)
-	})
-
 	// For emissary executor
 	t.Run("Emissary", func(t *testing.T) {
 		ctx := context.Background()

diff --git a/workflow/executor/executor.go b/workflow/executor/executor.go
@@ -507,12 +507,6 @@ func (we *WorkflowExecutor) SaveParameters(ctx context.Context) error {
 
 		var output *wfv1.AnyString
 		if we.isBaseImagePath(param.ValueFrom.Path) {
-			executorType := os.Getenv(common.EnvVarContainerRuntimeExecutor)
-			if executorType == common.ContainerRuntimeExecutorKubelet {
-				log.Infof("Copying output parameter %s from base image layer %s is not supported for kubelet executor. "+
-					"Consider using an emptyDir volume: https://argoproj.github.io/argo-workflows/empty-dir/.", param.Name, param.ValueFrom.Path)
-				continue
-			}
 			log.Infof("Copying %s from base image layer", param.ValueFrom.Path)
 			fileContents, err := we.RuntimeExecutor.GetFileContents(common.MainContainerName, param.ValueFrom.Path)
 			if err != nil {