update reports

cmd/custom/deprecate/template.go.tmpl

@@ -122,6 +122,7 @@
                 <tbody>
                 {{ with .NotMigrated }}
                     {{ range . }}
+                        {{ if ne .Name "" }}
                         <tr>
                             <th>{{ .Name }}</th>
                             <th>
@@ -153,6 +154,7 @@
                               </ul>
                             </th>
                         </tr>
+                         {{ end }}
                     {{ end }}
                 {{ end }}
                 </tbody>

hack/scripts/packages/generate.go

@@ -50,6 +50,7 @@ type File struct {
 	NotMigrateWithReplacesAllHeads []custom.NotMigrated
 	NotMigrateWithSkips            []custom.NotMigrated
 	NotMigrateWithSkipsRange       []custom.NotMigrated
+	NotMigrateWithSkipsAndRange    []custom.NotMigrated
 	NotMigrateUnknow               []custom.NotMigrated
 	TotalWorking49                 int
 	NotMigratesMix                 []custom.NotMigrated
@@ -150,7 +151,7 @@ func main() {
 		foundSkips := false
 		headOfChannels := custom.GetHeadOfChannels(v.AllBundles)
 		for _, b := range headOfChannels {
-			if len(b.Skips) > 0 {
+			if len(b.SkipRange) > 0 && len(b.Replace) < 1 {
 				foundSkips = true
 				break
 			}
@@ -166,7 +167,7 @@ func main() {
 		foundSkipRange := false
 		headOfChannels := custom.GetHeadOfChannels(v.AllBundles)
 		for _, b := range headOfChannels {
-			if len(b.SkipRange) > 0 {
+			if len(b.SkipRange) > 0 && len(b.Replace) < 1 {
 				foundSkipRange = true
 				break
 			}
@@ -177,6 +178,22 @@ func main() {
 		}
 	}
 
+	var notMigrateWithSkipsAndRange []custom.NotMigrated
+	for _, v := range apiDashReport.NotMigrated {
+		foundSkips := false
+		headOfChannels := custom.GetHeadOfChannels(v.AllBundles)
+		for _, b := range headOfChannels {
+			if ((len(b.Skips) > 0) || len(b.SkipRange) > 0) && len(b.Replace) < 1 {
+				foundSkips = true
+				break
+			}
+		}
+		if foundSkips {
+			notMigrateWithSkipsAndRange = append(notMigrateWithSkipsAndRange, v)
+			continue
+		}
+	}
+
 	var notMigratesMix []custom.NotMigrated
 	for _, v := range apiDashReport.NotMigrated {
 		found := false
@@ -196,15 +213,21 @@ func main() {
 	var notMigrateUnknow []custom.NotMigrated
 	for _, v := range apiDashReport.NotMigrated {
 		found := false
-		headOfChannels := custom.GetHeadOfChannels(v.AllBundles)
-		for _, b := range headOfChannels {
-			if len(b.SkipRange) > 0 || len(b.Skips) > 0 || len(b.Replace) > 0 {
+		for _, r := range notMigrateWithReplaces {
+			if v.Name == r.Name {
+				found = true
+				break
+			}
+		}
+		for _, s := range notMigrateWithSkipsAndRange {
+			if v.Name == s.Name {
 				found = true
 				break
 			}
 		}
 		if !found {
 			notMigrateUnknow = append(notMigrateUnknow, v)
+			continue
 		}
 	}
 
@@ -251,6 +274,9 @@ func main() {
 	sort.Slice(notMigratesMix[:], func(i, j int) bool {
 		return notMigratesMix[i].Name < notMigratesMix[j].Name
 	})
+	sort.Slice(notMigrateWithSkipsAndRange[:], func(i, j int) bool {
+		return notMigrateWithSkipsAndRange[i].Name < notMigrateWithSkipsAndRange[j].Name
+	})
 
 	totalWorking49 := len(apiDashReport.Migrated) - len(migrateNotIn49)
 
@@ -278,6 +304,7 @@ func main() {
 		TotalWorking49:                 totalWorking49,
 		NotMigrateWithSkips:            notMigrateWithSkips,
 		NotMigrateWithSkipsRange:       notMigrateWithSkipRange,
+		NotMigrateWithSkipsAndRange:    notMigrateWithSkipsAndRange,
 		NotMigrateUnknow:               notMigrateUnknow})
 	if err != nil {
 		panic(err)

hack/scripts/packages/template.go.tmpl

@@ -34,7 +34,7 @@ at least one head of channel using skipRange
 
 -------------------------------------
 Packages which does not nave any compatible version with 4.9 and has
-all head of channel using replaces
+at leas one head of channel using replaces
 -------------------------------------
 {{ with .NotMigrateWithReplacesAllHeads }}{{ range . }}{{ .Name }}
 {{ end }}{{ end }}
@@ -53,6 +53,12 @@ with skips or skipsRange
 {{ with .NotMigratesMix }}{{ range . }}{{ .Name }}
 {{ end }}{{ end }}
 
+Packages which does not nave any compatible version with 4.9 and uses only Skips
+or SkipRange
+-------------------------------------
+{{ with .NotMigrateWithSkipsAndRange }}{{ range . }}{{ .Name }}
+{{ end }}{{ end }}
+
 
 -------------------------------------
 Packages which has compatible version but none of them will end up on 4.9