Skip to content

fix: use nodeadm mutations #1332

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

Merged
merged 5 commits into from
Oct 2, 2025
Merged

fix: use nodeadm mutations #1332

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce6462a
fix: use nodeadm mutations
faiq Sep 30, 2025
d99c9f5
fix: register wth taints can be specified multiple times
faiq Oct 1, 2025
9592e74
fix: use nodeadm config template
faiq Oct 1, 2025
5556b02
fix: adds ami details for nodeadm configs (#1334)
faiq Oct 1, 2025
8901ea6
fix: skip insecure secrets manager for eks
faiq Oct 2, 2025
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
4 changes: 2 additions & 2 deletions charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/eks-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: EKSConfigTemplate
name: eks-quick-start-worker-configtemplate
name: quick-start-worker-configtemplate
infrastructure:
ref:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
sshKeyName: ""
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: EKSConfigTemplate
kind: NodeadmConfigTemplate
metadata:
labels:
cluster.x-k8s.io/provider: eks
Expand Down
2 changes: 1 addition & 1 deletion hack/examples/bases/eks/clusterclass/clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
spec: {}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: EKSConfigTemplate
kind: NodeadmConfigTemplate
metadata:
name: "quick-start-worker-configtemplate"
spec:
Expand Down
12 changes: 6 additions & 6 deletions pkg/handlers/eks/mutation/testutils/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ func NewEKSControlPlaneRequestItem(
)
}

func NewEKSConfigTemplateRequestItem(
func NewNodeadmConfigTemplateRequestItem(
uid types.UID,
existingSpec ...eksbootstrapv1.EKSConfigTemplateSpec,
existingSpec ...eksbootstrapv1.NodeadmConfigTemplateSpec,
) runtimehooksv1.GeneratePatchesRequestItem {
eksConfigTemplate := &eksbootstrapv1.EKSConfigTemplate{
nodeadmConfigTemplate := &eksbootstrapv1.NodeadmConfigTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: eksbootstrapv1.GroupVersion.String(),
Kind: "EKSConfigTemplate",
Kind: "NodeadmConfigTemplate",
},
}

switch len(existingSpec) {
case 0:
// Do nothing.
case 1:
eksConfigTemplate.Spec = existingSpec[0]
nodeadmConfigTemplate.Spec = existingSpec[0]
default:
panic("can only take at most one existing spec")
}

return request.NewRequestItem(
eksConfigTemplate,
nodeadmConfigTemplate,
&runtimehooksv1.HolderReference{
Kind: "MachineDeployment",
FieldPath: "spec.template.spec.bootstrap.configRef",
Expand Down
6 changes: 3 additions & 3 deletions pkg/handlers/generic/mutation/ntp/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ func (h *ntpPatchHandler) Mutate(

if err := patches.MutateIfApplicable(
obj, vars, &holderRef,
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "EKSConfigTemplate"), log,
func(obj *eksbootstrapv1.EKSConfigTemplate) error {
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "NodeadmConfigTemplate"), log,
func(obj *eksbootstrapv1.NodeadmConfigTemplate) error {
log.WithValues(
"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
"patchedObjectName", client.ObjectKeyFromObject(obj),
).Info("setting users in worker node EKS config template")
).Info("setting users in worker node NodeadmConfig template")
obj.Spec.Template.Spec.NTP = &eksbootstrapv1.NTP{
Enabled: ptr.To(true),
Servers: ntp.Servers,
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/generic/mutation/ntp/inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ var _ = Describe("Generate NTP patches", func() {
},
},
{
Name: "NTP configuration is set for worker nodes with single server for EKSConfigTemplate",
RequestItem: testutils.NewEKSConfigTemplateRequestItem(""),
Name: "NTP configuration is set for worker nodes with single server for NodeadmConfigTemplate",
RequestItem: testutils.NewNodeadmConfigTemplateRequestItem(""),
ExpectedPatchMatchers: []capitest.JSONPatchMatcher{
{
Operation: "add",
Expand Down
34 changes: 20 additions & 14 deletions pkg/handlers/generic/mutation/taints/inject_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ package taints

import (
"context"
"fmt"
"strings"

"github.com/samber/lo"
v1 "k8s.io/api/core/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -48,6 +50,10 @@ func newTaintsWorkerPatchHandler(
}
}

type KubeletRegisterOptions struct {
RegisterWithTaints []v1.Taint `json:"registerWithTaints,omitempty"`
}

func (h *taintsWorkerPatchHandler) Mutate(
ctx context.Context,
obj *unstructured.Unstructured,
Expand Down Expand Up @@ -103,25 +109,25 @@ func (h *taintsWorkerPatchHandler) Mutate(

if err := patches.MutateIfApplicable(
obj, vars, &holderRef,
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "EKSConfigTemplate"), log,
func(obj *eksbootstrapv1.EKSConfigTemplate) error {
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "NodeadmConfigTemplate"), log,
func(obj *eksbootstrapv1.NodeadmConfigTemplate) error {
log.WithValues(
"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
"patchedObjectName", ctrlclient.ObjectKeyFromObject(obj),
).Info("adding taints to worker node EKS config template")
if obj.Spec.Template.Spec.KubeletExtraArgs == nil {
obj.Spec.Template.Spec.KubeletExtraArgs = make(map[string]string, 1)
).Info("adding taints to worker NodeadmConfig template")
kubeletOptions := obj.Spec.Template.Spec.Kubelet
var runtimeConfigFromNodeadm *runtime.RawExtension
var flags []string
newTaints := toEKSConfigTaints(taintsVar)
if kubeletOptions != nil {
runtimeConfigFromNodeadm = kubeletOptions.Config
flags = kubeletOptions.Flags
}

existingTaintsFlagValue := obj.Spec.Template.Spec.KubeletExtraArgs["register-with-taints"]

newTaintsFlagValue := toEKSConfigTaints(taintsVar)

if existingTaintsFlagValue != "" {
newTaintsFlagValue = existingTaintsFlagValue + "," + newTaintsFlagValue
flags = append(flags, fmt.Sprintf("--register-with-taints=%s", newTaints))
obj.Spec.Template.Spec.Kubelet = &eksbootstrapv1.KubeletOptions{
Flags: flags,
Config: runtimeConfigFromNodeadm,
}

obj.Spec.Template.Spec.KubeletExtraArgs["register-with-taints"] = newTaintsFlagValue
return nil
}); err != nil {
return err
Expand Down
82 changes: 78 additions & 4 deletions pkg/handlers/generic/mutation/taints/inject_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

eksbootstrapv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest"
Expand Down Expand Up @@ -59,7 +60,7 @@ var _ = Describe("Generate taints patches for Worker", func() {
}},
},
{
Name: "taints for workers set for EKSConfigTemplate",
Name: "taints for workers set for NodeadmConfigTemplate",
Vars: []runtimehooksv1.Variable{
capitest.VariableWithValue(
v1alpha1.WorkerConfigVariableName,
Expand All @@ -77,15 +78,88 @@ var _ = Describe("Generate taints patches for Worker", func() {
},
),
},
RequestItem: testutils.NewEKSConfigTemplateRequestItem(""),
RequestItem: testutils.NewNodeadmConfigTemplateRequestItem(""),
ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
Operation: "add",
Path: "/spec/template/spec/kubeletExtraArgs",
Path: "/spec/template/spec/kubelet",
ValueMatcher: gomega.HaveKeyWithValue(
"register-with-taints", "key=value:NoExecute",
"flags",
gomega.ContainElement("--register-with-taints=key=value:NoExecute"),
),
}},
},
{
Name: "taints for workers set for NodeadmConfigTemplate with existing flags argument",
Vars: []runtimehooksv1.Variable{
capitest.VariableWithValue(
v1alpha1.WorkerConfigVariableName,
[]v1alpha1.Taint{{
Key: "key",
Effect: v1alpha1.TaintEffectNoExecute,
Value: "value",
}},
VariableName,
),
capitest.VariableWithValue(
"builtin",
apiextensionsv1.JSON{
Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`),
},
),
},
RequestItem: testutils.NewNodeadmConfigTemplateRequestItem("", eksbootstrapv1.NodeadmConfigTemplateSpec{
Template: eksbootstrapv1.NodeadmConfigTemplateResource{
Spec: eksbootstrapv1.NodeadmConfigSpec{
Kubelet: &eksbootstrapv1.KubeletOptions{
Flags: []string{
"--max-pods=110",
},
},
},
},
}),
ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
Operation: "add",
Path: "/spec/template/spec/kubelet/flags/1",
ValueMatcher: gomega.Equal("--register-with-taints=key=value:NoExecute"),
}},
},
{
Name: "taints for workers set for NodeadmConfigTemplate with existing flags with register-with-taints ",
Vars: []runtimehooksv1.Variable{
capitest.VariableWithValue(
v1alpha1.WorkerConfigVariableName,
[]v1alpha1.Taint{{
Key: "key",
Effect: v1alpha1.TaintEffectNoExecute,
Value: "value",
}},
VariableName,
),
capitest.VariableWithValue(
"builtin",
apiextensionsv1.JSON{
Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`),
},
),
},
RequestItem: testutils.NewNodeadmConfigTemplateRequestItem("", eksbootstrapv1.NodeadmConfigTemplateSpec{
Template: eksbootstrapv1.NodeadmConfigTemplateResource{
Spec: eksbootstrapv1.NodeadmConfigSpec{
Kubelet: &eksbootstrapv1.KubeletOptions{
Flags: []string{
"--register-with-taints=key1=value1:NoSchedule",
},
},
},
},
}),
ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
Operation: "add",
Path: "/spec/template/spec/kubelet/flags/1",
ValueMatcher: gomega.Equal("--register-with-taints=key=value:NoExecute"),
}},
},
}

// create test node for each case
Expand Down
6 changes: 3 additions & 3 deletions pkg/handlers/generic/mutation/users/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ func (h *usersPatchHandler) Mutate(

if err := patches.MutateIfApplicable(
obj, vars, &holderRef,
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "EKSConfigTemplate"), log,
func(obj *eksbootstrapv1.EKSConfigTemplate) error {
selectors.WorkersConfigTemplateSelector(eksbootstrapv1.GroupVersion.String(), "NodeadmConfigTemplate"), log,
func(obj *eksbootstrapv1.NodeadmConfigTemplate) error {
log.WithValues(
"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
"patchedObjectName", ctrlclient.ObjectKeyFromObject(obj),
).Info("setting users in worker node EKS config template")
).Info("setting users in worker node NodeadmConfig template")
eksBootstrapUsers := make([]eksbootstrapv1.User, 0, len(bootstrapUsers))
for _, user := range bootstrapUsers {
var passwdFrom *eksbootstrapv1.PasswdSource
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/generic/mutation/users/inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ var _ = Describe("Generate Users patches", func() {
}},
},
{
Name: "users set for EKSConfigTemplate generic worker",
Name: "users set for NodeadmConfigTemplate generic worker",
Vars: []runtimehooksv1.Variable{
capitest.VariableWithValue(
v1alpha1.ClusterConfigVariableName,
Expand All @@ -210,7 +210,7 @@ var _ = Describe("Generate Users patches", func() {
},
),
},
RequestItem: testutils.NewEKSConfigTemplateRequestItem(""),
RequestItem: testutils.NewNodeadmConfigTemplateRequestItem(""),
ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
Operation: "add",
Path: "/spec/template/spec/users",
Expand Down
Loading