Skip to content

Commit 7b0b155

Browse files
committed
Remove v1alpha7
This API isn't served anymore since v0.12, we can remove it now.
1 parent 685b5ee commit 7b0b155

File tree

114 files changed

+526
-22825
lines changed

Some content is hidden

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

114 files changed

+526
-22825
lines changed

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ linters-settings:
101101
# CAPO
102102
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1
103103
alias: infrav1alpha1
104-
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
105-
alias: infrav1alpha6
106-
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
107-
alias: infrav1alpha7
108104
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
109105
alias: infrav1
110106
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors

Makefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ GO_APIDIFF_PKG := github.com/joelanford/go-apidiff
5151

5252
# Binaries.
5353
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
54-
CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
5554
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
5655
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
5756
GOJQ := $(TOOLS_BIN_DIR)/gojq
@@ -165,7 +164,7 @@ E2E_NO_ARTIFACT_TEMPLATES_DIR=test/e2e/data/infrastructure-openstack-no-artifact
165164
.PHONY: e2e-templates
166165
e2e-templates: ## Generate cluster templates for e2e tests
167166
e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
168-
cluster-template-v1alpha7.yaml \
167+
cluster-template-without-orc.yaml \
169168
cluster-template-md-remediation.yaml \
170169
cluster-template-kcp-remediation.yaml \
171170
cluster-template-multi-az.yaml \
@@ -273,7 +272,7 @@ modules: ## Runs go mod to ensure proper vendoring.
273272
cd $(TOOLS_DIR); go mod tidy
274273

275274
.PHONY: generate
276-
generate: templates generate-controller-gen generate-codegen generate-conversion-gen generate-go generate-manifests generate-api-docs ## Generate all generated code
275+
generate: templates generate-controller-gen generate-codegen generate-go generate-manifests generate-api-docs ## Generate all generated code
277276

278277
.PHONY: generate-go
279278
generate-go: $(MOCKGEN)
@@ -289,15 +288,6 @@ generate-controller-gen: $(CONTROLLER_GEN)
289288
generate-codegen: generate-controller-gen
290289
./hack/update-codegen.sh
291290

292-
.PHONY: generate-conversion-gen
293-
generate-conversion-gen: $(CONVERSION_GEN)
294-
$(CONVERSION_GEN) \
295-
--extra-peer-dirs=./pkg/utils/optional \
296-
--extra-peer-dirs=./pkg/utils/conversioncommon \
297-
--output-file=zz_generated.conversion.go \
298-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
299-
./api/v1alpha7
300-
301291
.PHONY: generate-manifests
302292
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
303293
$(CONTROLLER_GEN) \
@@ -316,7 +306,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
316306
rbac:roleName=manager-role
317307

318308
.PHONY: generate-api-docs
319-
generate-api-docs: generate-api-docs-v1beta1 generate-api-docs-v1alpha7 generate-api-docs-v1alpha1
309+
generate-api-docs: generate-api-docs-v1beta1 generate-api-docs-v1alpha1
320310
generate-api-docs-%: $(GEN_CRD_API_REFERENCE_DOCS) FORCE
321311
$(GEN_CRD_API_REFERENCE_DOCS) \
322312
-api-dir=./api/$* \

PROJECT

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
domain: cluster.x-k8s.io
66
repo: sigs.k8s.io/cluster-api-provider-openstack
77
resources:
8-
- group: infrastructure
9-
kind: OpenStackCluster
10-
version: v1alpha7
11-
- group: infrastructure
12-
kind: OpenStackMachine
13-
version: v1alpha7
14-
- group: infrastructure
15-
kind: OpenStackMachineTemplate
16-
version: v1alpha7
17-
- group: infrastructure
18-
kind: OpenStackClusterTemplate
19-
version: v1alpha7
208
- group: infrastructure
219
kind: OpenStackCluster
2210
version: v1beta1

api/v1alpha7/conditions_consts.go

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)