add to scope

Author: alam0rt

pkg/cloud/scope/managedcontrolplane.go

@@ -430,6 +430,11 @@ func (s *ManagedControlPlaneScope) BootstrapSelfManagedAddons() *bool {
 	return &s.ControlPlane.Spec.BootstrapSelfManagedAddons
 }
 
+// PreserveAddons returns whether the AWS EKS addons should be preserved in the case of removal from the manifest.
+func (s *ManagedControlPlaneScope) PreserveAddons() *bool {
+	return &s.ControlPlane.Spec.PreserveAddons
+}
+
 // VpcCni returns a list of environment variables to apply to the `aws-node` DaemonSet.
 func (s *ManagedControlPlaneScope) VpcCni() ekscontrolplanev1.VpcCni {
 	return s.ControlPlane.Spec.VpcCni

pkg/eks/addons/plan.go

@@ -28,13 +28,14 @@ import (
 )
 
 // NewPlan creates a new Plan to manage EKS addons.
-func NewPlan(clusterName string, desiredAddons, installedAddons []*EKSAddon, client eks.Client, maxWait time.Duration) planner.Plan {
+func NewPlan(clusterName string, desiredAddons, installedAddons []*EKSAddon, client eks.Client, maxWait time.Duration, preserveOnDelete bool) planner.Plan {
 	return &plan{
 		installedAddons:           installedAddons,
 		desiredAddons:             desiredAddons,
 		eksClient:                 client,
 		clusterName:               clusterName,
 		maxWaitActiveUpdateDelete: maxWait,
+		preserveOnDelete:          preserveOnDelete,
 	}
 }
 
@@ -45,6 +46,7 @@ type plan struct {
 	eksClient                 eks.Client
 	clusterName               string
 	maxWaitActiveUpdateDelete time.Duration
+	preserveOnDelete          bool
 }
 
 // Create will create the plan (i.e. list of procedures) for managing EKS addons.

pkg/eks/addons/procedures.go

@@ -49,6 +49,7 @@ func (p *DeleteAddonProcedure) Do(ctx context.Context) error {
 	input := &eks.DeleteAddonInput{
 		AddonName:   aws.String(p.name),
 		ClusterName: aws.String(p.plan.clusterName),
+		Preserve:    p.plan.preserveOnDelete,
 	}
 
 	if _, err := p.plan.eksClient.DeleteAddon(ctx, input); err != nil {