Merge pull request #781 from fluxcd/fix-crd-trace-labels

hiddeco · web-flow · commit ff0361681465 · 2023-09-29T18:37:52.000+02:00
diff --git a/internal/runner/runner.go b/internal/runner/runner.go
@@ -441,7 +441,7 @@ func setOriginVisitor(namespace, name string) resource.VisitorFunc {
 		if err != nil {
 			return err
 		}
-		if err = mergeLabels(info.Object, originLabels(namespace, name)); err != nil {
+		if err = mergeLabels(info.Object, originLabels(name, namespace)); err != nil {
 			return fmt.Errorf(
 				"%s origin labels could not be updated: %s",
 				resourceString(info), err,

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ func setOriginVisitor(namespace, name string) resource.VisitorFunc {`
`441`	`441`	`if err != nil {`
`442`	`442`	`return err`
`443`	`443`	`}`
`444`		`- if err = mergeLabels(info.Object, originLabels(namespace, name)); err != nil {`
	`444`	`+ if err = mergeLabels(info.Object, originLabels(name, namespace)); err != nil {`
`445`	`445`	`return fmt.Errorf(`
`446`	`446`	`"%s origin labels could not be updated: %s",`
`447`	`447`	`resourceString(info), err,`