Merge pull request #495 from CecileRobertMichon/readme-1.15

Update Kubernetes version support policy

Author: k8s-ci-robot

README.md

@@ -29,21 +29,19 @@ TODO
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-|  | Cluster API `v1alpha1` (`v0.1.x`) | Cluster API `v1alpha2` (`v0.2.x`) | Cluster API `v1alpha3` (`v0.3.x`) |
-|---|---|---|---|
-|Azure Provider `v0.2.x` | ✓ |  |  |
-|Azure Provider `v0.3.x` |  | ✓ |  |
-|Azure Provider `v0.4.x` |  |  | ✓ |
+|  | Cluster API `v1alpha2` (`v0.2.x`) | Cluster API `v1alpha3` (`v0.3.x`) |
+|---|---|---|
+|Azure Provider `v0.3.x` | ✓ |  |
+|Azure Provider `v0.4.x` |  | ✓ |
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-|  | Azure Provider `v0.2.x` | Azure Provider `v0.3.x` | Azure Provider `v0.4.x` |
-|---|---|---|---|
-| Kubernetes 1.13 | ✓ |  |  |
-| Kubernetes 1.14 | ✓ | ✓ |  |
-| Kubernetes 1.15 | ✓ | ✓ | ✓ |
-| Kubernetes 1.16 |  | ✓ | ✓ |
-| Kubernetes 1.17 |  |  | ✓ |
+|  | Azure Provider `v0.3.x` | Azure Provider `v0.4.x` |
+|---|---|---|
+| Kubernetes 1.15 | ✓ |  |
+| Kubernetes 1.16 | ✓ | ✓ |
+| Kubernetes 1.17 |  | ✓ |
+| Kubernetes 1.18 |  | ✓ |
 
 Each version of Cluster API for Azure will attempt to support at least two Kubernetes versions e.g., Cluster API for Azure `v0.1` may support Kubernetes 1.13 and Kubernetes 1.14.
 

docs/development.md

@@ -206,7 +206,7 @@ export CONTROL_PLANE_MACHINE_COUNT=3
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_D2s_v3"
 export AZURE_NODE_MACHINE_TYPE="Standard_D2s_v3"
 export WORKER_MACHINE_COUNT=2
-export KUBERNETES_VERSION="v1.17.3"
+export KUBERNETES_VERSION="v1.17.4"
 
 # Generate SSH key.
 # If you want to provide your own key, skip this step and set AZURE_SSH_PUBLIC_KEY to your existing file.

hack/create-dev-cluster.sh

@@ -41,7 +41,7 @@ export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3}
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_D2s_v3}"
 export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_D2s_v3}"
 export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2}
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.17.3}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.17.4}"
 
 # Generate SSH key.
 SSH_KEY_FILE=${SSH_KEY_FILE:-""}