[6.1] Remove CONFIG_NF_NAT_IPV4 check (#2337)

* Bump planet * Revendor satellite
gravitational · Nov 21, 2020 · 96bd959 · 96bd959
1 parent 6cdce01
commit 96bd959
Show file tree

Hide file tree

Showing 30 changed files with 2,450 additions and 242 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -75,7 +75,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/gravitational/satellite"
-  version = "=6.1.15"
+  version = "=6.1.19"
 
 [[constraint]]
   name = "github.com/miekg/dns"

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.2.13
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 6.1.43-$(K8S_VER_SUFFIX)
+PLANET_TAG := 6.1.44-$(K8S_VER_SUFFIX)
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)

diff --git a/vendor/github.com/gravitational/satellite/agent/agent.go b/vendor/github.com/gravitational/satellite/agent/agent.go
diff --git a/vendor/github.com/gravitational/satellite/agent/server.go b/vendor/github.com/gravitational/satellite/agent/server.go
diff --git a/vendor/github.com/gravitational/satellite/lib/kubernetes/constants.go b/vendor/github.com/gravitational/satellite/lib/kubernetes/constants.go