Skip to content

Commit 9233490

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1527 from shiftstack/remove-old-apis
⚠️ Remove v1alpha3 and v1alpha4
2 parents 1b32291 + b1bb18b commit 9233490

38 files changed

+27
-12953
lines changed

‎.golangci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ linters-settings:
9696
- pkg: sigs.k8s.io/controller-runtime
9797
alias: ctrl
9898
# CAPO
99-
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha3
100-
alias: infrav1alpha3
101-
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4
102-
alias: infrav1alpha4
10399
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
104100
alias: infrav1alpha5
105101
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
@@ -172,10 +168,6 @@ issues:
172168
- stylecheck
173169
text: "ST1003: should not use underscores in Go names;"
174170
path: .*(api|types)\/.*\/.*conversion.*\.go$
175-
# Can be drop once kubernetes-sigs/cluster-api-provider-openstack#1326 is done.
176-
- linters:
177-
- staticcheck
178-
text: "SA1019"
179171

180172
run:
181173
timeout: 10m

‎Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,6 @@ generate-go: $(MOCKGEN)
267267
paths=./api/... \
268268
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
269269
$(CONVERSION_GEN) \
270-
--input-dirs=./api/v1alpha3 \
271-
--input-dirs=./api/v1alpha4 \
272270
--input-dirs=./api/v1alpha5 \
273271
--input-dirs=./api/v1alpha6 \
274272
--input-dirs=./api/v1alpha7 \

‎PROJECT

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,6 @@ version: "2"
22
domain: cluster.x-k8s.io
33
repo: sigs.k8s.io/cluster-api-provider-openstack
44
resources:
5-
- group: infrastructure
6-
version: v1alpha3
7-
kind: OpenStackCluster
8-
- group: infrastructure
9-
version: v1alpha3
10-
kind: OpenStackMachine
11-
- group: infrastructure
12-
version: v1alpha3
13-
kind: OpenStackMachineTemplate
14-
- group: infrastructure
15-
version: v1alpha4
16-
kind: OpenStackCluster
17-
- group: infrastructure
18-
version: v1alpha4
19-
kind: OpenStackMachine
20-
- group: infrastructure
21-
version: v1alpha4
22-
kind: OpenStackMachineTemplate
23-
- group: infrastructure
24-
kind: OpenStackClusterTemplate
25-
version: v1alpha4
265
- group: infrastructure
276
version: v1alpha5
287
kind: OpenStackCluster

‎README.md

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,37 +37,28 @@ previous cluster managers such as [kops][kops] and
3737

3838
This provider's versions are compatible with the following versions of Cluster API:
3939

40-
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.x) |
41-
|------------------------------------| --------------- | --------------- | -------------- |
42-
| OpenStack Provider v1alpha3 (v0.3) | ✓ | | |
43-
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
44-
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
45-
| OpenStack Provider v1alpha5 (v0.6) | | | ✓ |
46-
| OpenStack Provider v1alpha6 (v0.7) | | | ✓ |
47-
| OpenStack Provider v1alpha7 | | | ✓ |
40+
| | v1beta1 (v1.x) |
41+
|------------------------------------| -------------- |
42+
| OpenStack Provider v1alpha5 (v0.6) | ✓ |
43+
| OpenStack Provider v1alpha6 (v0.7) | ✓ |
44+
| OpenStack Provider v1alpha7 | ✓ |
4845

4946

5047
This provider's versions are able to install and manage the following versions of Kubernetes:
5148

52-
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
53-
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
54-
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | |
55-
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | | | | | | |
56-
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ | + | + | + | + | + |
57-
| OpenStack Provider v1alpha5 (v0.6) | | | | | | ✓ | + | ✓ | ✓ | ✓ | + |
58-
| OpenStack Provider v1alpha6 (v0.7) | | | | | | ✓ | + | ✓ | ✓ | ✓ | ✓ |
59-
| OpenStack Provider v1alpha7 | | | | | | + | + | + | + | + | ✓ |
49+
| | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
50+
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- |
51+
| OpenStack Provider v1alpha5 (v0.6) | ✓ | + | ✓ | ✓ | ✓ | + |
52+
| OpenStack Provider v1alpha6 (v0.7) | ✓ | + | ✓ | ✓ | ✓ | ✓ |
53+
| OpenStack Provider v1alpha7 | + | + | + | + | + | ✓ |
6054

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

63-
| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
64-
|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
65-
| OpenStack Provider v1alpha3 (v0.3) | + | + | + | ✓ | ✓ | ✓ | ✓ | | | |
66-
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + | ✓ | | | |
67-
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + | ✓ | | | |
68-
| OpenStack Provider v1alpha5 (v0.6) | | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
69-
| OpenStack Provider v1alpha6 (v0.7) | | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
70-
| OpenStack Provider v1alpha7 | | | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
57+
| | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
58+
|------------------------------------| ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
59+
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
60+
| OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
61+
| OpenStack Provider v1alpha7 | | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
7162

7263
Test status:
7364

0 commit comments

Comments
 (0)