fixup! fix: merge projected volumes

akurinnoy · akurinnoy · commit 1b6cfb2ee376 · 2025-02-27T16:53:35.000+02:00
Signed-off-by: Oleksii Kurinnyi &lt;okurinny@redhat.com&gt;
diff --git a/pkg/provision/automount/projected.go b/pkg/provision/automount/projected.go
@@ -55,6 +55,7 @@ func mergeProjectedVolumes(resources *Resources) (*Resources, error) {
 	}
 
 	// Map of merged volume names -> bool, for not merging the same volume twice
+	// This can happen due to different subpath volume mounts, where the mount path is the same. In this case, there should be only one volume.
 	mergedVolumeNames := map[string]bool{}
 	for _, mountPath := range mountPathOrder {
 		volumeMounts := mountPathToVolumeMounts[mountPath]

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ func mergeProjectedVolumes(resources Resources) (Resources, error) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// Map of merged volume names -> bool, for not merging the same volume twice`
	`58`	`+ // This can happen due to different subpath volume mounts, where the mount path is the same. In this case, there should be only one volume.`
`58`	`59`	`mergedVolumeNames := map[string]bool{}`
`59`	`60`	`for _, mountPath := range mountPathOrder {`
`60`	`61`	`volumeMounts := mountPathToVolumeMounts[mountPath]`