From a4ece65eced5af571da9c191c0e199212903e26e Mon Sep 17 00:00:00 2001 From: Roman Tkachenko Date: Fri, 2 Aug 2019 12:56:05 +0300 Subject: [PATCH] Update planet to version with Kubernetes 1.15. (#558) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f2585816cf..792971737e 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ GRAVITY_PKG_PATH ?= github.com/gravitational/gravity ASSETSDIR=$(TOP)/assets BINDIR ?= /usr/bin -# Current Kubernetes version: 1.14.1 -K8S_VER := 1.14.2 +# Current Kubernetes version: 1.15.1 +K8S_VER := 1.15.1 # Kubernetes version suffix for the planet package, constructed by concatenating # major + minor padded to 2 chars with 0 + patch also padded to 2 chars, e.g. # 1.13.5 -> 11305, 1.13.12 -> 11312, 2.0.0 -> 20000 and so on @@ -42,7 +42,7 @@ 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.0.6-$(K8S_VER_SUFFIX) +PLANET_TAG := 6.1.0-$(K8S_VER_SUFFIX) PLANET_BRANCH := $(PLANET_TAG) K8S_APP_TAG := $(GRAVITY_TAG) TELEKUBE_APP_TAG := $(GRAVITY_TAG)