From d912cfa63ba78289974f7af316140d10e261622a Mon Sep 17 00:00:00 2001 From: Bryce Soghigian Date: Thu, 30 May 2024 10:17:23 -0700 Subject: [PATCH] fix: ci --- pkg/providers/imagefamily/bootstrap/aksbootstrap.go | 7 +++---- pkg/providers/instancetype/suite_test.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/providers/imagefamily/bootstrap/aksbootstrap.go b/pkg/providers/imagefamily/bootstrap/aksbootstrap.go index b4d8a9510..3449dec5c 100644 --- a/pkg/providers/imagefamily/bootstrap/aksbootstrap.go +++ b/pkg/providers/imagefamily/bootstrap/aksbootstrap.go @@ -452,7 +452,6 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) { nbv.GPUImageSHA = a.GPUImageSHA } - // merge and stringify labels kubeletLabels := lo.Assign(kubeletNodeLabelsBase, a.Labels) getAgentbakerGeneratedLabels(a.ResourceGroup, kubeletLabels) @@ -465,7 +464,7 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) { nbv.KubeletNodeLabels = strings.Join(lo.MapToSlice(kubeletLabels, func(k, v string) string { return fmt.Sprintf("%s=%s", k, v) }), ",") - + // Assign Per K8s version kubelet flags minorVersion := semver.MustParse(a.KubernetesVersion).Minor if minorVersion < 30 { @@ -484,12 +483,12 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) { nodeclaimKubeletConfig := KubeletConfigToMap(a.KubeletConfig) kubeletFlags = lo.Assign(kubeletFlags, nodeclaimKubeletConfig) - + // striginify kubelet flags (including taints) nbv.KubeletFlags = strings.Join(lo.MapToSlice(kubeletFlags, func(k, v string) string { return fmt.Sprintf("%s=%s", k, v) }), " ") - + } func containerdConfigFromNodeBootstrapVars(nbv *NodeBootstrapVariables) (string, error) { diff --git a/pkg/providers/instancetype/suite_test.go b/pkg/providers/instancetype/suite_test.go index b9bfd6098..4f7084388 100644 --- a/pkg/providers/instancetype/suite_test.go +++ b/pkg/providers/instancetype/suite_test.go @@ -1117,7 +1117,7 @@ var _ = Describe("InstanceType Provider", func() { } return flagMap } - + // TODO: (bsoghigian) leverage the helpers from the azure cni pr once they get in instead for testing kubelet flags flagMap := parseKubeletFlags(kubeletFlags) if env.Version.Minor() < 30 {