Skip to content

Commit

Permalink
fix: ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce-Soghigian committed May 30, 2024
1 parent 7b5414c commit d912cfa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions pkg/providers/imagefamily/bootstrap/aksbootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/instancetype/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit d912cfa

Please sign in to comment.