Merge pull request #5564 from fluxcd/backport-5563-to-release/v2.7.x

[release/v2.7.x] Fix `flux migrate -f` not considering kind comments

cmd/flux/migrate.go

@@ -623,7 +623,8 @@ func (f *FileSystemMigrator) detectFileUpgrades(file string) ([]APIUpgrade, erro
 		if idx == -1 {
 			continue
 		}
-		kind := strings.TrimSpace(kindLine[idx+len(kindPrefix):])
+		kindValuePrefix := strings.TrimSpace(kindLine[idx+len(kindPrefix):])
+		kind := strings.Split(kindValuePrefix, " ")[0]
 
 		// Build GroupKind.
 		gk := schema.GroupKind{

cmd/flux/migrate_test.go

@@ -153,7 +153,7 @@ func TestFileSystemMigrator(t *testing.T) {
 			for _, wf := range tt.writtenFiles {
 				b, err := os.ReadFile(wf.goldenFile)
 				g.Expect(err).ToNot(HaveOccurred())
-				g.Expect(fileSystem.writtenFiles[wf.file]).To(Equal(b),
+				g.Expect(string(fileSystem.writtenFiles[wf.file])).To(Equal(string(b)),
 					"file %s does not match golden file %s", wf.file, wf.goldenFile)
 			}
 		})

cmd/flux/testdata/migrate/file-system/dir.golden/some-file.yaml

@@ -12,7 +12,7 @@ spec:
   wait: true
   dependsOn:
     - apiVersion: image.toolkit.fluxcd.io/v1 # update this from v1beta1
-      kind: ImageRepository
+      kind: ImageRepository # there can be comments here too
 
 
 ---

cmd/flux/testdata/migrate/file-system/dir/some-file.yaml

@@ -12,7 +12,7 @@ spec:
   wait: true
   dependsOn:
     - apiVersion: image.toolkit.fluxcd.io/v1beta1 # update this from v1beta1
-      kind: ImageRepository
+      kind: ImageRepository # there can be comments here too
 
 
 ---