Do not restart VPC CNI DaemonSet pods

Author: cPu1

pkg/eks/tasks.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
@@ -16,10 +15,7 @@ import (
 
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/weaveworks/eksctl/pkg/actions/irsa"
@@ -184,43 +180,6 @@ func newEFADevicePluginTask(
 	return &t
 }
 
-type restartDaemonsetTask struct {
-	name            string
-	namespace       string
-	clusterProvider *ClusterProvider
-	spec            *api.ClusterConfig
-}
-
-func (t *restartDaemonsetTask) Describe() string {
-	return fmt.Sprintf(`restart daemonset "%s/%s"`, t.namespace, t.name)
-}
-
-func (t *restartDaemonsetTask) Do(errCh chan error) error {
-	defer close(errCh)
-	clientSet, err := t.clusterProvider.NewStdClientSet(t.spec)
-	if err != nil {
-		return err
-	}
-	ds := clientSet.AppsV1().DaemonSets(t.namespace)
-	dep, err := ds.Get(context.TODO(), t.name, metav1.GetOptions{})
-	if err != nil {
-		return err
-	}
-	if dep.Spec.Template.Annotations == nil {
-		dep.Spec.Template.Annotations = make(map[string]string)
-	}
-	dep.Spec.Template.Annotations["eksctl.io/restartedAt"] = time.Now().Format(time.RFC3339)
-	bytes, err := runtime.Encode(unstructured.UnstructuredJSONScheme, dep)
-	if err != nil {
-		return errors.Wrapf(err, "failed to marshal %q deployment", t.name)
-	}
-	if _, err := ds.Patch(context.TODO(), t.name, types.MergePatchType, bytes, metav1.PatchOptions{}); err != nil {
-		return errors.Wrap(err, "failed to patch deployment")
-	}
-	logger.Info(`daemonset "%s/%s" restarted`, t.namespace, t.name)
-	return nil
-}
-
 // CreateExtraClusterConfigTasks returns all tasks for updating cluster configuration
 func (c *ClusterProvider) CreateExtraClusterConfigTasks(ctx context.Context, cfg *api.ClusterConfig) *tasks.TaskTree {
 	newTasks := &tasks.TaskTree{
@@ -464,10 +423,4 @@ func (c *ClusterProvider) appendCreateTasksForIAMServiceAccounts(ctx context.Con
 	)
 	newTasks.IsSubTask = true
 	tasks.Append(newTasks)
-	tasks.Append(&restartDaemonsetTask{
-		namespace:       "kube-system",
-		name:            "aws-node",
-		clusterProvider: c,
-		spec:            cfg,
-	})
 }