The podman driver should not be run as root

Use sudo for the podman commands instead
kubernetes · Apr 13, 2020 · c70c085 · c70c085
1 parent d734118
commit c70c085
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh
@@ -31,7 +31,6 @@ JOB_NAME="Podman_Linux"
 
 mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
 sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-SUDO_PREFIX="sudo -E "
 
 EXTRA_ARGS="--container-runtime=containerd"
 

diff --git a/pkg/drivers/kic/oci/info.go b/pkg/drivers/kic/oci/info.go
@@ -234,7 +234,7 @@ func dockerSystemInfo() (dockerSysInfo, error) {
 // podmanSysInfo returns podman system info --format '{{json .}}'
 func podmanSystemInfo() (podmanSysInfo, error) {
 	var ps podmanSysInfo
-	cmd := exec.Command(Podman, "system", "info", "--format", "'{{json .}}'")
+	cmd := exec.Command("sudo", Podman, "system", "info", "--format", "'{{json .}}'")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return ps, errors.Wrap(err, "get podman system info")

diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
@@ -126,7 +126,7 @@ func BareMetal(name string) bool {
 
 // NeedsRoot returns true if driver needs to run with root privileges
 func NeedsRoot(name string) bool {
-	return name == None || name == Podman
+	return name == None
 }
 
 // NeedsPortForward returns true if driver is unable provide direct IP connectivity

diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go
@@ -71,7 +71,7 @@ func status() registry.State {
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
-	cmd := exec.CommandContext(ctx, oci.Podman, "version", "-f", "{{.Version}}")
+	cmd := exec.CommandContext(ctx, "sudo", oci.Podman, "version", "-f", "{{.Version}}")
 	o, err := cmd.CombinedOutput()
 	output := string(o)
 	if err != nil {
@@ -89,7 +89,7 @@ func status() registry.State {
 	// Allow no more than 3 seconds for querying state
 	ctx, cancel = context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
-	err = exec.CommandContext(ctx, oci.Podman, "info").Run()
+	err = exec.CommandContext(ctx, "sudo", oci.Podman, "info").Run()
 	if err != nil {
 		return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Podman is not running or taking too long to respond. Try: restarting podman."}
 	}