clusterclass: fix nil pointer for empty workers in webhook

kubernetes-sigs · Sep 19, 2024 · 9173f28 · 9173f28
1 parent f9738ac
commit 9173f28
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/internal/webhooks/cluster.go b/internal/webhooks/cluster.go
@@ -772,17 +772,19 @@ func DefaultAndValidateVariables(ctx context.Context, cluster, oldCluster *clust
 			oldCPOverrides = oldCluster.Spec.Topology.ControlPlane.Variables.Overrides
 		}
 
-		oldMDVariables = make(map[string][]clusterv1.ClusterVariable, len(oldCluster.Spec.Topology.Workers.MachineDeployments))
-		for _, md := range oldCluster.Spec.Topology.Workers.MachineDeployments {
-			if md.Variables != nil {
-				oldMDVariables[md.Name] = md.Variables.Overrides
+		if oldCluster.Spec.Topology.Workers != nil {
+			oldMDVariables = make(map[string][]clusterv1.ClusterVariable, len(oldCluster.Spec.Topology.Workers.MachineDeployments))
+			for _, md := range oldCluster.Spec.Topology.Workers.MachineDeployments {
+				if md.Variables != nil {
+					oldMDVariables[md.Name] = md.Variables.Overrides
+				}
 			}
-		}
 
-		oldMPVariables = make(map[string][]clusterv1.ClusterVariable, len(oldCluster.Spec.Topology.Workers.MachinePools))
-		for _, mp := range oldCluster.Spec.Topology.Workers.MachinePools {
-			if mp.Variables != nil {
-				oldMPVariables[mp.Name] = mp.Variables.Overrides
+			oldMPVariables = make(map[string][]clusterv1.ClusterVariable, len(oldCluster.Spec.Topology.Workers.MachinePools))
+			for _, mp := range oldCluster.Spec.Topology.Workers.MachinePools {
+				if mp.Variables != nil {
+					oldMPVariables[mp.Name] = mp.Variables.Overrides
+				}
 			}
 		}
 	}