Merge pull request #1272 from mercedes-benz/tobiasgiese/add-v1alpha6-api-types

✨ Add v1alpha6 API types

Author: k8s-ci-robot

.golangci.yml

@@ -84,6 +84,8 @@ linters-settings:
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4
         alias: infrav1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
+        alias: infrav1alpha5
+      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
         alias: infrav1
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
         alias: capoerrors

Makefile

@@ -228,10 +228,9 @@ generate-go: $(MOCKGEN)
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
 	$(CONVERSION_GEN) \
 		--input-dirs=./api/v1alpha3 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-	$(CONVERSION_GEN) \
 		--input-dirs=./api/v1alpha4 \
+		--input-dirs=./api/v1alpha5 \
+		--input-dirs=./api/v1alpha6 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	go generate ./...

PROJECT

@@ -35,3 +35,15 @@ resources:
 - group: infrastructure
   kind: OpenStackClusterTemplate
   version: v1alpha5
+- group: infrastructure
+  version: v1alpha6
+  kind: OpenStackCluster
+- group: infrastructure
+  version: v1alpha6
+  kind: OpenStackMachine
+- group: infrastructure
+  version: v1alpha6
+  kind: OpenStackMachineTemplate
+- group: infrastructure
+  kind: OpenStackClusterTemplate
+  version: v1alpha6

README.md

@@ -38,30 +38,33 @@ previous cluster managers such as [kops][kops] and
 This provider's versions are compatible with the following versions of Cluster API:
 
 |                                    | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.1) |
-| ---------------------------------- | --------------- | --------------- | -------------- |
+|------------------------------------| --------------- | --------------- | -------------- |
 | OpenStack Provider v1alpha3 (v0.3) | ✓               |                 |                |
 | OpenStack Provider v1alpha4 (v0.4) |                 | ✓               |                |
 | OpenStack Provider v1alpha4 (v0.5) |                 |                 | ✓              |
-| OpenStack Provider v1alpha5        |                 |                 | ✓              |
+| OpenStack Provider v1alpha5 (v0.6) |                 |                 | ✓              |
+| OpenStack Provider v1alpha6        |                 |                 | ✓              |
 
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
 |                                    | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
-| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
 | OpenStack Provider v1alpha3 (v0.3) | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |       |
 | OpenStack Provider v1alpha4 (v0.4) |       |       |       |       | ✓     |       |       |       |       |
 | OpenStack Provider v1alpha4 (v0.5) |       |       |       |       | ✓     | ✓     | +     | +     | +     |
-| OpenStack Provider v1alpha5        |       |       |       |       |       | ✓     | +     | ✓     | ✓     |
+| OpenStack Provider v1alpha5 (v0.6) |       |       |       |       |       | ✓     | +     | ✓     | ✓     |
+| OpenStack Provider v1alpha6        |       |       |       |       |       | ✓     | +     | ✓     | ✓     |
 
 This provider's versions are able to install Kubernetes to the following versions of OpenStack:
 
 |                                    | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena |
-| ---------------------------------- | ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- |
+|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- |
 | OpenStack Provider v1alpha3 (v0.3) | +    | +      | +     | ✓     | ✓     | ✓      | ✓        |         |      |
 | OpenStack Provider v1alpha4 (v0.4) | +    | +      | +     | +     | +     | +      | ✓        |         |      |
 | OpenStack Provider v1alpha4 (v0.5) | +    | +      | +     | +     | +     | +      | ✓        |         |      |
-| OpenStack Provider v1alpha5        | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    |
+| OpenStack Provider v1alpha5 (v0.6) | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    |
+| OpenStack Provider v1alpha6        | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    |
 
 Test status: