Minor updates to enhance readability

h0n9 · Jun 4, 2024 · 223fabe · 223fabe
1 parent fd213ae
commit 223fabe
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/webhook/mutator.go b/webhook/mutator.go
@@ -69,21 +69,25 @@ func (mutator *Mutator) Handle(ctx context.Context, req admission.Request) admis
 			VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}},
 		})
 
+		// prepare mount path for general use
+		mountPath := output
+		subPath := filepath.Base(mountPath)
+
 		// mount volume to every init containers
 		for i := range pod.Spec.InitContainers {
 			pod.Spec.InitContainers[i].VolumeMounts = append(pod.Spec.InitContainers[i].VolumeMounts, corev1.VolumeMount{
 				Name:      injectorName,
-				MountPath: output,
-				SubPath:   filepath.Base(output),
+				MountPath: mountPath,
+				SubPath:   subPath,
 			})
 		}
 
 		// mount volume to every containers
 		for i := range pod.Spec.Containers {
 			pod.Spec.Containers[i].VolumeMounts = append(pod.Spec.Containers[i].VolumeMounts, corev1.VolumeMount{
 				Name:      injectorName,
-				MountPath: output,
-				SubPath:   filepath.Base(output),
+				MountPath: mountPath,
+				SubPath:   subPath,
 			})
 		}
 
@@ -97,7 +101,7 @@ func (mutator *Mutator) Handle(ctx context.Context, req admission.Request) admis
 				fmt.Sprintf("--provider=%s", providerStr),
 				fmt.Sprintf("--secret-id=%s", secretID),
 				fmt.Sprintf("--template=%s", util.EncodeBase64(tmplStr)),
-				fmt.Sprintf("--output=%s", filepath.Join(csm.InjectorVolumeMountPath, filepath.Base(output))),
+				fmt.Sprintf("--output=%s", filepath.Join(csm.InjectorVolumeMountPath, subPath)),
 			},
 			VolumeMounts: []corev1.VolumeMount{
 				{