inject script instead of baking into image

Author: clbx

main.go

@@ -43,7 +43,7 @@ func main() {
 		},
 	}
 
-	rootCmd.Flags().StringVarP(&image, "image", "i", "clbx/kubectl-browse-pvc", "Image to mount job to")
+	rootCmd.Flags().StringVarP(&image, "image", "i", "alpine", "Image to mount job to")
 	kubeConfigFlags.AddFlags(rootCmd.Flags())
 
 	if err := rootCmd.Execute(); err != nil {
@@ -134,7 +134,7 @@ func browseCommand(kubeConfigFlags *genericclioptions.ConfigFlags, pvcName strin
 		image:     image,
 		namespace: *kubeConfigFlags.Namespace,
 		pvc:       *targetPvc,
-		cmd:       []string{"/bin/bash", "-c", "--"},
+		cmd:       []string{"/bin/sh", "-c", "--"},
 	}
 
 	// Build the Job
@@ -208,7 +208,7 @@ func browseCommand(kubeConfigFlags *genericclioptions.ConfigFlags, pvcName strin
 		Namespace(options.namespace).
 		SubResource("exec").
 		VersionedParams(&corev1.PodExecOptions{
-			Command: []string{"bash", "-c", "cd /mnt && /bin/bash"},
+			Command: []string{"sh", "-c", "cd /mnt && (ash || bash || sh)"},
 			Stdin:   true,
 			Stdout:  true,
 			Stderr:  true,

util.go

@@ -13,6 +13,24 @@ type PodOptions struct {
 	cmd       []string
 }
 
+var script = `
+base_processes=$(ps aux | grep -E "ash|bash|sh" | grep -v grep | wc -l)
+echo "Processes: $base_processes"
+sleep 2
+
+while :; do
+    shell_processes=$(ps aux | grep -E "ash|bash|sh" | grep -v grep | wc -l)
+    if [ "$shell_processes" -gt "$base_processes" ]; then
+        echo "Found an additional process"
+        while [ "$shell_processes" -gt "$base_processes" ]; do
+            sleep 2
+            shell_processes=$(ps aux | grep -E "ash|bash|sh" | grep -v grep | wc -l)
+        done
+        exit 0
+    fi 
+done
+`
+
 // Finds if a pod that attached to a PVC
 func findPodByPVC(podList corev1.PodList, pvc corev1.PersistentVolumeClaim) *corev1.Pod {
 	for _, pod := range podList.Items {
@@ -33,24 +51,25 @@ func buildPvcbGetJob(options PodOptions) *batchv1.Job {
 
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "pvcb-edit-" + options.pvc.Name,
+			Name:      "browse-pvc" + options.pvc.Name,
 			Namespace: options.namespace,
 		},
 		Spec: batchv1.JobSpec{
 			TTLSecondsAfterFinished: TTLSecondsAfterFinished,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "pvcb-edit",
+					Name: "browse-pvc",
 				},
 				Spec: corev1.PodSpec{
 					RestartPolicy: "Never",
 					Containers: []corev1.Container{
 						{
-							Name:  "pvcb-edit",
+							Name:  "browser",
 							Image: image,
 							//Command: []string{"/bin/bash", "-c", "--"},
 							Command: options.cmd,
-							Args:    []string{"/entrypoint.sh"},
+							//Args:    []string{"/entrypoint.sh"},
+							Args: []string{script},
 							VolumeMounts: []corev1.VolumeMount{
 								{
 									Name:      "target-pvc",