Merge pull request #789 from simonswine/automated-cherry-pick-of-#788…

…-release-0.6 Automated cherry pick of #788
jetstack · Mar 29, 2019 · 4678635 · 4678635
2 parents 6210be6 + 7ae3c0b
commit 4678635
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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