Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .golangci.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any chance to remove this too:

# Can be drop once kubernetes-sigs/cluster-api-provider-openstack#1326 is done.
- linters:
- staticcheck
text: "SA1019"
?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added as a second commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, CI lint is passing. 👌

Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ linters-settings:
- pkg: sigs.k8s.io/controller-runtime
alias: ctrl
# CAPO
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha3
alias: infrav1alpha3
- 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
Expand Down Expand Up @@ -172,10 +168,6 @@ issues:
- stylecheck
text: "ST1003: should not use underscores in Go names;"
path: .*(api|types)\/.*\/.*conversion.*\.go$
# Can be drop once kubernetes-sigs/cluster-api-provider-openstack#1326 is done.
- linters:
- staticcheck
text: "SA1019"

run:
timeout: 10m
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,6 @@ generate-go: $(MOCKGEN)
paths=./api/... \
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
$(CONVERSION_GEN) \
--input-dirs=./api/v1alpha3 \
--input-dirs=./api/v1alpha4 \
--input-dirs=./api/v1alpha5 \
--input-dirs=./api/v1alpha6 \
--input-dirs=./api/v1alpha7 \
Expand Down
21 changes: 0 additions & 21 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,6 @@ version: "2"
domain: cluster.x-k8s.io
repo: sigs.k8s.io/cluster-api-provider-openstack
resources:
- group: infrastructure
version: v1alpha3
kind: OpenStackCluster
- group: infrastructure
version: v1alpha3
kind: OpenStackMachine
- group: infrastructure
version: v1alpha3
kind: OpenStackMachineTemplate
- group: infrastructure
version: v1alpha4
kind: OpenStackCluster
- group: infrastructure
version: v1alpha4
kind: OpenStackMachine
- group: infrastructure
version: v1alpha4
kind: OpenStackMachineTemplate
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha4
- group: infrastructure
version: v1alpha5
kind: OpenStackCluster
Expand Down
39 changes: 15 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,28 @@ 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.x) |
|------------------------------------| --------------- | --------------- | -------------- |
| 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 | | | ✓ |
| | v1beta1 (v1.x) |
|------------------------------------| -------------- |
| OpenStack Provider v1alpha5 (v0.6) | ✓ |
| 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 | 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 | | | | | | + | + | + | + | + | ✓ |
| | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- |
| 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:

| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
| 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 | | | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
|------------------------------------| ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha7 | | + | + | + | + | ✓ | ✓ | ✓ | ✓ |

Test status:

Expand Down
Loading