Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

[5.5.x] Skip disk usage check if requirements not specified #1795

Merged
merged 2 commits into from
Jun 25, 2020
Merged

[5.5.x] Skip disk usage check if requirements not specified #1795

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
707891f
Revendor satellite; Planet dev tag
bernardjkim Jun 25, 2020
a95d61b
Bump satellite to 5.5.21; Bump planet to 5.5.54
bernardjkim Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 2 additions & 15 deletions vendor/github.com/gravitational/satellite/monitoring/storage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.