Move nodeSelector to spec (#134)

tardieu · web-flow · commit edf4fd4d848f · 2024-05-15T16:53:04.000-04:00
diff --git a/internal/controller/appwrapper/resource_management.go b/internal/controller/appwrapper/resource_management.go
@@ -126,11 +126,11 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *workload
 
 		// NodeSelectors
 		if len(toInject.NodeSelector) > 0 {
-			existing := toMap(metadata["nodeSelector"])
+			existing := toMap(spec["nodeSelector"])
 			if err := utilmaps.HaveConflict(existing, toInject.NodeSelector); err != nil {
 				return nil, podset.BadPodSetsUpdateError("nodeSelector", err), true
 			}
-			metadata["nodeSelector"] = utilmaps.MergeKeepFirst(existing, toInject.NodeSelector)
+			spec["nodeSelector"] = utilmaps.MergeKeepFirst(existing, toInject.NodeSelector)
 		}
 
 		// Tolerations

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ func (r AppWrapperReconciler) createComponent(ctx context.Context, aw workload`
`126`	`126`
`127`	`127`	`// NodeSelectors`
`128`	`128`	`if len(toInject.NodeSelector) > 0 {`
`129`		`- existing := toMap(metadata["nodeSelector"])`
	`129`	`+ existing := toMap(spec["nodeSelector"])`
`130`	`130`	`if err := utilmaps.HaveConflict(existing, toInject.NodeSelector); err != nil {`
`131`	`131`	`return nil, podset.BadPodSetsUpdateError("nodeSelector", err), true`
`132`	`132`	`}`
`133`		`- metadata["nodeSelector"] = utilmaps.MergeKeepFirst(existing, toInject.NodeSelector)`
	`133`	`+ spec["nodeSelector"] = utilmaps.MergeKeepFirst(existing, toInject.NodeSelector)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Tolerations`