(6.1) Bump helm to 2.15.2 (#2118)

Gopkg.toml

@@ -20,10 +20,15 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
+required = [
+  "github.com/fvbommel/sortorder"
+]
+
 ignored = [
   "github.com/Sirupsen/logrus",
   "github.com/gravitational/gravity/build/*",
-  "github.com/gravitational/gravity/e/build/*"
+  "github.com/gravitational/gravity/e/build/*",
+  "vbom.ml/util/sortorder"
 ]
 
 [prune]
@@ -34,6 +39,10 @@ ignored = [
   name = "github.com/gravitational/trace"
   version = "=1.1.11"
 
+[[override]]
+  name = "github.com/fvbommel/sortorder"
+  source = "github.com/fvbommel/sortorder"
+
 [[override]]
   name = "github.com/mitchellh/go-ps"
   source = "github.com/gravitational/go-ps"
@@ -90,7 +99,7 @@ ignored = [
 
 [[constraint]]
   name = "k8s.io/helm"
-  branch = "release-2.14"
+  branch = "release-2.15"
 
 [[override]]
   name = "k8s.io/apimachinery"

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.35-$(K8S_VER_SUFFIX)
+PLANET_TAG := 6.1.36-$(K8S_VER_SUFFIX)
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)
@@ -53,8 +53,8 @@ DNS_APP_TAG = 0.4.0
 BANDWAGON_TAG ?= 6.0.1
 RBAC_APP_TAG := $(GRAVITY_TAG)
 # IMPORTANT: When updating tiller version, DO NOT FORGET to bump TILLER_APP_TAG as well!
-TILLER_VERSION = 2.14.3
-TILLER_APP_TAG = 6.1.0
+TILLER_VERSION = 2.15.2
+TILLER_APP_TAG = 6.1.1
 # URI of Wormhole container for default install
 WORMHOLE_IMG ?= quay.io/gravitational/wormhole:0.3.3
 # set this to true if you want to use locally built planet packages
@@ -764,6 +764,22 @@ validate-deps:
 	$(eval VENDOR_UNTRACKED := $(shell git status --porcelain vendor))
 	@test -z "$(VENDOR_UNTRACKED)" || (echo "failed to recreate vendor from scratch and match it to git:\n $(VENDOR_UNTRACKED)" ; exit 1)
 
+#
+# this is a temporary target until we upgrade k8s.io packages
+# to use fvbommel/sortorder.
+# https://github.com/fvbommel/util/issues/6
+#
+.PHONY: dep-ensure
+dep-ensure:
+	dep version
+	dep ensure -v
+	dep status -v
+	$(MAKE) fix-sortorder fix-logrus
+
+.PHONY: fix-sortorder
+fix-sortorder:
+	find vendor -name '*.go' -type f -print0 | xargs -0 sed -i 's/vbom.ml\/util/github.com\/fvbommel/g'
+
 .PHONY: fix-logrus
 fix-logrus:
 	find vendor -not \( -path vendor/github.com/fsouza -prune \) -name '*.go' -type f -print0 | xargs -0 sed -i 's/Sirupsen/sirupsen/g'