opm validate: make sure skipped bundles are not included in replaces chain

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

alpha/model/model.go

@@ -283,11 +283,18 @@ func (c *Channel) validateReplacesChain() error {
 
 	chainFrom := map[string][]string{}
 	replacesChainFromHead := sets.NewString(head.Name)
+	skippedInChain := sets.NewString()
 	cur := head
 	for cur != nil {
 		if _, ok := chainFrom[cur.Name]; !ok {
 			chainFrom[cur.Name] = []string{cur.Name}
 		}
+		if skippedBundles.Has(cur.Replaces) {
+			break
+		}
+		for _, skip := range cur.Skips {
+			skippedInChain = skippedInChain.Insert(skip)
+		}
 		for k := range chainFrom {
 			chainFrom[k] = append(chainFrom[k], cur.Replaces)
 		}
@@ -298,7 +305,7 @@ func (c *Channel) validateReplacesChain() error {
 		cur = c.Bundles[cur.Replaces]
 	}
 
-	strandedBundles := allBundles.Difference(replacesChainFromHead).Difference(skippedBundles).List()
+	strandedBundles := allBundles.Difference(replacesChainFromHead).Difference(skippedInChain).List()
 	if len(strandedBundles) > 0 {
 		return fmt.Errorf("channel contains one or more stranded bundles: %s", strings.Join(strandedBundles, ", "))
 	}