titan/soteria
3
0
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

WIP: The prior commit (51133b5) on this PR added the cachePath constant but never updated the three call sites that still used the raw "/cache" literal. I replaced all three: the two corev1.VolumeMount MountPath fields (in buildBackupJob and b #3

Draft
bstein wants to merge 2 commits from hermes-repair/sonar-AZ9pTqVcN0JrBQvDGDs3 into main
pull from: hermes-repair/sonar-AZ9pTqVcN0JrBQvDGDs3
merge into: titan:main
Conversation 0 Commits 2 Files Changed 1 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/k8s/job_manifests.go
View File

@ -14,6 +14,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
const cachePath = "/cache"
func buildBackupJob(cfg *config.Config, req api.BackupRequest, jobName, secretName, repository string, dedupeEnabled bool, keepLast int) *batchv1.Job { func buildBackupJob(cfg *config.Config, req api.BackupRequest, jobName, secretName, repository string, dedupeEnabled bool, keepLast int) *batchv1.Job {
labels := map[string]string{ labels := map[string]string{
labelAppName: "soteria", labelAppName: "soteria",
@ -42,7 +44,7 @@ func buildBackupJob(cfg *config.Config, req api.BackupRequest, jobName, secretNa
Resources: jobResources(cfg), Resources: jobResources(cfg),
VolumeMounts: []corev1.VolumeMount{ VolumeMounts: []corev1.VolumeMount{
{Name: "data", MountPath: "/data", ReadOnly: true}, {Name: "data", MountPath: "/data", ReadOnly: true},
{Name: "cache", MountPath: "/cache"}, {Name: "cache", MountPath: cachePath},
}, },
}, },
}, },
@ -115,7 +117,7 @@ func buildRestoreJob(cfg *config.Config, req api.RestoreTestRequest, jobName, se
Resources: jobResources(cfg), Resources: jobResources(cfg),
VolumeMounts: []corev1.VolumeMount{ VolumeMounts: []corev1.VolumeMount{
{Name: "restore", MountPath: "/restore"}, {Name: "restore", MountPath: "/restore"},
{Name: "cache", MountPath: "/cache"}, {Name: "cache", MountPath: cachePath},
}, },
}, },
}, },
@ -258,7 +260,7 @@ func resticEnv(cfg *config.Config, secretName, repository string) []corev1.EnvVa
} }
env := []corev1.EnvVar{ env := []corev1.EnvVar{
{Name: "RESTIC_REPOSITORY", Value: repository}, {Name: "RESTIC_REPOSITORY", Value: repository},
{Name: "RESTIC_CACHE_DIR", Value: "/cache"}, {Name: "RESTIC_CACHE_DIR", Value: cachePath},
{ {
Name: "AWS_ACCESS_KEY_ID", Name: "AWS_ACCESS_KEY_ID",
ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: secretName}, Key: "AWS_ACCESS_KEY_ID"}}, ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: secretName}, Key: "AWS_ACCESS_KEY_ID"}},