Merge pull request #260 from weaveworks/lili/disable-cri-endpoint

bootstrap: Disable cri-endpoint flag

bootstrap/main.go

@@ -24,10 +24,7 @@ import (
 )
 
 const (
-	agentK8sURLTemplate = "{{.Scheme}}://{{.LauncherHostname}}/k8s/agent.yaml" +
-		"{{if .CRIEndpoint}}" +
-		"?cri-endpoint={{.CRIEndpoint}}" +
-		"{{end}}"
+	agentK8sURLTemplate = "{{.Scheme}}://{{.LauncherHostname}}/k8s/agent.yaml"
 )
 
 type options struct {
@@ -39,7 +36,6 @@ type options struct {
 	GKE              bool   `long:"gke" description:"Create clusterrolebinding for GKE instances"`
 	ReportErrors     bool   `long:"report-errors" description:"Should install errors be reported to sentry"`
 	SkipChecks       bool   `long:"skip-checks" description:"Skip pre-flight checks"`
-	CRIEndpoint      string `long:"cri-endpoint" description:"Set custom CRI container runtime endpoint. e.g.: 'unix:///var/run/crio/crio.sock'"`
 }
 
 func init() {
@@ -76,18 +72,6 @@ func mainImpl() {
 		exitWithCapture(opts, "Could not find kubectl in PATH, please install it: https://kubernetes.io/docs/tasks/tools/install-kubectl/\n")
 	}
 
-	// If the user has not passed the container runtime endpoint
-	// we try our best to guess and log it.
-	if opts.CRIEndpoint == "" {
-		opts.CRIEndpoint, err = matchContainerRuntimeEndpoint(kubectlClient)
-		if err != nil {
-			log.Fatal("error detecting container runtime endpoint: ", err)
-		}
-		if opts.CRIEndpoint != "" {
-			fmt.Printf("Detected container runtime endpoint: %s. To override the container runtime endpoint set the '--cri-endpoint=<ENDPOINT>' flag.\n", opts.CRIEndpoint)
-		}
-	}
-
 	agentK8sURL, err := text.ResolveString(agentK8sURLTemplate, opts)
 	if err != nil {
 		log.Fatal("invalid URL template:", err)