Merge pull request #49 from andyxning/add_support_for_running_standalone

add support for running standalone

Author: Random-Liu

Godeps/Godeps.json

@@ -1,8 +1,12 @@
 # node-problem-detector
 node-problem-detector aims to make various node problems visible to the upstream
-layers in cluster management stack. It is a [DaemonSet](http://kubernetes.io/docs/admin/daemons/)
-detecting node problems and reporting them to apiserver. Now it is running as
-a [Kubernetes Addon](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+layers in cluster management stack.
+It is a daemon runs on each node, detects node
+problems and reports them to apiserver.
+node-problem-detector can either run as a
+[DaemonSet](http://kubernetes.io/docs/admin/daemons/) or run standalone.
+Now it is running as a
+[Kubernetes Addon](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
 enabled by default in the GCE cluster.
 
 # Background
@@ -48,6 +52,15 @@ List of supported problem daemons:
 | [KernelMonitor](https://github.com/kubernetes/node-problem-detector/tree/master/pkg/kernelmonitor) | KernelDeadlock | A problem daemon monitors kernel log and reports problem according to predefined rules. |
 
 # Usage
+## Flags
+* `-apiserver-override`: An URI parameter used to customize how node-problem-detector
+connects the apiserver. The format is the same with the
+[`source`](https://github.com/kubernetes/heapster/blob/master/docs/source-configuration.md#kubernetes)
+flag of [Heapster](https://github.com/kubernetes/heapster):
+```
+http://APISERVER_IP:APISERVER_PORT?inClusterConfig=false&userServiceAccount=false&auth=&insecure=
+```
+
 ## Build Image
 Run `make` in the top directory. It will:
 * Build the binary.
@@ -92,6 +105,17 @@ spec:
 * If needed, you can use [ConfigMap](http://kubernetes.io/docs/user-guide/configmap/)
 to overwrite the `config/`.
 
+## Start Standalone
+To run node-problem-detector standalone, you should set `inClusterConfig` to `false` and
+teach node-problem-detector how to access apiserver with `apiserver-override`.
+
+To run node-problem-detector standalone with an insecure apiserver connection:
+```
+node-problem-detector -apiserver-override=http://APISERVER_IP:APISERVER_INSECURE_PORT?inClusterConfig=false
+```
+
+For more scenarios, see [here](https://github.com/kubernetes/heapster/blob/master/docs/source-configuration.md#kubernetes)
+
 # Links
 * [Design Doc](https://docs.google.com/document/d/1cs1kqLziG-Ww145yN6vvlKguPbQQ0psrSBnEqpy0pzE/edit?usp=sharing)
 * [Slides](https://docs.google.com/presentation/d/1bkJibjwWXy8YnB5fna6p-Ltiy-N5p01zUsA22wCNkXA/edit?usp=sharing)

README.md

@@ -18,18 +18,30 @@ package main
 
 import (
 	"flag"
+	"net/url"
 
 	"k8s.io/node-problem-detector/pkg/kernelmonitor"
 	"k8s.io/node-problem-detector/pkg/problemdetector"
+
+	"github.com/golang/glog"
 )
 
 var (
 	kernelMonitorConfigPath = flag.String("kernel-monitor", "/config/kernel_monitor.json", "The path to the kernel monitor config file")
+	apiServerOverride       = flag.String("apiserver-override", "", "custom URI used to connect to Kubernetes ApiServer")
 )
 
+func validateCmdParams() {
+	if _, err := url.Parse(*apiServerOverride); err != nil {
+		glog.Fatalf("apiserver-override %q is not a valid HTTP URI: %v", *apiServerOverride, err)
+	}
+}
+
 func main() {
 	flag.Parse()
+	validateCmdParams()
+
 	k := kernelmonitor.NewKernelMonitorOrDie(*kernelMonitorConfigPath)
-	p := problemdetector.NewProblemDetector(k)
+	p := problemdetector.NewProblemDetector(k, *apiServerOverride)
 	p.Run()
 }

node_problem_detector.go

@@ -19,16 +19,17 @@ package problemclient
 import (
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"os"
 
-	"k8s.io/kubernetes/pkg/util/clock"
-
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/record"
-	"k8s.io/kubernetes/pkg/client/restclient"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/util/clock"
+
+	"k8s.io/heapster/common/kubernetes"
 )
 
 // Client is the interface of problem client
@@ -50,12 +51,17 @@ type nodeProblemClient struct {
 }
 
 // NewClientOrDie creates a new problem client, panics if error occurs.
-func NewClientOrDie() Client {
+func NewClientOrDie(apiServerOverride string) Client {
 	c := &nodeProblemClient{clock: clock.RealClock{}}
-	cfg, err := restclient.InClusterConfig()
+
+	// we have checked it is a valid URI after command line argument is parsed.:)
+	uri, _ := url.Parse(apiServerOverride)
+
+	cfg, err := kubernetes.GetKubeClientConfig(uri)
 	if err != nil {
 		panic(err)
 	}
+
 	// TODO(random-liu): Set QPS Limit
 	c.client = client.NewOrDie(cfg)
 	// Get node name from environment variable NODE_NAME

pkg/problemclient/problem_client.go

@@ -41,8 +41,8 @@ type problemDetector struct {
 
 // NewProblemDetector creates the problem detector. Currently we just directly passed in the problem daemons, but
 // in the future we may want to let the problem daemons register themselves.
-func NewProblemDetector(monitor kernelmonitor.KernelMonitor) ProblemDetector {
-	client := problemclient.NewClientOrDie()
+func NewProblemDetector(monitor kernelmonitor.KernelMonitor, apiServerOverride string) ProblemDetector {
+	client := problemclient.NewClientOrDie(apiServerOverride)
 	return &problemDetector{
 		client:           client,
 		conditionManager: condition.NewConditionManager(client, clock.RealClock{}),