Merge pull request #775 from carolynvs/sync-vendor

Build Fixes from PR #765

Author: carolynvs-msft

pkg/driver/kubernetes.go

@@ -173,7 +173,7 @@ func (k *KubernetesDriver) Run(op *driver.Operation) error {
 		}
 
 		container.EnvFrom = []v1.EnvFromSource{
-			v1.EnvFromSource{
+			{
 				SecretRef: &v1.SecretEnvSource{
 					LocalObjectReference: v1.LocalObjectReference{
 						Name: envsecret.ObjectMeta.Name,
@@ -264,6 +264,9 @@ func (k *KubernetesDriver) watchJobStatusAndLogs(selector metav1.ListOptions, ou
 			break
 		}
 	}
+	if err != nil {
+		return err
+	}
 
 	// Wait for pod logs to finish printing
 	for i := 0; i < int(k.requiredCompletions); i++ {
@@ -347,7 +350,7 @@ func generateFileSecret(files map[string]string) (*v1.Secret, []v1.VolumeMount)
 
 	i := 0
 	for path, contents := range files {
-		key := strings.ReplaceAll(filepath.ToSlash(path), "/", "_")
+		key := strings.Replace(filepath.ToSlash(path), "/", "_", -1)
 		data[key] = contents
 		mounts[i] = v1.VolumeMount{
 			Name:      k8sFileSecretVolume,