fix: fix empty space formatting issue in the rsync job helm template (#…

…250) * fix: fix empty space formatting issue in the rsync job helm template Signed-off-by: Alex Romanenko <[email protected] * Update integration/integration_test.go Co-authored-by: Utku Özdemir <[email protected]> --------- Signed-off-by: Alex Romanenko <[email protected] Co-authored-by: Utku Özdemir <[email protected]>
utkuozdemir · Sep 29, 2023 · 6073480 · 6073480
1 parent 4051318
commit 6073480
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/helm/pv-migrate/templates/rsync/job.yaml b/helm/pv-migrate/templates/rsync/job.yaml
@@ -38,7 +38,7 @@ spec:
               rc=1
               retries={{ .Values.rsync.maxRetries }}
               period={{ .Values.rsync.retryPeriodSeconds }}
-              {{- if .Values.rsync.fixPrivateKeyPerms -}}
+              {{ if .Values.rsync.fixPrivateKeyPerms -}}
               chmod 400 {{ .Values.rsync.privateKeyMountPath }}
               {{- end }}
               until [ "$n" -ge "$retries" ]

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -52,6 +52,8 @@ const (
 	migrateCmdlineWithNetpols = migrateCmdline +
 		"--helm-set rsync.networkPolicy.enabled=true " +
 		"--helm-set sshd.networkPolicy.enabled=true"
+        migrateCmdlineWithNetpolsAndRsyncFixPrivateKeyPerms = migrateCmdlineWithNetpols +
+                " --helm-set rsync.fixPrivateKeyPerms=true"
 )
 
 var (
@@ -177,7 +179,7 @@ func TestSameNSLbSvc(t *testing.T) {
 	_, err := execInPod(ctx, mainClusterCli, ns1, "dest", generateExtraDataShellCommand)
 	assert.NoError(t, err)
 
-	cmd := fmt.Sprintf("%s -s lbsvc -i -n %s -N %s --lbsvc-timeout 5m source dest", migrateCmdlineWithNetpols, ns1, ns1)
+	cmd := fmt.Sprintf("%s -s lbsvc -i -n %s -N %s --lbsvc-timeout 5m source dest", migrateCmdlineWithNetpolsAndRsyncFixPrivateKeyPerms, ns1, ns1)
 	assert.NoError(t, runCliApp(ctx, cmd))
 
 	stdout, err := execInPod(ctx, mainClusterCli, ns1, "dest", printDataUIDGIDContentShellCommand)