From 7ae3c0b4839b03fba86c5120f2c5c6fb30c3a4fb Mon Sep 17 00:00:00 2001 From: Christian Simon Date: Fri, 29 Mar 2019 10:58:46 +0000 Subject: [PATCH] Upgrade default Kubernetes version to 1.12.7 Signed-off-by: Christian Simon --- CHANGELOG.md | 2 +- pkg/apis/cluster/v1alpha1/defaults.go | 2 +- puppet/modules/tarmak/Makefile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f95efd7e97..8bd881b52e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. | Terraform | | `0.11.11` | | Consul | | `1.2.4` | | Vault | | `0.9.6` | -| Kubernetes | `>= 1.10 && < 1.14` | `1.12.6` | +| Kubernetes | `>= 1.10 && < 1.14` | `1.12.7` | | Calico | | `3.1.4` | | Vault Helper| | `0.9.13` | | Etcd | | `3.2.25` | diff --git a/pkg/apis/cluster/v1alpha1/defaults.go b/pkg/apis/cluster/v1alpha1/defaults.go index 45ca4aaed5..0b70e8c133 100644 --- a/pkg/apis/cluster/v1alpha1/defaults.go +++ b/pkg/apis/cluster/v1alpha1/defaults.go @@ -38,7 +38,7 @@ func SetDefaults_Cluster(obj *Cluster) { // set default kubernetes version if obj.Kubernetes.Version == "" { - obj.Kubernetes.Version = "1.12.6" + obj.Kubernetes.Version = "1.12.7" } // zone diff --git a/puppet/modules/tarmak/Makefile b/puppet/modules/tarmak/Makefile index 7a5e839d1e..67fe7905da 100644 --- a/puppet/modules/tarmak/Makefile +++ b/puppet/modules/tarmak/Makefile @@ -1,9 +1,9 @@ BUNDLE_DIR ?= .bundle -VERSION_1_14 := 1.14.0-rc.1 -VERSION_1_13 := 1.13.4 -VERSION_1_12 := 1.12.6 -VERSION_1_11 := 1.11.8 +VERSION_1_14 := 1.14.0 +VERSION_1_13 := 1.13.5 +VERSION_1_12 := 1.12.7 +VERSION_1_11 := 1.11.9 VERSION_1_10 := 1.10.13 VERSION_1_9 := 1.9.11 VERSION_1_8 := 1.8.15