resources: pass smbdVols to buildEnsureShareCtr

synarete · phlogistonjohn · commit 7fa74c292268 · 2022-06-06T10:58:42.000-04:00
Commit b140141 ("resources: create ensure-share-paths init container") introduced a new init container, which changes the mode of share's directory. Unfortunately, in buildADPodSpec we pass the wrong volumes slice (a slice which does _not_ have the share volume). This bug is evident only when running with smbmetrics enabled, on OpenShift. Signed-off-by: Shachar Sharon <ssharon@redhat.com>
diff --git a/internal/resources/pods.go b/internal/resources/pods.go
@@ -113,7 +113,7 @@ func buildADPodSpec(
 	podSpec.Volumes = getVolumes(volumes)
 	podSpec.InitContainers = []corev1.Container{
 		buildInitCtr(planner, podEnv, smbAllVols),
-		buildEnsureShareCtr(planner, podEnv, smbAllVols),
+		buildEnsureShareCtr(planner, podEnv, smbdVols),
 		buildMustJoinCtr(planner, joinEnv, joinVols),
 	}
 	podSpec.Containers = containers

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func buildADPodSpec(`
`113`	`113`	`podSpec.Volumes = getVolumes(volumes)`
`114`	`114`	`podSpec.InitContainers = []corev1.Container{`
`115`	`115`	`buildInitCtr(planner, podEnv, smbAllVols),`
`116`		`- buildEnsureShareCtr(planner, podEnv, smbAllVols),`
	`116`	`+ buildEnsureShareCtr(planner, podEnv, smbdVols),`
`117`	`117`	`buildMustJoinCtr(planner, joinEnv, joinVols),`
`118`	`118`	`}`
`119`	`119`	`podSpec.Containers = containers`