Skip to content

Commit

Permalink
Merge pull request #1497 from shiftstack/v1alpha7
Browse files Browse the repository at this point in the history 
⚠️ Add v1alpha7
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Mar 3, 2023
2 parents 1e18474 + 346b625 commit c06146b
Show file tree
Hide file tree
Showing 98 changed files with 9,722 additions and 1,810 deletions.
2 changes: 2 additions & 0 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ linters-settings:
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
alias: infrav1alpha5
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
alias: infrav1alpha6
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
alias: infrav1
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
alias: capoerrors
Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ E2E_KUSTOMIZE_DIR=test/e2e/data/kustomize
e2e-templates: ## Generate cluster templates for e2e tests
e2e-templates: $(addprefix $(E2E_TEMPLATES_DIR)/, \
cluster-template-v1alpha5.yaml \
cluster-template-v1alpha6.yaml \
cluster-template-md-remediation.yaml \
cluster-template-kcp-remediation.yaml \
cluster-template-external-cloud-provider.yaml \
Expand Down Expand Up @@ -264,6 +265,7 @@ generate-go: $(MOCKGEN)
--input-dirs=./api/v1alpha4 \
--input-dirs=./api/v1alpha5 \
--input-dirs=./api/v1alpha6 \
--input-dirs=./api/v1alpha7 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
go generate ./...
Expand Down Expand Up @@ -417,10 +419,10 @@ templates: templates/cluster-template.yaml \
templates/cluster-template-without-lb.yaml \
templates/cluster-template-external-cloud-provider.yaml

templates/cluster-template.yaml: kustomize/v1alpha6/default $(KUSTOMIZE) FORCE
templates/cluster-template.yaml: kustomize/v1alpha7/default $(KUSTOMIZE) FORCE
$(KUSTOMIZE) build "$<" > "$@"

templates/cluster-template-%.yaml: kustomize/v1alpha6/% $(KUSTOMIZE) FORCE
templates/cluster-template-%.yaml: kustomize/v1alpha7/% $(KUSTOMIZE) FORCE
$(KUSTOMIZE) build "$<" > "$@"

.PHONY: release-templates
Expand Down
12 changes: 12 additions & 0 deletions PROJECT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,15 @@ resources:
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha6
- group: infrastructure
version: v1alpha7
kind: OpenStackCluster
- group: infrastructure
version: v1alpha7
kind: OpenStackMachine
- group: infrastructure
version: v1alpha7
kind: OpenStackMachineTemplate
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha7
23 changes: 13 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,20 @@ This provider's versions are compatible with the following versions of Cluster A
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
| OpenStack Provider v1alpha5 (v0.6) | | | ✓ |
| OpenStack Provider v1alpha6 | | | ✓ |
| OpenStack Provider v1alpha6 (v0.7) | | | ✓ |
| OpenStack Provider v1alpha7 | | | ✓ |


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 | v1.25 |
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | |
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | | | | | |
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ | + | + | + | + |
| OpenStack Provider v1alpha5 (v0.6) | | | | | | ✓ | + | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha6 | | | | | | ✓ | + | ✓ | ✓ | ✓ |
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | |
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | | | | | | |
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ | + | + | + | + | + |
| OpenStack Provider v1alpha5 (v0.6) | | | | | | ✓ | + | ✓ | ✓ | ✓ | + |
| OpenStack Provider v1alpha6 (v0.7) | | | | | | ✓ | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha7 | | | | | | + | + | + | + | + | ✓ |

This provider's versions are able to install Kubernetes to the following versions of OpenStack:

Expand All @@ -63,8 +65,9 @@ This provider's versions are able to install Kubernetes to the following version
| OpenStack Provider v1alpha3 (v0.3) | + | + | + | ✓ | ✓ | ✓ | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + | ✓ | | | |
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha6 | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha5 (v0.6) | | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha6 (v0.7) | | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha7 | | | + | + | + | + | ✓ | ✓ | ✓ | ✓ |

Test status:

Expand Down
Loading

0 comments on commit c06146b

Please sign in to comment.