Merge pull request #638 from simonswine/update-k8s-versions

Update kubernetes versions
jetstack · Nov 22, 2018 · f8d8ab7 · f8d8ab7
2 parents 3214dda + 3bbcc3f
commit f8d8ab7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 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.7 && < 1.11` | `1.10.6` |
+| Kubernetes  | `>= 1.9 && < 1.13` | `1.11.4` |
 | 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.10.6"
+		obj.Kubernetes.Version = "1.11.4"
 	}
 
 	// zone

diff --git a/puppet/modules/tarmak/Makefile b/puppet/modules/tarmak/Makefile
@@ -1,8 +1,10 @@
 BUNDLE_DIR ?= .bundle
 
-VERSION_1_11 := 1.11.1
-VERSION_1_10 := 1.10.6
-VERSION_1_9 := 1.9.10
+VERSION_1_13 := 1.13.0-beta.1
+VERSION_1_12 := 1.12.2
+VERSION_1_11 := 1.11.4
+VERSION_1_10 := 1.10.10
+VERSION_1_9 := 1.9.11
 VERSION_1_8 := 1.8.15
 VERSION_1_7 := 1.7.16
 VERSION_1_6 := 1.6.13
@@ -14,7 +16,7 @@ verify: bundle_install
 bundle_install:
 	bundle install --path $(BUNDLE_DIR)
 
-acceptance: acceptance-1-10-centos
+acceptance: acceptance-1-11-centos
 
 acceptance-1-5-centos: export KUBERNETES_VERSION = $(VERSION_1_5)
 acceptance-1-5-centos: export KUBERNETES_AUTHORIZATION_MODE = ['RBAC']
@@ -45,6 +47,14 @@ acceptance-1-11-centos: export KUBERNETES_VERSION = $(VERSION_1_11)
 acceptance-1-11-centos: bundle_install
 	bundle exec rake beaker:default
 
+acceptance-1-12-centos: export KUBERNETES_VERSION = $(VERSION_1_12)
+acceptance-1-12-centos: bundle_install
+	bundle exec rake beaker:default
+
+acceptance-1-13-centos: export KUBERNETES_VERSION = $(VERSION_1_13)
+acceptance-1-13-centos: bundle_install
+	bundle exec rake beaker:default
+
 acceptance-1-7-ubuntu: export KUBERNETES_VERSION = $(VERSION_1_7)
 acceptance-1-7-ubuntu: bundle_install
 	bundle exec rake beaker:ubuntu_1604_single_node
@@ -64,3 +74,11 @@ acceptance-1-10-ubuntu: bundle_install
 acceptance-1-11-ubuntu: export KUBERNETES_VERSION = $(VERSION_1_11)
 acceptance-1-11-ubuntu: bundle_install
 	bundle exec rake beaker:ubuntu_1604_single_node
+
+acceptance-1-12-ubuntu: export KUBERNETES_VERSION = $(VERSION_1_12)
+acceptance-1-12-ubuntu: bundle_install
+	bundle exec rake beaker:ubuntu_1604_single_node
+
+acceptance-1-13-ubuntu: export KUBERNETES_VERSION = $(VERSION_1_13)
+acceptance-1-13-ubuntu: bundle_install
+	bundle exec rake beaker:ubuntu_1604_single_node