From 707891f43a9cffde5d87ce563b9bda886ea1a707 Mon Sep 17 00:00:00 2001
From: Bernard Kim <bernard@gravitational.com>
Date: Thu, 25 Jun 2020 09:50:57 -0700
Subject: [PATCH 1/2] Revendor satellite; Planet dev tag

---
 Gopkg.lock                                      |  6 +++---
 Gopkg.toml                                      |  3 ++-
 Makefile                                        |  2 +-
 .../satellite/monitoring/storage.go             | 17 ++---------------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index d07439d675..d3a250e0fa 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -876,7 +876,8 @@
   revision = "2e451040dbe9def043beba737d92a6b773bbd3f2"
 
 [[projects]]
-  digest = "1:98f627d4e2ac3eba173b71f1262765d187bc71145e24bdcea251c2bdbf3fc4f2"
+  branch = "bernard/5.5.x/watermark"
+  digest = "1:525b45a8daf9998b6b64ce53345c0de626b7f2421542f9442cd1856137ec4c6e"
   name = "github.com/gravitational/satellite"
   packages = [
     "agent",
@@ -895,8 +896,7 @@
     "utils",
   ]
   pruneopts = "UT"
-  revision = "7a8926bec3139bff0fb792f13c15209aa0754759"
-  version = "5.5.20"
+  revision = "1b89ceac002eb4b7da1264c9bc685fc83747dca8"
 
 [[projects]]
   digest = "1:49f6abbce9ade5f43508429e4af1adcce55d27adcd62719fea049decc766a7c9"
diff --git a/Gopkg.toml b/Gopkg.toml
index 3231f8e904..19ff338902 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -64,7 +64,8 @@ ignored = [
 
 [[constraint]]
   name = "github.com/gravitational/satellite"
-  version = "=5.5.20"
+  # version = "=5.5.20"
+  branch = "bernard/5.5.x/watermark"
 
 [[constraint]]
   name = "github.com/xtgo/set"
diff --git a/Makefile b/Makefile
index 4afde5de99..3d194d1631 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.0.5
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 5.5.53-$(K8S_VER_SUFFIX)
+PLANET_TAG := 5.5.53-$(K8S_VER_SUFFIX)-2-gdd6cc891
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)
diff --git a/vendor/github.com/gravitational/satellite/monitoring/storage.go b/vendor/github.com/gravitational/satellite/monitoring/storage.go
index 66e468202b..a855957ca2 100644
--- a/vendor/github.com/gravitational/satellite/monitoring/storage.go
+++ b/vendor/github.com/gravitational/satellite/monitoring/storage.go
@@ -38,7 +38,8 @@ type StorageConfig struct {
 	MinFreeBytes uint64
 	// LowWatermark is the disk occupancy percentage that will trigger a warning probe
 	LowWatermark uint
-	// HighWatermark is the disk occupancy percentage that will trigger a critical probe
+	// HighWatermark is the disk occupancy percentage that will trigger a critical probe.
+	// Disk usage check will be skipped if HighWatermark is unspecified or 0.
 	HighWatermark uint
 }
 
@@ -59,14 +60,6 @@ func (c *StorageConfig) CheckAndSetDefaults() error {
 		errors = append(errors, trace.BadParameter("high watermark must be 0-100"))
 	}
 
-	if c.LowWatermark == 0 {
-		c.LowWatermark = DefaultLowWatermark
-	}
-
-	if c.HighWatermark == 0 {
-		c.HighWatermark = DefaultHighWatermark
-	}
-
 	if c.LowWatermark > c.HighWatermark {
 		c.LowWatermark = c.HighWatermark
 	}
@@ -108,9 +101,3 @@ func (d HighWatermarkCheckerData) SuccessMessage() string {
 
 // DiskSpaceCheckerID is the checker that checks disk space utilization
 const DiskSpaceCheckerID = "disk-space"
-
-// DefaultLowWatermark is the default low watermark percentage.
-const DefaultLowWatermark = 80
-
-// DefaultHighWatermark is the default high watermark percentage.
-const DefaultHighWatermark = 90

From a95d61b3f64d80ab341ca2b7100caac33c202213 Mon Sep 17 00:00:00 2001
From: Bernard Kim <bernard@gravitational.com>
Date: Thu, 25 Jun 2020 12:26:12 -0700
Subject: [PATCH 2/2] Bump satellite to 5.5.21; Bump planet to 5.5.54

---
 Gopkg.lock | 4 ++--
 Gopkg.toml | 3 +--
 Makefile   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index d3a250e0fa..c93551accb 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -876,7 +876,6 @@
   revision = "2e451040dbe9def043beba737d92a6b773bbd3f2"
 
 [[projects]]
-  branch = "bernard/5.5.x/watermark"
   digest = "1:525b45a8daf9998b6b64ce53345c0de626b7f2421542f9442cd1856137ec4c6e"
   name = "github.com/gravitational/satellite"
   packages = [
@@ -896,7 +895,8 @@
     "utils",
   ]
   pruneopts = "UT"
-  revision = "1b89ceac002eb4b7da1264c9bc685fc83747dca8"
+  revision = "8f71a1951f393c15eebddeb8a48b00baff20f960"
+  version = "5.5.21"
 
 [[projects]]
   digest = "1:49f6abbce9ade5f43508429e4af1adcce55d27adcd62719fea049decc766a7c9"
diff --git a/Gopkg.toml b/Gopkg.toml
index 19ff338902..bc5fc2be4f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -64,8 +64,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/gravitational/satellite"
-  # version = "=5.5.20"
-  branch = "bernard/5.5.x/watermark"
+  version = "=5.5.21"
 
 [[constraint]]
   name = "github.com/xtgo/set"
diff --git a/Makefile b/Makefile
index 3d194d1631..ec23bf0a1c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.0.5
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 5.5.53-$(K8S_VER_SUFFIX)-2-gdd6cc891
+PLANET_TAG := 5.5.54-$(K8S_VER_SUFFIX)
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)