Daemonst removal of hardcoded runAsUser

cmd/daemonset-check/main.go

@@ -37,11 +37,13 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	checkclient "github.com/Comcast/kuberhealthy/v2/pkg/checks/external/checkclient"
+	"github.com/Comcast/kuberhealthy/v2/pkg/checks/external/util"
 	"github.com/Comcast/kuberhealthy/v2/pkg/kubeClient"
 )
 
 const daemonSetBaseName = "ds-check"
 const defaultDSCheckTimeout = "10m"
+const defaultUser = int64(1000)
 
 var KubeConfigFile = filepath.Join(os.Getenv("HOME"), ".kube", "config")
 var Namespace string
@@ -189,9 +191,15 @@ func (dsc *Checker) generateDaemonSetSpec() {
 
 	checkRunTime := strconv.Itoa(int(CheckRunTime))
 	terminationGracePeriod := int64(1)
-	runAsUser := int64(1000)
-	log.Debug("Running daemon set as user 1000.")
-	var err error
+
+	// Set the runAsUser
+	runAsUser := defaultUser
+	currentUser, err := util.GetCurrentUser(defaultUser)
+	if err != nil {
+		log.Infoln("Unable to get the current user id %v", err)
+	}
+	log.Infoln("runAsUser will be set to %v", currentUser)
+	runAsUser = currentUser
 
 	// if a list of tolerations wasnt passed in, default to tolerating all taints
 	if len(dsc.Tolerations) == 0 {

pkg/checks/external/util/main.go

@@ -2,6 +2,8 @@ package util
 
 import (
 	"os"
+	"os/user"
+	"strconv"
 	"strings"
 
 	apiv1 "k8s.io/api/core/v1"
@@ -43,3 +45,23 @@ func getKuberhealthyPod(client *kubernetes.Clientset, namespace, podName string)
 	}
 	return kHealthyPod, nil
 }
+
+// GetCurrentUser checks which os use that is running the app
+func GetCurrentUser(defaultUser int64) (int64, error) {
+	runAsUser := defaultUser
+
+	currentUser, err := user.Current()
+	if err != nil {
+		return 0, err
+	}
+	intCurrentUser, err := strconv.ParseInt(currentUser.Uid, 0, 64)
+	if err != nil {
+		return 0, err
+	}
+	if intCurrentUser == 0 {
+		return defaultUser, nil
+	}
+	runAsUser = intCurrentUser
+	return runAsUser, nil
+
+}