diff --git a/Documentation/k8s-pre-reqs.md b/Documentation/k8s-pre-reqs.md index 342273e7a..e4093cf2f 100644 --- a/Documentation/k8s-pre-reqs.md +++ b/Documentation/k8s-pre-reqs.md @@ -5,11 +5,13 @@ weight: 1000 # Prerequisites -Rook can be installed on any existing Kubernetes clusters as long as it meets the minimum version and have the required privilege to run in the cluster (see below for more information). If you dont have a Kubernetes cluster, you can quickly set one up using [Minikube](#minikube), [Kubeadm](#kubeadm) or [CoreOS/Vagrant](#new-local-kubernetes-cluster-with-vagrant). +Rook can be installed on any existing Kubernetes cluster as long as it meets the minimum version +and Rook is granted the required privileges (see below for more information). If you don't have a Kubernetes cluster, +you can quickly set one up using [Minikube](#minikube), [Kubeadm](#kubeadm) or [CoreOS/Vagrant](#new-local-kubernetes-cluster-with-vagrant). ## Minimum Version -Kubernetes v1.10 or higher is supported by Rook. +Kubernetes v1.13 or higher is supported by Rook. ## Privileges and RBAC diff --git a/Jenkinsfile b/Jenkinsfile index a7c9f56c1..1b35f46f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,11 +108,11 @@ pipeline { stash name: 'repo-amd64',includes: 'ceph-amd64.tar,cockroachdb-amd64.tar,cassandra-amd64.tar,nfs-amd64.tar,yugabytedb-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/' script{ def data = [ - "aws_1.12.x": "v1.12.10", - "aws_1.13.x": "v1.13.11", - "aws_1.14.x": "v1.14.7", - "aws_1.15.x": "v1.15.4", - "aws_1.16.x": "v1.16.0" + "aws_1.13.x": "v1.13.12", + "aws_1.14.x": "v1.14.10", + "aws_1.15.x": "v1.15.7", + "aws_1.16.x": "v1.16.4", + "aws_1.17.x": "v1.17.0" ] testruns = [:] for (kv in mapToList(data)) { diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 797d3bc7e..80fbc6745 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -4,6 +4,7 @@ ## Notable Features +- Added K8s 1.17 to the test matrix and removed K8s 1.12 from the test matrix. ### Ceph diff --git a/tests/integration/ceph_base_deploy_test.go b/tests/integration/ceph_base_deploy_test.go index 66fc12fcb..6745e7fc5 100644 --- a/tests/integration/ceph_base_deploy_test.go +++ b/tests/integration/ceph_base_deploy_test.go @@ -39,11 +39,11 @@ const ( // UPDATE these versions when the integration test matrix changes // These versions are for running a minimal test suite for more efficient tests across different versions of K8s // instead of running all suites on all versions - blockMinimalTestVersion = "1.12.0" - multiClusterMinimalTestVersion = "1.13.0" - helmMinimalTestVersion = "1.14.0" - upgradeMinimalTestVersion = "1.15.0" - smokeSuiteMinimalTestVersion = "1.16.0" + blockMinimalTestVersion = "1.13.0" + multiClusterMinimalTestVersion = "1.14.0" + helmMinimalTestVersion = "1.15.0" + upgradeMinimalTestVersion = "1.16.0" + smokeSuiteMinimalTestVersion = "1.17.0" ) var (