wip: excluded dates

linki · Mar 6, 2018 · e0b7e8b · e0b7e8b
1 parent 1c7a239
commit e0b7e8b
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 3 deletions.
diff --git a/chaoskube/chaoskube.go b/chaoskube/chaoskube.go
@@ -31,6 +31,8 @@ type Chaoskube struct {
 	ExcludedWeekdays []time.Weekday
 	// a list of time periods of a day when termination is suspended
 	ExcludedTimesOfDay []util.TimePeriod
+	// TODO
+	ExcludedDates []time.Time
 	// the timezone to apply when detecting the current weekday
 	Timezone *time.Location
 	// an instance of logrus.StdLogger to write log messages to
@@ -57,14 +59,15 @@ var (
 // pods as well as whether to enable dryRun mode and a seed to seed the randomizer
 // with. You can also provide a list of weekdays and corresponding time zone when
 // chaoskube should be inactive.
-func New(client kubernetes.Interface, labels, annotations, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, timezone *time.Location, logger log.FieldLogger, dryRun bool) *Chaoskube {
+func New(client kubernetes.Interface, labels, annotations, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, excludedDates []time.Time, timezone *time.Location, logger log.FieldLogger, dryRun bool) *Chaoskube {
 	return &Chaoskube{
 		Client:             client,
 		Labels:             labels,
 		Annotations:        annotations,
 		Namespaces:         namespaces,
 		ExcludedWeekdays:   excludedWeekdays,
 		ExcludedTimesOfDay: excludedTimesOfDay,
+		ExcludedDates:      excludedDates,
 		Timezone:           timezone,
 		Logger:             logger,
 		DryRun:             dryRun,
@@ -146,6 +149,14 @@ func (c *Chaoskube) TerminateVictim() error {
 		}
 	}
 
+	for _, d := range c.ExcludedDates {
+		if d.Day() == now.Day() && d.Month() == now.Month() {
+			// TODO
+			c.Logger.WithField("date", now.Format("Jan 2")).Debug("date excluded")
+			return nil
+		}
+	}
+
 	victim, err := c.Victim()
 	if err == errPodNotFound {
 		c.Logger.Debug(msgVictimNotFound)

diff --git a/chaoskube/chaoskube_test.go b/chaoskube/chaoskube_test.go
@@ -39,6 +39,7 @@ func (suite *Suite) TestNew() {
 		namespaces, _      = labels.Parse("qux")
 		excludedWeekdays   = []time.Weekday{time.Friday}
 		excludedTimesOfDay = []util.TimePeriod{util.TimePeriod{}}
+		excludedDates      = []time.Time{time.Now()}
 	)
 
 	chaoskube := New(
@@ -48,6 +49,7 @@ func (suite *Suite) TestNew() {
 		namespaces,
 		excludedWeekdays,
 		excludedTimesOfDay,
+		excludedDates,
 		time.UTC,
 		logger,
 		false,
@@ -60,6 +62,7 @@ func (suite *Suite) TestNew() {
 	suite.Equal("qux", chaoskube.Namespaces.String())
 	suite.Equal(excludedWeekdays, chaoskube.ExcludedWeekdays)
 	suite.Equal(excludedTimesOfDay, chaoskube.ExcludedTimesOfDay)
+	suite.Equal(excludedDates, chaoskube.ExcludedDates)
 	suite.Equal(time.UTC, chaoskube.Timezone)
 	suite.Equal(logger, chaoskube.Logger)
 	suite.Equal(false, chaoskube.DryRun)
@@ -102,6 +105,7 @@ func (suite *Suite) TestCandidates() {
 			namespaceSelector,
 			[]time.Weekday{},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			time.UTC,
 			false,
 		)
@@ -134,6 +138,7 @@ func (suite *Suite) TestVictim() {
 			labels.Everything(),
 			[]time.Weekday{},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			time.UTC,
 			false,
 		)
@@ -150,6 +155,7 @@ func (suite *Suite) TestNoVictimReturnsError() {
 		labels.Everything(),
 		[]time.Weekday{},
 		[]util.TimePeriod{},
+		[]time.Time{},
 		time.UTC,
 		false,
 	)
@@ -176,6 +182,7 @@ func (suite *Suite) TestDeletePod() {
 			labels.Everything(),
 			[]time.Weekday{},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			time.UTC,
 			tt.dryRun,
 		)
@@ -210,6 +217,7 @@ func (suite *Suite) TestTerminateVictim() {
 	for _, tt := range []struct {
 		excludedWeekdays   []time.Weekday
 		excludedTimesOfDay []util.TimePeriod
+		excludedDates      []time.Time
 		now                func() time.Time
 		timezone           *time.Location
 		remainingPodCount  int
@@ -218,6 +226,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			time.UTC,
 			1,
@@ -226,6 +235,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{time.Friday},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			time.UTC,
 			2,
@@ -234,6 +244,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{afternoon},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			time.UTC,
 			2,
@@ -242,6 +253,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{time.Friday},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(24 * time.Hour) },
 			time.UTC,
 			1,
@@ -250,6 +262,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{time.Friday},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(7 * 24 * time.Hour) },
 			time.UTC,
 			2,
@@ -258,6 +271,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{afternoon},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(+2 * time.Hour) },
 			time.UTC,
 			1,
@@ -266,6 +280,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{afternoon},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(+24 * time.Hour) },
 			time.UTC,
 			2,
@@ -274,6 +289,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{time.Friday},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			australia,
 			1,
@@ -282,6 +298,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{afternoon},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			australia,
 			1,
@@ -290,6 +307,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{time.Monday, time.Friday},
 			[]util.TimePeriod{},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			time.UTC,
 			2,
@@ -298,6 +316,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{morning, afternoon},
+			[]time.Time{},
 			ThankGodItsFriday{}.Now,
 			time.UTC,
 			2,
@@ -306,6 +325,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{midnight},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(-15 * time.Hour) },
 			time.UTC,
 			2,
@@ -314,6 +334,7 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{midnight},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(-17 * time.Hour) },
 			time.UTC,
 			1,
@@ -322,17 +343,82 @@ func (suite *Suite) TestTerminateVictim() {
 		{
 			[]time.Weekday{},
 			[]util.TimePeriod{midnight},
+			[]time.Time{},
 			func() time.Time { return ThankGodItsFriday{}.Now().Add(-13 * time.Hour) },
 			time.UTC,
 			1,
 		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{ThankGodItsFriday{}.Now()},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			2,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(1870, 9, 24, 10, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			2,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(0, 9, 24, 0, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			2,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(1870, 9, 25, 10, 00, 00, 00, time.UTC), time.Date(1870, 9, 24, 10, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			2,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(1869, 9, 25, 10, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			1,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(1869, 10, 24, 10, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			1,
+		},
+
+		{
+			[]time.Weekday{},
+			[]util.TimePeriod{},
+			[]time.Time{time.Date(0, 10, 24, 0, 00, 00, 00, time.UTC)},
+			func() time.Time { return ThankGodItsFriday{}.Now() },
+			time.UTC,
+			1,
+		},
 	} {
 		chaoskube := suite.setupWithPods(
 			labels.Everything(),
 			labels.Everything(),
 			labels.Everything(),
 			tt.excludedWeekdays,
 			tt.excludedTimesOfDay,
+			tt.excludedDates,
 			tt.timezone,
 			false,
 		)
@@ -356,6 +442,7 @@ func (suite *Suite) TestTerminateNoVictimLogsInfo() {
 		labels.Everything(),
 		[]time.Weekday{},
 		[]util.TimePeriod{},
+		[]time.Time{},
 		time.UTC,
 		false,
 	)
@@ -406,13 +493,14 @@ func (suite *Suite) assertLog(level log.Level, msg string, fields log.Fields) {
 	}
 }
 
-func (suite *Suite) setupWithPods(labelSelector labels.Selector, annotations labels.Selector, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, timezone *time.Location, dryRun bool) *Chaoskube {
+func (suite *Suite) setupWithPods(labelSelector labels.Selector, annotations labels.Selector, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, excludedDates []time.Time, timezone *time.Location, dryRun bool) *Chaoskube {
 	chaoskube := suite.setup(
 		labelSelector,
 		annotations,
 		namespaces,
 		excludedWeekdays,
 		excludedTimesOfDay,
+		excludedDates,
 		timezone,
 		dryRun,
 	)
@@ -430,7 +518,7 @@ func (suite *Suite) setupWithPods(labelSelector labels.Selector, annotations lab
 	return chaoskube
 }
 
-func (suite *Suite) setup(labelSelector labels.Selector, annotations labels.Selector, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, timezone *time.Location, dryRun bool) *Chaoskube {
+func (suite *Suite) setup(labelSelector labels.Selector, annotations labels.Selector, namespaces labels.Selector, excludedWeekdays []time.Weekday, excludedTimesOfDay []util.TimePeriod, excludedDates []time.Time, timezone *time.Location, dryRun bool) *Chaoskube {
 	logOutput.Reset()
 
 	return New(
@@ -440,6 +528,7 @@ func (suite *Suite) setup(labelSelector labels.Selector, annotations labels.Sele
 		namespaces,
 		excludedWeekdays,
 		excludedTimesOfDay,
+		excludedDates,
 		timezone,
 		logger,
 		dryRun,

diff --git a/main.go b/main.go
@@ -23,6 +23,7 @@ var (
 	nsString           string
 	excludedWeekdays   string
 	excludedTimesOfDay string
+	excludedDates      string
 	timezone           string
 	master             string
 	kubeconfig         string
@@ -40,6 +41,7 @@ func init() {
 	kingpin.Flag("namespaces", "A set of namespaces to restrict the list of affected pods. Defaults to everything.").StringVar(&nsString)
 	kingpin.Flag("excluded-weekdays", "A list of weekdays when termination is suspended, e.g. sat,sun").StringVar(&excludedWeekdays)
 	kingpin.Flag("excluded-times-of-day", "A list of time periods of a day when termination is suspended, e.g. 22:00-08:00").StringVar(&excludedTimesOfDay)
+	kingpin.Flag("excluded-dates", `A list of dates when termination is suspended, e.g. "apr 1,dec 24"`).StringVar(&excludedDates)
 	kingpin.Flag("timezone", "The timezone by which to interpret the excluded weekdays and times of day, e.g. UTC, Local, Europe/Berlin. Defaults to UTC.").Default("UTC").StringVar(&timezone)
 	kingpin.Flag("master", "The address of the Kubernetes cluster to target").StringVar(&master)
 	kingpin.Flag("kubeconfig", "Path to a kubeconfig file").StringVar(&kubeconfig)
@@ -100,10 +102,12 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	parsedDates := util.ParseDates(excludedDates)
 
 	log.WithFields(log.Fields{
 		"weekdays":   parsedWeekdays,
 		"timesOfDay": parsedTimesOfDay,
+		"dates":      parsedDates,
 	}).Info("setting quiet times")
 
 	parsedTimezone, err := time.LoadLocation(timezone)
@@ -125,6 +129,7 @@ func main() {
 		namespaces,
 		parsedWeekdays,
 		parsedTimesOfDay,
+		parsedDates,
 		parsedTimezone,
 		log.StandardLogger(),
 		dryRun,

diff --git a/util/util.go b/util/util.go
@@ -97,6 +97,21 @@ func ParseTimePeriods(timePeriods string) ([]TimePeriod, error) {
 	return parsedTimePeriods, nil
 }
 
+func ParseDates(dates string) []time.Time {
+	parsedDates := []time.Time{}
+
+	for _, date := range strings.Split(dates, ",") {
+		parsedDate, err := time.Parse("Jan_2", strings.TrimSpace(date))
+		if err != nil {
+			continue
+		}
+
+		parsedDates = append(parsedDates, parsedDate)
+	}
+
+	return parsedDates
+}
+
 // TimeOfDay normalizes the given point in time by returning a time object that represents the same
 // time of day of the given time but on the very first day (day 0).
 func TimeOfDay(pointInTime time.Time) time.Time {