Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: follow-up fixes on bootstrappingclient mode after integration testing with v1 #544

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: follow-up fixes on bootstrappingclient mode after integration testing with v1 #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
429994b
fix: KubeletConfig not defaulted properly gives invalid values for Pr…
comtalyst Oct 26, 2024
7566f2e
fix: UnregisteredNoExecuteTaint was not defaulted for CustomScriptsNo…
comtalyst Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions pkg/providers/imagefamily/customscriptsbootstrap/provisionclientbootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -119,17 +120,27 @@ 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()),
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),
}

// NodeClaim defaults don't work somehow and keep giving invalid values. Can be improved later.
if p.KubeletConfig.CPUCFSQuotaPeriod.Duration.String() != "0s" {
provisionProfile.CustomKubeletConfig.CPUCfsQuotaPeriod = lo.ToPtr(p.KubeletConfig.CPUCFSQuotaPeriod.Duration.String())
}
if p.KubeletConfig.CPUManagerPolicy != "" {
provisionProfile.CustomKubeletConfig.CPUManagerPolicy = lo.ToPtr(p.KubeletConfig.CPUManagerPolicy)
}
if p.KubeletConfig.TopologyManagerPolicy != "" {
provisionProfile.CustomKubeletConfig.TopologyManagerPolicy = lo.ToPtr(p.KubeletConfig.TopologyManagerPolicy)
}
if len(p.KubeletConfig.AllowedUnsafeSysctls) > 0 {
provisionProfile.CustomKubeletConfig.AllowedUnsafeSysctls = p.KubeletConfig.AllowedUnsafeSysctls
}
}

if modeString, ok := p.Labels["kubernetes.azure.com/mode"]; ok && modeString == "system" {
Expand Down
21 changes: 13 additions & 8 deletions pkg/providers/imagefamily/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,19 @@ 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,
})
if _, found := lo.Find(taints, func(t corev1.Taint) bool {

// Ensure UnregisteredNoExecuteTaint is present
if _, found := lo.Find(allTaints, func(t corev1.Taint) bool { // Allow UnregisteredNoExecuteTaint to be in non-startup taints(?)
return t.MatchTaint(&karpv1.UnregisteredNoExecuteTaint)
}); !found {
taints = append(taints, karpv1.UnregisteredNoExecuteTaint)
startupTaints = append(startupTaints, karpv1.UnregisteredNoExecuteTaint)
allTaints = append(allTaints, karpv1.UnregisteredNoExecuteTaint)
}

storageProfile := "ManagedDisks"
Expand All @@ -105,15 +110,15 @@ func (r Resolver) Resolve(ctx context.Context, nodeClass *v1alpha2.AKSNodeClass,
StaticParameters: staticParameters,
ScriptlessCustomData: imageFamily.ScriptlessCustomData(
prepareKubeletConfiguration(instanceType, nodeClass),
taints,
allTaints,
staticParameters.Labels,
staticParameters.CABundle,
instanceType,
),
CustomScriptsNodeBootstrapping: imageFamily.CustomScriptsNodeBootstrapping(
prepareKubeletConfiguration(instanceType, nodeClass),
nodeClaim.Spec.Taints,
nodeClaim.Spec.StartupTaints,
generalTaints,
startupTaints,
staticParameters.Labels,
instanceType,
imageDistro,
Expand Down
Loading