Merge pull request #645 from JoshVanL/automated-cherry-pick-of-#644-o…

…rigin-release-0.5 Automated cherry pick of #644
jetstack · Dec 4, 2018 · 02ae3a3 · 02ae3a3
2 parents 4c1ebd7 + 31526d2
commit 02ae3a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 | Terraform   |                    | `0.11.8` |
 | Consul      |                    | `1.2.3`  |
 | Vault       |                    | `0.9.5`  |
-| Kubernetes  | `>= 1.9 && < 1.13` | `1.11.4` |
+| Kubernetes  | `>= 1.9 && < 1.13` | `1.11.5` |
 | 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.11.4"
+		obj.Kubernetes.Version = "1.11.5"
 	}
 
 	// zone

diff --git a/puppet/modules/tarmak/Makefile b/puppet/modules/tarmak/Makefile
@@ -2,7 +2,7 @@ BUNDLE_DIR ?= .bundle
 
 VERSION_1_13 := 1.13.0-beta.1
 VERSION_1_12 := 1.12.2
-VERSION_1_11 := 1.11.4
+VERSION_1_11 := 1.11.5
 VERSION_1_10 := 1.10.10
 VERSION_1_9 := 1.9.11
 VERSION_1_8 := 1.8.15