Issue1316 Pod creation with secret volumemount (#1318)

* CheckandEstimate implementation * fixed variable rename * fixed gofmt * fixed feedbacks * Fixed the duplicate mountpath issue
argoproj · Apr 12, 2019 · 6607dca · 6607dca
1 parent a5a2bcf
commit 6607dca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/workflow/controller/workflowpod.go b/workflow/controller/workflowpod.go
@@ -848,7 +848,7 @@ func createSecretVolumes(tmpl *wfv1.Template) ([]apiv1.Volume, []apiv1.VolumeMou
 		secretVolumes = append(secretVolumes, val)
 		secretVolMounts = append(secretVolMounts, apiv1.VolumeMount{
 			Name:      volMountName,
-			MountPath: common.SecretVolMountPath,
+			MountPath: common.SecretVolMountPath + "/" + val.Name,
 			ReadOnly:  true,
 		})
 	}
@@ -900,7 +900,7 @@ func createSecretVal(volMap map[string]apiv1.Volume, secret *apiv1.SecretKeySele
 	if vol, ok := volMap[secret.Name]; ok {
 		key := apiv1.KeyToPath{
 			Key:  secret.Key,
-			Path: secret.Name + "/" + secret.Key,
+			Path: secret.Key,
 		}
 		if val, _ := keyMap[secret.Name+"-"+secret.Key]; !val {
 			keyMap[secret.Name+"-"+secret.Key] = true
@@ -915,7 +915,7 @@ func createSecretVal(volMap map[string]apiv1.Volume, secret *apiv1.SecretKeySele
 					Items: []apiv1.KeyToPath{
 						{
 							Key:  secret.Key,
-							Path: secret.Name + "/" + secret.Key,
+							Path: secret.Key,
 						},
 					},
 				},