Skip to content

Commit eb768c7

Browse files
committed
Add v1alpha8
1 parent 70494b6 commit eb768c7

File tree

106 files changed

+8568
-1218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+8568
-1218
lines changed

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ linters-settings:
101101
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
102102
alias: infrav1alpha6
103103
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
104+
alias: infrav1alpha7
105+
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
104106
alias: infrav1
105107
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
106108
alias: capoerrors

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ e2e-templates: ## Generate cluster templates for e2e tests
150150
e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
151151
cluster-template-v1alpha5.yaml \
152152
cluster-template-v1alpha6.yaml \
153+
cluster-template-v1alpha7.yaml \
153154
cluster-template-md-remediation.yaml \
154155
cluster-template-kcp-remediation.yaml \
155156
cluster-template-multi-az.yaml \
@@ -258,6 +259,7 @@ generate-go: $(MOCKGEN)
258259
--input-dirs=./api/v1alpha5 \
259260
--input-dirs=./api/v1alpha6 \
260261
--input-dirs=./api/v1alpha7 \
262+
--input-dirs=./api/v1alpha8 \
261263
--output-file-base=zz_generated.conversion \
262264
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
263265
go generate ./...
@@ -406,10 +408,10 @@ templates: templates/cluster-template.yaml \
406408
templates/cluster-template-without-lb.yaml \
407409
templates/cluster-template-flatcar.yaml
408410

409-
templates/cluster-template.yaml: kustomize/v1alpha7/default $(KUSTOMIZE) FORCE
411+
templates/cluster-template.yaml: kustomize/v1alpha8/default $(KUSTOMIZE) FORCE
410412
$(KUSTOMIZE) build "$<" > "$@"
411413

412-
templates/cluster-template-%.yaml: kustomize/v1alpha7/% $(KUSTOMIZE) FORCE
414+
templates/cluster-template-%.yaml: kustomize/v1alpha8/% $(KUSTOMIZE) FORCE
413415
$(KUSTOMIZE) build "$<" > "$@"
414416

415417
.PHONY: release-templates

PROJECT

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,15 @@ resources:
3838
- group: infrastructure
3939
kind: OpenStackClusterTemplate
4040
version: v1alpha7
41+
- group: infrastructure
42+
version: v1alpha8
43+
kind: OpenStackCluster
44+
- group: infrastructure
45+
version: v1alpha8
46+
kind: OpenStackMachine
47+
- group: infrastructure
48+
version: v1alpha8
49+
kind: OpenStackMachineTemplate
50+
- group: infrastructure
51+
kind: OpenStackClusterTemplate
52+
version: v1alpha8

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ This provider's versions are compatible with the following versions of Cluster A
4343
|------------------------------------| -------------- |
4444
| OpenStack Provider v1alpha5 (v0.6) ||
4545
| OpenStack Provider v1alpha6 (v0.7) ||
46-
| OpenStack Provider v1alpha7 ||
46+
| OpenStack Provider v1alpha7 (v0.9) ||
47+
| OpenStack Provider v1alpha8 ||
4748

4849

4950
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
5253
|------------------------------------| ----- | ----- | ----- | ----- |
5354
| OpenStack Provider v1alpha5 (v0.6) || + | + | + |
5455
| OpenStack Provider v1alpha6 (v0.7) |||| + |
55-
| OpenStack Provider v1alpha7 | + ||||
56+
| OpenStack Provider v1alpha7 (v0.9) | + ||||
57+
| OpenStack Provider v1alpha8 | + ||||
5658

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

5961
| | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
6062
|------------------------------------| ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
6163
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + |||||
6264
| OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + |||||
63-
| OpenStack Provider v1alpha7 | | + | + | + | + |||||
65+
| OpenStack Provider v1alpha7 (v0.9) | | + | + | + | + |||||
66+
| OpenStack Provider v1alpha8 | | + | + | + | + |||||
6467

6568
Test status:
6669

api/v1alpha5/conversion.go

Lines changed: 64 additions & 64 deletions
Large diffs are not rendered by default.

api/v1alpha5/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
runtime "k8s.io/apimachinery/pkg/runtime"
2525
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
2626

27-
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
27+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
2828
)
2929

3030
func TestConvertFrom(t *testing.T) {

api/v1alpha5/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
17+
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
1818
package v1alpha5

0 commit comments

Comments
 (0)