Merge pull request #1782 from shiftstack/v1alpha8

⚠️ Add v1alpha8

Author: k8s-ci-robot

.golangci.yml

@@ -101,6 +101,8 @@ linters-settings:
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
         alias: infrav1alpha6
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
+        alias: infrav1alpha7
+      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
         alias: infrav1
       - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
         alias: capoerrors

Makefile

@@ -150,6 +150,7 @@ e2e-templates: ## Generate cluster templates for e2e tests
 e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
 		 cluster-template-v1alpha5.yaml \
 		 cluster-template-v1alpha6.yaml \
+		 cluster-template-v1alpha7.yaml \
 		 cluster-template-md-remediation.yaml \
 		 cluster-template-kcp-remediation.yaml \
 		 cluster-template-multi-az.yaml \
@@ -258,6 +259,7 @@ generate-go: $(MOCKGEN)
 		--input-dirs=./api/v1alpha5 \
 		--input-dirs=./api/v1alpha6 \
 		--input-dirs=./api/v1alpha7 \
+		--input-dirs=./api/v1alpha8 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	go generate ./...
@@ -406,10 +408,10 @@ templates: templates/cluster-template.yaml \
 	templates/cluster-template-without-lb.yaml \
 	templates/cluster-template-flatcar.yaml
 
-templates/cluster-template.yaml: kustomize/v1alpha7/default $(KUSTOMIZE) FORCE
+templates/cluster-template.yaml: kustomize/v1alpha8/default $(KUSTOMIZE) FORCE
 	$(KUSTOMIZE) build "$<" > "$@"
 
-templates/cluster-template-%.yaml: kustomize/v1alpha7/% $(KUSTOMIZE) FORCE
+templates/cluster-template-%.yaml: kustomize/v1alpha8/% $(KUSTOMIZE) FORCE
 	$(KUSTOMIZE) build "$<" > "$@"
 
 .PHONY: release-templates

PROJECT

@@ -38,3 +38,15 @@ resources:
 - group: infrastructure
   kind: OpenStackClusterTemplate
   version: v1alpha7
+- group: infrastructure
+  version: v1alpha8
+  kind: OpenStackCluster
+- group: infrastructure
+  version: v1alpha8
+  kind: OpenStackMachine
+- group: infrastructure
+  version: v1alpha8
+  kind: OpenStackMachineTemplate
+- group: infrastructure
+  kind: OpenStackClusterTemplate
+  version: v1alpha8

README.md

@@ -43,7 +43,8 @@ This provider's versions are compatible with the following versions of Cluster A
 |------------------------------------| -------------- |
 | OpenStack Provider v1alpha5 (v0.6) | ✓              |
 | OpenStack Provider v1alpha6 (v0.7) | ✓              |
-| OpenStack Provider v1alpha7        | ✓              |
+| OpenStack Provider v1alpha7 (v0.9) | ✓              |
+| OpenStack Provider v1alpha8        | ✓              |
 
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
@@ -52,15 +53,17 @@ This provider's versions are able to install and manage the following versions o
 |------------------------------------| ----- | ----- | ----- | ----- |
 | OpenStack Provider v1alpha5 (v0.6) | ✓     | +     | +     | +     |
 | OpenStack Provider v1alpha6 (v0.7) | ✓     | ✓     | ✓     | +     |
-| OpenStack Provider v1alpha7        | +     | ✓     | ✓     | ★     |
+| OpenStack Provider v1alpha7 (v0.9) | +     | ✓     | ✓     | ★     |
+| OpenStack Provider v1alpha8        | +     | ✓     | ✓     | ★     |
 
 This provider's versions are able to install Kubernetes to the following versions of OpenStack:
 
 |                                    | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
 |------------------------------------| ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
 | OpenStack Provider v1alpha5 (v0.6) | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ★    |
 | OpenStack Provider v1alpha6 (v0.7) | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ★    |
-| OpenStack Provider v1alpha7        |        | +     | +     | +     | +      | ✓        | ✓       | ✓    | ★    |
+| OpenStack Provider v1alpha7 (v0.9) |        | +     | +     | +     | +      | ✓        | ✓       | ✓    | ★    |
+| OpenStack Provider v1alpha8        |        | +     | +     | +     | +      | ✓        | ✓       | ✓    | ★    |
 
 Test status:
 

api/v1alpha5/conversion.go

@@ -24,7 +24,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
 )
 
 func TestConvertFrom(t *testing.T) {

api/v1alpha5/conversion_test.go

@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
 package v1alpha5