Bump satellite to 6.1.1 release

gravitational · Oct 3, 2019 · 2446870 · 2446870
1 parent eeae352
commit 2446870
Show file tree

Hide file tree

Showing 472 changed files with 57,475 additions and 6,317 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -32,8 +32,7 @@ ignored = [
 
 [[override]]
   name = "github.com/gravitational/trace"
-  #version = "1.1.8"
-  revision = "3822600263648f166b2b2a14bc693e92947af68b"
+  version = "=1.1.8"
 
 [[override]]
   name = "github.com/mitchellh/go-ps"
@@ -65,15 +64,19 @@ ignored = [
 
 [[constraint]]
   name = "github.com/gravitational/satellite"
-  version = "=5.5.4"
+  version = "=6.1.1"
+
+[[constraint]]
+  name = "github.com/miekg/dns"
+  version = "=v1.1.19"
 
 [[constraint]]
   name = "github.com/xtgo/set"
   version = "1.0.0"
 
 [[constraint]]
   name = "github.com/gogo/protobuf"
-  version = "=v1.1.0"
+  version = "=v1.1.1"
 
 [[override]]
   name = "golang.org/x/net"

diff --git a/Makefile b/Makefile
@@ -42,7 +42,8 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.2.7
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 6.2.0-$(K8S_VER_SUFFIX)
+#PLANET_TAG := 6.2.1-$(K8S_VER_SUFFIX)
+PLANET_TAG := 6.2.0-$(K8S_VER_SUFFIX)-1-gc06b9f4
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)

diff --git a/lib/testutils/auth.go b/lib/testutils/auth.go
@@ -273,6 +273,9 @@ func (s *AuthClient) GenerateHostCert(key []byte, hostID, nodeName string, princ
 func (s *AuthClient) GenerateUserCert(key []byte, user string, ttl time.Duration, compatibility string) ([]byte, error) {
 	return nil, nil
 }
+func (c *AuthClient) GenerateUserCerts(key []byte, user string, ttl time.Duration, compatibility string) (ssh []byte, tls []byte, err error) {
+	return nil, nil, nil
+}
 func (s *AuthClient) GetSignupTokenData(token string) (user string, otpQRCode []byte, e error) {
 	return "", nil, nil
 }

diff --git a/vendor/github.com/armon/go-metrics/.gitignore b/vendor/github.com/armon/go-metrics/.gitignore
diff --git a/vendor/github.com/armon/go-metrics/.travis.yml b/vendor/github.com/armon/go-metrics/.travis.yml
diff --git a/vendor/github.com/armon/go-metrics/LICENSE b/vendor/github.com/armon/go-metrics/LICENSE
diff --git a/vendor/github.com/armon/go-metrics/README.md b/vendor/github.com/armon/go-metrics/README.md
diff --git a/vendor/github.com/armon/go-metrics/const_unix.go b/vendor/github.com/armon/go-metrics/const_unix.go
diff --git a/vendor/github.com/armon/go-metrics/const_windows.go b/vendor/github.com/armon/go-metrics/const_windows.go
diff --git a/vendor/github.com/armon/go-metrics/go.mod b/vendor/github.com/armon/go-metrics/go.mod
diff --git a/vendor/github.com/armon/go-metrics/go.sum b/vendor/github.com/armon/go-metrics/go.sum