Skip to content

Commit 114fdb2

Browse files
authored
Merge pull request #789 from Fedosin/remove-v1alpha1
⚠️ Remove deprecated v1alpha1 API
2 parents 8373900 + c3f32df commit 114fdb2

24 files changed

+5673
-22196
lines changed

.golangci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ linters:
101101
- pkg: sigs.k8s.io/cluster-api/cmd/clusterctl/client/config
102102
alias: configclient
103103
# CAPI Operator
104-
- pkg: sigs.k8s.io/cluster-api-operator/api/v1alpha1
105-
alias: operatorv1alpha1
106104
- pkg: sigs.k8s.io/cluster-api-operator/api/v1alpha2
107105
alias: operatorv1
108106
- pkg: sigs.k8s.io/cluster-api-operator/internal/controller

Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ verify-gen: generate
341341
generate: $(CONTROLLER_GEN) $(HELM) release-chart ## Generate code
342342
$(MAKE) generate-manifests
343343
$(MAKE) generate-go
344-
$(MAKE) generate-go-conversions
345344
$(HELM) template capi-operator $(CHART_PACKAGE_DIR)/$(PACKAGE_NAME)-$(HELM_CHART_TAG).tgz > test/e2e/resources/full-chart-install.yaml
346345

347346
.PHONY: generate-go
@@ -364,15 +363,6 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests for the operator e.g
364363
output:webhook:dir=./config/webhook \
365364
webhook
366365

367-
.PHONY: generate-go-conversions
368-
generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code
369-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha1"
370-
$(CONVERSION_GEN) \
371-
--input-dirs=./api/v1alpha1 \
372-
--build-tag=ignore_autogenerated_core \
373-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
374-
--go-header-file=$(ROOT)/hack/boilerplate.go.txt
375-
376366
.PHONY: modules
377367
modules: ## Runs go mod to ensure modules are up to date.
378368
go mod tidy

PROJECT

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,6 @@ layout:
88
projectName: cluster-api-operator-migration
99
repo: sigs.k8s.io/cluster-api-operator
1010
resources:
11-
- api:
12-
crdVersion: v1
13-
namespaced: true
14-
controller: true
15-
domain: cluster.x-k8s.io
16-
group: operator
17-
kind: CoreProvider
18-
path: sigs.k8s.io/cluster-api-operator/api/v1alpha1
19-
version: v1alpha1
20-
- api:
21-
crdVersion: v1
22-
namespaced: true
23-
domain: cluster.x-k8s.io
24-
group: operator
25-
kind: BootstrapProvider
26-
path: sigs.k8s.io/cluster-api-operator/api/v1alpha1
27-
version: v1alpha1
28-
- api:
29-
crdVersion: v1
30-
namespaced: true
31-
domain: cluster.x-k8s.io
32-
group: operator
33-
kind: ControlPlaneProvider
34-
path: sigs.k8s.io/cluster-api-operator/api/v1alpha1
35-
version: v1alpha1
36-
- api:
37-
crdVersion: v1
38-
namespaced: true
39-
domain: cluster.x-k8s.io
40-
group: operator
41-
kind: InfrastructureProvider
42-
path: sigs.k8s.io/cluster-api-operator/api/v1alpha1
43-
version: v1alpha1
4411
- api:
4512
crdVersion: v1
4613
namespaced: true

api/v1alpha1/bootstrapprovider_types.go

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

api/v1alpha1/conditions_consts.go

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

api/v1alpha1/controlplaneprovider_types.go

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

api/v1alpha1/coreprovider_types.go

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

api/v1alpha1/doc.go

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

api/v1alpha1/groupversion_info.go

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

0 commit comments

Comments
 (0)