Skip to content

Commit 311ab1e

Browse files
committed
Introduce v1alpha3 API
1 parent 8942995 commit 311ab1e

File tree

98 files changed

+49356
-6971
lines changed

Some content is hidden

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

98 files changed

+49356
-6971
lines changed

.golangci.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ 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/v1alpha2
104+
- pkg: sigs.k8s.io/cluster-api-operator/api/v1alpha3
105105
alias: operatorv1
106+
- pkg: sigs.k8s.io/cluster-api-operator/api/v1alpha2
107+
alias: operatorv1alpha2
106108
- pkg: sigs.k8s.io/cluster-api-operator/internal/controller
107109
alias: providercontroller
108110
no-unaliased: true
@@ -143,6 +145,13 @@ linters:
143145
- linters:
144146
- staticcheck
145147
text: 'QF1008: could remove embedded field'
148+
# Exclude nestif and gocyclo for api/v1alpha2 directory
149+
- linters:
150+
- nestif
151+
path: api/v1alpha2/(.+)\.go$
152+
- linters:
153+
- gocyclo
154+
path: api/v1alpha2/(.+)\.go$
146155
- linters:
147156
- staticcheck
148157
text: 'ST1000: at least one file in a package should have a package comment'

PROJECT

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,53 @@ resources:
5757
kind: IPAMProvider
5858
path: sigs.k8s.io/cluster-api-operator/api/v1alpha2
5959
version: v1alpha2
60+
- api:
61+
crdVersion: v1
62+
namespaced: true
63+
controller: true
64+
domain: cluster.x-k8s.io
65+
group: operator
66+
kind: CoreProvider
67+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
68+
version: v1alpha3
69+
- api:
70+
crdVersion: v1
71+
namespaced: true
72+
domain: cluster.x-k8s.io
73+
group: operator
74+
kind: BootstrapProvider
75+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
76+
version: v1alpha3
77+
- api:
78+
crdVersion: v1
79+
namespaced: true
80+
domain: cluster.x-k8s.io
81+
group: operator
82+
kind: ControlPlaneProvider
83+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
84+
version: v1alpha3
85+
- api:
86+
crdVersion: v1
87+
namespaced: true
88+
domain: cluster.x-k8s.io
89+
group: operator
90+
kind: InfrastructureProvider
91+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
92+
version: v1alpha3
93+
- api:
94+
crdVersion: v1
95+
namespaced: true
96+
domain: cluster.x-k8s.io
97+
group: operator
98+
kind: AddonProvider
99+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
100+
version: v1alpha3
101+
- api:
102+
crdVersion: v1
103+
namespaced: true
104+
domain: cluster.x-k8s.io
105+
group: operator
106+
kind: IPAMProvider
107+
path: sigs.k8s.io/cluster-api-operator/api/v1alpha3
108+
version: v1alpha3
60109
version: "3"

api/v1alpha2/addonprovider_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ type AddonProviderStatus struct {
3535
// +kubebuilder:subresource:status
3636
// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
3737
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
38-
// +kubebuilder:storageversion
3938

4039
// AddonProvider is the Schema for the addonproviders API.
4140
type AddonProvider struct {

api/v1alpha2/bootstrapprovider_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ type BootstrapProviderStatus struct {
3535
// +kubebuilder:subresource:status
3636
// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
3737
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
38-
// +kubebuilder:storageversion
3938

4039
// BootstrapProvider is the Schema for the bootstrapproviders API.
4140
type BootstrapProvider struct {

api/v1alpha2/controlplaneprovider_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ type ControlPlaneProviderStatus struct {
3535
// +kubebuilder:subresource:status
3636
// +kubebuilder:printcolumn:name="InstalledVersion",type="string",JSONPath=".status.installedVersion"
3737
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
38-
// +kubebuilder:storageversion
3938

4039
// ControlPlaneProvider is the Schema for the controlplaneproviders API.
4140
type ControlPlaneProvider struct {

0 commit comments

Comments
 (0)