Merge pull request #1391 from weaveworks/1380-k8s-checkpoint-flag

Add kubernetes checkpoint flag
weaveworks · Apr 28, 2016 · b8cd9ec · b8cd9ec
2 parents 64450a4 + 3598532
commit b8cd9ec
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 83 deletions.
diff --git a/prog/probe.go b/prog/probe.go
@@ -42,7 +42,7 @@ const (
 
 var pluginAPIVersion = "1"
 
-func check() {
+func check(flags map[string]string) {
 	handleResponse := func(r *checkpoint.CheckResponse, err error) {
 		if err != nil {
 			log.Errorf("Error checking version: %v", err)
@@ -56,6 +56,7 @@ func check() {
 	params := checkpoint.CheckParams{
 		Product: "scope-probe",
 		Version: version,
+		Flags:   flags,
 	}
 	resp, err := checkpoint.Check(&params)
 	handleResponse(resp, err)
@@ -87,7 +88,11 @@ func probeMain(flags probeFlags) {
 	)
 	log.Infof("probe starting, version %s, ID %s", version, probeID)
 	log.Infof("command line: %v", os.Args)
-	go check()
+	checkpointFlags := map[string]string{}
+	if flags.kubernetesEnabled {
+		checkpointFlags["kubernetes_enabled"] = "true"
+	}
+	go check(checkpointFlags)
 
 	var targets = []string{fmt.Sprintf("localhost:%d", xfer.AppPort)}
 	if len(flag.Args()) > 0 {

diff --git a/vendor/github.com/weaveworks/go-checkpoint/Makefile b/vendor/github.com/weaveworks/go-checkpoint/Makefile
diff --git a/vendor/github.com/weaveworks/go-checkpoint/README.md b/vendor/github.com/weaveworks/go-checkpoint/README.md
diff --git a/vendor/github.com/weaveworks/go-checkpoint/backend/Dockerfile b/vendor/github.com/weaveworks/go-checkpoint/backend/Dockerfile
diff --git a/vendor/github.com/weaveworks/go-checkpoint/backend/build.sh b/vendor/github.com/weaveworks/go-checkpoint/backend/build.sh
diff --git a/vendor/github.com/weaveworks/go-checkpoint/checkpoint.go b/vendor/github.com/weaveworks/go-checkpoint/checkpoint.go