Merge pull request #4960 from RishabhSaini/pisMCNspec

MCO-1627: Get rid of setting mcn.Spec.PinnedImageSets field

Author: openshift-merge-bot[bot]

pkg/daemon/pinned_image_set.go

@@ -540,7 +540,6 @@ func (p *PinnedImageSetManager) updateStatusProgressing(pools []*mcfgv1.MachineC
 	if err != nil {
 		return fmt.Errorf("failed to get image set apply configs: %w", err)
 	}
-	imageSetSpec := getPinnedImageSetSpecForPools(pools)
 
 	// Get MCP associated with node
 	pool, err := helpers.GetPrimaryPoolNameForMCN(p.mcpLister, node)
@@ -560,7 +559,6 @@ func (p *PinnedImageSetManager) updateStatusProgressing(pools []*mcfgv1.MachineC
 		node,
 		p.mcfgClient,
 		applyCfg,
-		imageSetSpec,
 		p.featureGatesAccessor,
 		pool,
 	)
@@ -577,7 +575,6 @@ func (p *PinnedImageSetManager) updateStatusProgressingComplete(pools []*mcfgv1.
 	if err != nil {
 		return fmt.Errorf("failed to get image set apply configs: %w", err)
 	}
-	imageSetSpec := getPinnedImageSetSpecForPools(pools)
 
 	// Get MCP associated with node
 	pool, err := helpers.GetPrimaryPoolNameForMCN(p.mcpLister, node)
@@ -597,7 +594,6 @@ func (p *PinnedImageSetManager) updateStatusProgressingComplete(pools []*mcfgv1.
 		node,
 		p.mcfgClient,
 		applyCfg,
-		imageSetSpec,
 		p.featureGatesAccessor,
 		pool,
 	)
@@ -618,7 +614,6 @@ func (p *PinnedImageSetManager) updateStatusProgressingComplete(pools []*mcfgv1.
 		node,
 		p.mcfgClient,
 		nil,
-		nil,
 		p.featureGatesAccessor,
 		pool,
 	)
@@ -635,7 +630,6 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
 	if err != nil {
 		return fmt.Errorf("failed to get image set apply configs: %w", err)
 	}
-	imageSetSpec := getPinnedImageSetSpecForPools(pools)
 
 	var errMsg string
 	if isErrNoSpace(statusErr) {
@@ -663,7 +657,6 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
 		node,
 		p.mcfgClient,
 		applyCfg,
-		imageSetSpec,
 		p.featureGatesAccessor,
 		pool,
 	)

pkg/upgrademonitor/upgrade_monitor.go

@@ -43,7 +43,7 @@ func GenerateAndApplyMachineConfigNodes(
 	fgAccessor featuregates.FeatureGateAccess,
 	pool string,
 ) error {
-	return generateAndApplyMachineConfigNodes(parentCondition, childCondition, parentStatus, childStatus, node, mcfgClient, nil, nil, fgAccessor, pool)
+	return generateAndApplyMachineConfigNodes(parentCondition, childCondition, parentStatus, childStatus, node, mcfgClient, nil, fgAccessor, pool)
 }
 
 func UpdateMachineConfigNodeStatus(
@@ -54,11 +54,10 @@ func UpdateMachineConfigNodeStatus(
 	node *corev1.Node,
 	mcfgClient mcfgclientset.Interface,
 	imageSetApplyConfig []*machineconfigurationalphav1.MachineConfigNodeStatusPinnedImageSetApplyConfiguration,
-	imageSetSpec []mcfgalphav1.MachineConfigNodeSpecPinnedImageSet,
 	fgAccessor featuregates.FeatureGateAccess,
 	pool string,
 ) error {
-	return generateAndApplyMachineConfigNodes(parentCondition, childCondition, parentStatus, childStatus, node, mcfgClient, imageSetApplyConfig, imageSetSpec, fgAccessor, pool)
+	return generateAndApplyMachineConfigNodes(parentCondition, childCondition, parentStatus, childStatus, node, mcfgClient, imageSetApplyConfig, fgAccessor, pool)
 }
 
 // Helper function to convert metav1.Condition to ConditionApplyConfiguration
@@ -90,7 +89,6 @@ func generateAndApplyMachineConfigNodes(
 	node *corev1.Node,
 	mcfgClient mcfgclientset.Interface,
 	imageSetApplyConfig []*machineconfigurationalphav1.MachineConfigNodeStatusPinnedImageSetApplyConfiguration,
-	imageSetSpec []mcfgalphav1.MachineConfigNodeSpecPinnedImageSet,
 	fgAccessor featuregates.FeatureGateAccess,
 	pool string,
 ) error {
@@ -300,9 +298,6 @@ func generateAndApplyMachineConfigNodes(
 		newMCNode.Name = node.Name
 		newMCNode.Spec.Pool = mcfgalphav1.MCOObjectReference{Name: pool}
 		newMCNode.Spec.Node = mcfgalphav1.MCOObjectReference{Name: node.Name}
-		if imageSetSpec != nil {
-			newMCNode.Spec.PinnedImageSets = imageSetSpec
-		}
 
 		_, err := mcfgClient.MachineconfigurationV1alpha1().MachineConfigNodes().Create(context.TODO(), newMCNode, metav1.CreateOptions{})
 		if err != nil {