fix default securityContext passing to restore init-container/job + f…

…ix container name (#823)
stashed · Jul 3, 2019 · 08b0f50 · 08b0f50
1 parent 4aa9467
commit 08b0f50
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/pkg/backup/backupsession.go b/pkg/backup/backupsession.go
@@ -369,7 +369,10 @@ func (c *BackupSessionController) electBackupLeader(backupSession *api_v1beta1.B
 				err := c.backup(backupSession, backupConfiguration)
 				if err != nil {
 					// send failure metrics and update BackupSession status
-					err = c.handleBackupFailure(backupSession, err)
+					err2 := c.handleBackupFailure(backupSession, err)
+					if err2 != nil {
+						err = errors.NewAggregate([]error{err, err2})
+					}
 					// step down from leadership so that other replicas can start backup
 					cancel()
 					// log failure. don't fail the container as it may interrupt user's service
@@ -423,7 +426,9 @@ func (c *BackupSessionController) HandleBackupSetupFailure(setupErr error) {
 	backupConfiguration, err := c.StashClient.StashV1beta1().BackupConfigurations(c.Namespace).Get(c.BackupConfigurationName, metav1.GetOptions{})
 	if err != nil {
 		e2 := errors.NewAggregate([]error{setupErr, err})
-		log.Fatalln("failed to setup backup process. Reason: ", e2.Error())
+		if e2 != nil {
+			log.Fatalln("failed to setup backup process. Reason: ", e2.Error())
+		}
 	}
 	c.Metrics.Labels = append(c.Metrics.Labels, fmt.Sprintf("BackupConfiguration=%s", backupConfiguration.Name))
 	if backupConfiguration.Spec.Target != nil {

diff --git a/pkg/resolve/task.go b/pkg/resolve/task.go
@@ -3,6 +3,7 @@ package resolve
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"gomodules.xyz/envsubst"
 	core "k8s.io/api/core/v1"
@@ -63,7 +64,7 @@ func (o TaskResolver) GetPodSpec() (core.PodSpec, error) {
 
 		// container from function spec
 		container := core.Container{
-			Name:            fmt.Sprintf("%s-%d", function.Name, i), // TODO
+			Name:            fmt.Sprintf("%s-%d", strings.ReplaceAll(function.Name, ".", "-"), i), // TODO
 			Image:           function.Spec.Image,
 			Command:         function.Spec.Command,
 			Args:            function.Spec.Args,

diff --git a/pkg/util/init_container.go b/pkg/util/init_container.go
@@ -109,6 +109,8 @@ func NewRestoreInitContainer(rs *v1beta1_api.RestoreSession, repository *v1alpha
 	}
 	if rs.Spec.RuntimeSettings.Container != nil {
 		initContainer.SecurityContext = UpsertSecurityContext(securityContext, rs.Spec.RuntimeSettings.Container.SecurityContext)
+	} else {
+		initContainer.SecurityContext = securityContext
 	}
 
 	return initContainer

diff --git a/pkg/util/job.go b/pkg/util/job.go
@@ -270,6 +270,8 @@ func NewPVCRestorerJob(rs *api_v1beta1.RestoreSession, repository *api_v1alpha1.
 	}
 	if rs.Spec.RuntimeSettings.Container != nil {
 		container.SecurityContext = UpsertSecurityContext(securityContext, rs.Spec.RuntimeSettings.Container.SecurityContext)
+	} else {
+		container.SecurityContext = securityContext
 	}
 
 	jobTemplate := &core.PodTemplateSpec{