From 153728a50f7cd21751560ddf9328a38ea43ea263 Mon Sep 17 00:00:00 2001
From: "Robin D." <comtalyst@outlook.com>
Date: Mon, 28 Oct 2024 15:14:29 -0700
Subject: [PATCH] fix: follow-up fixes on bootstrappingclient mode (#544)

---
 .../provisionclientbootstrap.go                    | 10 ++--------
 pkg/providers/imagefamily/resolver.go              | 14 ++++++++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkg/providers/imagefamily/customscriptsbootstrap/provisionclientbootstrap.go b/pkg/providers/imagefamily/customscriptsbootstrap/provisionclientbootstrap.go
index b346bed0f..709afffdc 100644
--- a/pkg/providers/imagefamily/customscriptsbootstrap/provisionclientbootstrap.go
+++ b/pkg/providers/imagefamily/customscriptsbootstrap/provisionclientbootstrap.go
@@ -67,6 +67,7 @@ type ProvisionClientBootstrap struct {
 
 var _ Bootstrapper = (*ProvisionClientBootstrap)(nil) // assert ProvisionClientBootstrap implements customscriptsbootstrapper
 
+// nolint gocyclo - will be refactored later
 func (p ProvisionClientBootstrap) GetCustomDataAndCSE(ctx context.Context) (string, string, error) {
 	if p.IsWindows {
 		// TODO(Windows)
@@ -120,16 +121,9 @@ func (p ProvisionClientBootstrap) GetCustomDataAndCSE(ctx context.Context) (stri
 
 	if p.KubeletConfig != nil {
 		provisionProfile.CustomKubeletConfig = &models.CustomKubeletConfig{
-			// CPUManagerPolicy:      lo.ToPtr(p.KubeletConfig.CPUManagerPolicy),
-			CPUCfsQuota: p.KubeletConfig.CPUCFSQuota,
-			// CPUCfsQuotaPeriod:     lo.ToPtr(p.KubeletConfig.CPUCFSQuotaPeriod.String()),
+			CPUCfsQuota:          p.KubeletConfig.CPUCFSQuota,
 			ImageGcHighThreshold: p.KubeletConfig.ImageGCHighThresholdPercent,
 			ImageGcLowThreshold:  p.KubeletConfig.ImageGCLowThresholdPercent,
-			// TopologyManagerPolicy: lo.ToPtr(p.KubeletConfig.TopologyManagerPolicy),
-			// AllowedUnsafeSysctls:  p.KubeletConfig.AllowedUnsafeSysctls,
-			// ContainerLogMaxSizeMB: convertContainerLogMaxSizeToMB(p.KubeletConfig.ContainerLogMaxSize),
-			// ContainerLogMaxFiles:  p.KubeletConfig.ContainerLogMaxFiles,
-			// PodMaxPids:            convertPodMaxPids(p.KubeletConfig.PodPidsLimit),
 		}
 	}
 
diff --git a/pkg/providers/imagefamily/resolver.go b/pkg/providers/imagefamily/resolver.go
index 91a8a6fa6..d416f4f28 100644
--- a/pkg/providers/imagefamily/resolver.go
+++ b/pkg/providers/imagefamily/resolver.go
@@ -86,9 +86,11 @@ func (r Resolver) Resolve(ctx context.Context, nodeClass *v1alpha2.AKSNodeClass,
 
 	logging.FromContext(ctx).Infof("Resolved image %s for instance type %s", imageID, instanceType.Name)
 
-	taints := lo.Flatten([][]corev1.Taint{
-		nodeClaim.Spec.Taints,
-		nodeClaim.Spec.StartupTaints,
+	generalTaints := nodeClaim.Spec.Taints
+	startupTaints := nodeClaim.Spec.StartupTaints
+	allTaints := lo.Flatten([][]corev1.Taint{
+		generalTaints,
+		startupTaints,
 	})
 
 	storageProfile := "ManagedDisks"
@@ -100,15 +102,15 @@ func (r Resolver) Resolve(ctx context.Context, nodeClass *v1alpha2.AKSNodeClass,
 		StaticParameters: staticParameters,
 		ScriptlessCustomData: imageFamily.ScriptlessCustomData(
 			prepareKubeletConfiguration(instanceType, nodeClaim),
-			taints,
+			allTaints,
 			staticParameters.Labels,
 			staticParameters.CABundle,
 			instanceType,
 		),
 		CustomScriptsNodeBootstrapping: imageFamily.CustomScriptsNodeBootstrapping(
 			prepareKubeletConfiguration(instanceType, nodeClaim),
-			nodeClaim.Spec.Taints,
-			nodeClaim.Spec.StartupTaints,
+			generalTaints,
+			startupTaints,
 			staticParameters.Labels,
 			instanceType,
 			imageDistro,