Adds percentage

Author: Felix Glaser

main.go

@@ -27,6 +27,7 @@ var (
 	labelString     string
 	master          string
 	nsString        string
+	percentage      float64
 	runFrom         string
 	runUntil        string
 	version         string
@@ -37,11 +38,12 @@ func init() {
 	kingpin.Flag("debug", "Enable debug logging.").BoolVar(&debug)
 	kingpin.Flag("dry-run", "If true, don't actually do anything.").Default("true").BoolVar(&dryRun)
 	kingpin.Flag("excludeWeekends", "Do not run on weekends").BoolVar(&excludeWeekends)
-	kingpin.Flag("interval", "Interval between Pod terminations").DurationVar(&interval)
+	kingpin.Flag("interval", "Interval between Pod terminations").Default("1m").DurationVar(&interval)
 	kingpin.Flag("kubeconfig", "Path to a kubeconfig file").StringVar(&kubeconfig)
 	kingpin.Flag("labels", "A set of labels to restrict the list of affected pods. Defaults to everything.").StringVar(&labelString)
 	kingpin.Flag("master", "The address of the Kubernetes cluster to target").StringVar(&master)
 	kingpin.Flag("namespaces", "A set of namespaces to restrict the list of affected pods. Defaults to everything.").StringVar(&nsString)
+	kingpin.Flag("percentage", "How likely should a pod be killed every single run").Default("0.0").Float64Var(&percentage)
 	kingpin.Flag("run-from", "Start chaoskube daily at hours:minutes, e.g. 9:00").Default("0:00").StringVar(&runFrom)
 	kingpin.Flag("run-until", "Stop chaoskube daily at hours:minutes, e.g. 17:00").Default("0:00").StringVar(&runUntil)
 }
@@ -110,7 +112,7 @@ func main() {
 					log.Fatal(err)
 				}
 				for _, candidate := range candidates {
-					if util.PodShouldDie(candidate, interval) {
+					if util.PodShouldDie(candidate, interval, percentage) {
 						chaoskube.DeletePod(candidate)
 					}
 				}

util/util.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	"fmt"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -14,6 +13,10 @@ import (
 
 var timeNow = timeNowFunc
 
+func init() {
+	rand.Seed(timeNow().Unix())
+}
+
 func timeNowFunc() time.Time {
 	return time.Now()
 }
@@ -91,7 +94,7 @@ func ShouldRunNow(excludeWeekends bool, runFrom string, runUntil string) bool {
 }
 
 func parseLabel(label string) (rate int, span int, err error) {
-	split := strings.Split(label, "/")
+	split := strings.Split(label, ".")
 	if len(split) != 2 {
 		return 0, 0, err
 	}
@@ -111,19 +114,21 @@ func parseLabel(label string) (rate int, span int, err error) {
 	return
 }
 
-func getOdds(p v1.Pod, interval time.Duration) float64 {
+func getOdds(p v1.Pod, interval time.Duration, percentage float64) float64 {
 	labels := p.GetLabels()
+	if labels["chaos.schedule"] == "" {
+		return percentage
+	}
 	rate, span, err := parseLabel(labels["chaos.schedule"])
 	if err != nil {
+		log.Errorf("Error: %v from parsing %v's chaos.schedule, which is %s", err, p.Name, labels["chaos.schedule"])
 		return 0.0
 	}
-	// make intervall play well with the other ints
-	fmt.Println(rate, interval, span)
 	return (float64(rate) * interval.Minutes()) / float64(span)
 }
 
-func PodShouldDie(p v1.Pod, interval time.Duration) bool {
-	rand.Seed(timeNow().Unix())
-	odds := getOdds(p, interval)
-	return (rand.Float64() <= odds)
+func PodShouldDie(p v1.Pod, interval time.Duration, percentage float64) bool {
+	odds := getOdds(p, interval, percentage)
+	random := rand.Float64()
+	return (random <= odds)
 }

util/util_test.go

@@ -84,9 +84,9 @@ func TestShouldRunNow(t *testing.T) {
 
 func TestParseLabel(t *testing.T) {
 	labels := map[string]map[string]int{
-		"1/hour": {"rate": 1, "span": 60},
-		"2/day":  {"rate": 2, "span": 1440},
-		"3/week": {"rate": 3, "span": 10080},
+		"1.hour": {"rate": 1, "span": 60},
+		"2.day":  {"rate": 2, "span": 1440},
+		"3.week": {"rate": 3, "span": 10080},
 	}
 	for k, v := range labels {
 		rate, span, err := parseLabel(k)
@@ -103,17 +103,26 @@ func TestParseLabel(t *testing.T) {
 }
 
 func TestGetOdds(t *testing.T) {
-	schedules := map[string]float64{"1/hour": 1.0 / float64(60), "2/day": 2.0 / float64(60*24), "3/week": 3.0 / float64(60*24*7)}
+	schedules := map[string]float64{"1.hour": 1.0 / float64(60), "2.day": 2.0 / float64(60*24), "3.week": 3.0 / float64(60*24*7)}
+	percentage := 0.5
 	for schedule, initial_odd := range schedules {
 		p := NewPod("default", "foo", schedule)
 		intervalls := []time.Duration{time.Minute * 1, time.Minute * 5, time.Minute * 10, time.Minute * 60}
 		for _, interval := range intervalls {
-			odd := getOdds(p, interval)
+			odd := getOdds(p, interval, 0.5)
 			target_odd := int(initial_odd * interval.Minutes() * 100)
 			conv_odd := int(odd * 100)
 			if conv_odd != target_odd {
-				t.Fatalf("getOdds returned wrong odd want: %v got: %v, schedule: %v, interval: %v", target_odd, odd, schedule, interval)
+				t.Fatalf("getOdds returned wrong odd want: %v got: %v, schedule: %v, interval: %v, percentage: %v",
+					target_odd, odd, schedule, interval, percentage)
 			}
 		}
 	}
+	p := NewPod("default", "foo")
+	interval := 10 * time.Minute
+	odd := getOdds(p, interval, 0.5)
+	if odd != 0.5 {
+		t.Fatalf("getOdds returned wrong odd want: %v got: %v, schedule: %v, interval: %v, percentage: %v",
+			percentage, odd, "", interval, percentage)
+	}
 }