Skip to content

[PCP-5517] fixed setting clustercidr and dns in NodeInput #1004

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
kpiyush17 merged 1 commit into from
Jan 21, 2026
Merged

[PCP-5517] fixed setting clustercidr and dns in NodeInput #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion bootstrap/eks/controllers/eksconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
DiskSetup: config.Spec.DiskSetup,
Mounts: config.Spec.Mounts,
Files: files,
ClusterCIDR: controlPlane.Spec.NetworkSpec.VPC.CidrBlock,
ClusterCIDR: r.getClusterCidr(cluster, controlPlane),
}

if config.Spec.PauseContainer != nil {
Expand Down Expand Up @@ -587,3 +587,11 @@ func (r *EKSConfigReconciler) extractCAFromSecret(ctx context.Context, obj clien

return "", fmt.Errorf("no cluster with CA data found in kubeconfig")
}

func (r *EKSConfigReconciler) getClusterCidr(cluster *clusterv1.Cluster, controlPlane *ekscontrolplanev1.AWSManagedControlPlane) string {
if cluster.Spec.ClusterNetwork != nil && cluster.Spec.ClusterNetwork.Services != nil && len(cluster.Spec.ClusterNetwork.Services.CIDRBlocks) > 0 {
return cluster.Spec.ClusterNetwork.Services.CIDRBlocks[0]
}

return controlPlane.Spec.NetworkSpec.VPC.CidrBlock
}
13 changes: 12 additions & 1 deletion bootstrap/eks/internal/userdata/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,11 @@ func validateAL2023Input(input *NodeInput) error {
}
}
if input.DNSClusterIP == nil {
input.DNSClusterIP = ptr.To[string]("10.96.0.10")
if input.ClusterCIDR != "" {
input.DNSClusterIP = ptr.To(calculateDNSFromServiceCIDR(input.ClusterCIDR))
} else {
input.DNSClusterIP = ptr.To[string]("10.96.0.10")
}
}
input.ClusterDNS = *input.DNSClusterIP

Expand All @@ -415,3 +419,10 @@ func validateAL2023Input(input *NodeInput) error {

return nil
}

// calculateDNSFromServiceCIDR calculates the DNS cluster IP by replacing the last octet with 10.
func calculateDNSFromServiceCIDR(cidr string) string {
ipStr := strings.Split(strings.TrimSpace(cidr), "/")[0]
lastDotIdx := strings.LastIndex(ipStr, ".")
return ipStr[:lastDotIdx] + ".10"
}
Loading