Merge pull request #944 from Daimler/tobiasgiese/v0.4.0-readme

📖 Adjust README.md to fit v0.4.0 and bump k8s to v1.21.3

Author: k8s-ci-robot

README.md

@@ -37,27 +37,35 @@ previous cluster managers such as [kops][kops] and
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-| | Cluster API v1alpha1 (v0.1) | Cluster API v1alpha2 (v0.2) | Cluster API v1alpha3 (v0.3) |
-|-------------------------------------------------|---|---|---|
-| OpenStack Provider v1alpha1 (release-0.1 branch)| ✓ |   |   |
-| OpenStack Provider v1alpha2 (v0.2)              |   | ✓ |   |
-| OpenStack Provider v1alpha3 (v0.3)              |   |   | ✓ |
+|                             | OpenStack Provider v1alpha2 (v0.2) | OpenStack Provider v1alpha3 (v0.3) | OpenStack Provider v1alpha4 (v0.4) |
+|-----------------------------|------------------------------------|------------------------------------|------------------------------------|
+| Cluster API v1alpha2 (v0.2) | ✓                                  |                                    |                                    |
+| Cluster API v1alpha3 (v0.3) |                                    | ✓                                  |                                    |
+| Cluster API v1alpha4 (v0.4) |                                    |                                    | ✓                                  |
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-| | Kubernetes 1.13 | Kubernetes 1.14 | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 |
-|-------------------------------------------------|---|---|---|---|---|---|---|---|
-|OpenStack Provider v1alpha1 (release-0.1 branch) | ✓ | ✓ | ✓ |   |   |   |   |   |
-|OpenStack Provider v1alpha2 (v0.2)               |   |   | ✓ |   |   |   |   |   |
-|OpenStack Provider v1alpha3 (v0.3)               |   |   |   | ✓ | ✓ | ✓ | ✓ | ✓ |
+|                 | OpenStack Provider v1alpha2 (v0.2) | OpenStack Provider v1alpha3 (v0.3) | OpenStack Provider v1alpha4 (v0.4) |
+|-----------------|------------------------------------|------------------------------------|------------------------------------|
+| Kubernetes 1.15 | ✓                                  |                                    |                                    |
+| Kubernetes 1.16 |                                    | ✓                                  |                                    |
+| Kubernetes 1.17 |                                    | ✓                                  |                                    |
+| Kubernetes 1.18 |                                    | ✓                                  |                                    |
+| Kubernetes 1.19 |                                    | ✓                                  |                                    |
+| Kubernetes 1.20 |                                    | ✓                                  | ✓                                  |
+| Kubernetes 1.21 |                                    |                                    | ✓                                  |
 
 This provider's versions are able to install Kubernetes to the following versions of OpenStack:
 
-| | OpenStack Pike | OpenStack Queens | OpenStack Rocky | OpenStack Stein | OpenStack Train | OpenStack Ussuri | OpenStack Victoria |
-|-------------------------------------------------|---|---|---|---|---|---|---|
-| OpenStack Provider v1alpha1 (release-0.1 branch)| ✓ | ✓ | ✓ | ✓ | + | + | + |
-| OpenStack Provider v1alpha2 (v0.2)              | + | ✓ | + | ✓ | + | + | + |
-| OpenStack Provider v1alpha3 (v0.3)              | + | + | + | ✓ | ✓ | ✓ | ✓ |
+|                    | OpenStack Provider v1alpha2 (v0.2) | OpenStack Provider v1alpha3 (v0.3) | OpenStack Provider v1alpha4 (v0.4) |
+|--------------------|------------------------------------|------------------------------------|------------------------------------|
+| OpenStack Pike     | +                                  | +                                  | +                                  |
+| OpenStack Queens   | ✓                                  | +                                  | +                                  |
+| OpenStack Rocky    | +                                  | +                                  | +                                  |
+| OpenStack Stein    | ✓                                  | ✓                                  | +                                  |
+| OpenStack Train    | +                                  | ✓                                  | +                                  |
+| OpenStack Ussuri   | +                                  | ✓                                  | +                                  |
+| OpenStack Victoria | +                                  | ✓                                  | ✓                                  |
 
 Test status:
 * `✓` tested

docs/book/src/clusteropenstack/configuration.md

@@ -42,15 +42,15 @@ Note: You can use [the template file](../templates/cluster-template.yaml) by man
 # Using 'external-cloud-provider' flavor
 clusterctl config cluster capi-quickstart \
   --flavor external-cloud-provider \
-  --kubernetes-version v1.20.6 \
+  --kubernetes-version v1.21.3 \
   --control-plane-machine-count=3 \
   --worker-machine-count=1 \
   > capi-quickstart.yaml
 
 # Using 'without-lb' flavor
 clusterctl config cluster capi-quickstart \
   --flavor without-lb \
-  --kubernetes-version v1.20.6 \
+  --kubernetes-version v1.21.3 \
   --control-plane-machine-count=1 \
   --worker-machine-count=1 \
   > capi-quickstart.yaml

test/e2e/data/e2e_conf.yaml

@@ -93,7 +93,7 @@ providers:
 variables:
   # used to ensure we deploy to the correct management cluster
   KUBE_CONTEXT: "kind-capo-e2e"
-  KUBERNETES_VERSION: "v1.20.6"
+  KUBERNETES_VERSION: "v1.21.3"
   CNI: "../../data/cni/calico.yaml"
   CCM: "../../data/ccm/cloud-controller-manager.yaml"
   EXP_CLUSTER_RESOURCE_SET: "true"