Skip to content

Commit e1c2340

Browse files
committed
Replace v1alpha2 with v1alpha3 in the code
1 parent 2d11ac0 commit e1c2340

Some content is hidden

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

48 files changed

+202
-339
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'

cmd/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ import (
4545
"sigs.k8s.io/controller-runtime/pkg/healthz"
4646
ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
4747

48-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
48+
operatorv1alpha2 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
49+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
4950
providercontroller "sigs.k8s.io/cluster-api-operator/internal/controller"
5051
healtchcheckcontroller "sigs.k8s.io/cluster-api-operator/internal/controller/healthcheck"
5152
)
@@ -80,6 +81,7 @@ func init() {
8081
// +kubebuilder:scaffold:scheme
8182
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
8283
utilruntime.Must(operatorv1.AddToScheme(scheme))
84+
utilruntime.Must(operatorv1alpha2.AddToScheme(scheme))
8385
utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
8486
utilruntime.Must(clusterctlv1.AddToScheme(scheme))
8587
}

cmd/plugin/cmd/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
apierrors "k8s.io/apimachinery/pkg/api/errors"
3838
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
3939

40-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
40+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
4141
)
4242

4343
type deleteOptions struct {

cmd/plugin/cmd/delete_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/fields"
2525

26-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
26+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
2727
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2828
)
2929

cmd/plugin/cmd/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/yamlprocessor"
3737
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
3838

39-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
39+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
4040
"sigs.k8s.io/cluster-api-operator/util"
4141
)
4242

cmd/plugin/cmd/init_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
3232

33-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
33+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
3434
"sigs.k8s.io/cluster-api-operator/internal/controller/genericprovider"
3535
"sigs.k8s.io/cluster-api-operator/util"
3636
)

cmd/plugin/cmd/preload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
corev1 "k8s.io/api/core/v1"
2828
kerrors "k8s.io/apimachinery/pkg/util/errors"
2929
"oras.land/oras-go/v2/registry/remote/auth"
30-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
30+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
3131
providercontroller "sigs.k8s.io/cluster-api-operator/internal/controller"
3232
"sigs.k8s.io/cluster-api-operator/util"
3333
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"

cmd/plugin/cmd/preload_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
2929
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
3030

31-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
31+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
3232
"sigs.k8s.io/cluster-api-operator/internal/controller/genericprovider"
3333
)
3434

cmd/plugin/cmd/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
ctrl "sigs.k8s.io/controller-runtime"
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828

29-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
29+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
3030
)
3131

3232
const (

cmd/plugin/cmd/upgrade_plan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
configclient "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
3434
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
3535

36-
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
36+
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha3"
3737
"sigs.k8s.io/cluster-api-operator/util"
3838
)
3939

0 commit comments

Comments
 (0)