Skip to content

Commit a08f290

Browse files
srm09srm09
committed
Updates imports for v1alpha4 types
- Adds imports for controllers and test methods Signed-off-by: Sagar Muchhal <[email protected]>
1 parent 6412f48 commit a08f290

File tree

115 files changed

+244
-202
lines changed

Some content is hidden

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

115 files changed

+244
-202
lines changed

‎bootstrap/kubeadm/controllers/kubeadmconfig_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import (
3131
"k8s.io/apimachinery/pkg/types"
3232
kerrors "k8s.io/apimachinery/pkg/util/errors"
3333
"k8s.io/utils/pointer"
34-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
35-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
34+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
35+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
3636
"sigs.k8s.io/cluster-api/bootstrap/kubeadm/internal/cloudinit"
3737
"sigs.k8s.io/cluster-api/bootstrap/kubeadm/internal/locking"
3838
kubeadmv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/types/v1beta1"
3939
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
4040
"sigs.k8s.io/cluster-api/controllers/remote"
41-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
41+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
4242
"sigs.k8s.io/cluster-api/feature"
4343
"sigs.k8s.io/cluster-api/util"
4444
"sigs.k8s.io/cluster-api/util/annotations"

‎bootstrap/kubeadm/controllers/kubeadmconfig_controller_reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/log"
2828

29-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
29+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
3030
)
3131

3232
var _ = Describe("KubeadmConfigReconciler", func() {

‎bootstrap/kubeadm/controllers/kubeadmconfig_controller_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import (
3232
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
3333
"k8s.io/klog/klogr"
3434
"k8s.io/utils/pointer"
35-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
36-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
35+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
36+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
3737
kubeadmv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/types/v1beta1"
3838
fakeremote "sigs.k8s.io/cluster-api/controllers/remote/fake"
39-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
39+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
4040
"sigs.k8s.io/cluster-api/feature"
4141
"sigs.k8s.io/cluster-api/test/helpers"
4242
"sigs.k8s.io/cluster-api/util"

‎bootstrap/kubeadm/internal/cloudinit/cloudinit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"text/template"
2323

2424
"github.com/pkg/errors"
25-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
25+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
2626
)
2727

2828
const (

‎bootstrap/kubeadm/internal/cloudinit/cloudinit_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
. "github.com/onsi/gomega"
2323

2424
"k8s.io/utils/pointer"
25-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
26-
infrav1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
25+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
26+
infrav1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
2727
"sigs.k8s.io/cluster-api/util/certs"
2828
"sigs.k8s.io/cluster-api/util/secret"
2929
)

‎bootstrap/kubeadm/internal/locking/control_plane_init_mutex.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
apicorev1 "k8s.io/api/core/v1"
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
29+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
)
3232

‎bootstrap/kubeadm/internal/locking/control_plane_init_mutex_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/runtime"
3333
"k8s.io/apimachinery/pkg/runtime/schema"
3434
"k8s.io/apimachinery/pkg/types"
35-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
35+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3838
"sigs.k8s.io/controller-runtime/pkg/log"

‎bootstrap/kubeadm/main.go

+22
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ import (
3131
"k8s.io/klog"
3232
"k8s.io/klog/klogr"
3333
clusterv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
34+
clusterv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
3435
kubeadmbootstrapv1alpha3 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
36+
kubeadmbootstrapv1alpha4 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
3537
kubeadmbootstrapcontrollers "sigs.k8s.io/cluster-api/bootstrap/kubeadm/controllers"
3638
"sigs.k8s.io/cluster-api/cmd/version"
3739
expv1alpha3 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
40+
expv1alpha4 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
3841
"sigs.k8s.io/cluster-api/feature"
3942
ctrl "sigs.k8s.io/controller-runtime"
4043
"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -53,8 +56,11 @@ func init() {
5356

5457
_ = clientgoscheme.AddToScheme(scheme)
5558
_ = clusterv1alpha3.AddToScheme(scheme)
59+
_ = clusterv1alpha4.AddToScheme(scheme)
5660
_ = expv1alpha3.AddToScheme(scheme)
61+
_ = expv1alpha4.AddToScheme(scheme)
5762
_ = kubeadmbootstrapv1alpha3.AddToScheme(scheme)
63+
_ = kubeadmbootstrapv1alpha4.AddToScheme(scheme)
5864
// +kubebuilder:scaffold:scheme
5965
}
6066

@@ -188,6 +194,22 @@ func setupWebhooks(mgr ctrl.Manager) {
188194
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplateList")
189195
os.Exit(1)
190196
}
197+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
198+
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfig")
199+
os.Exit(1)
200+
}
201+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
202+
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigList")
203+
os.Exit(1)
204+
}
205+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
206+
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplate")
207+
os.Exit(1)
208+
}
209+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
210+
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplateList")
211+
os.Exit(1)
212+
}
191213
}
192214

193215
func concurrency(c int) controller.Options {

‎bootstrap/util/configowner.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2626
"k8s.io/apimachinery/pkg/runtime/schema"
27-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2828
"sigs.k8s.io/cluster-api/controllers/external"
29-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
29+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
3030
"sigs.k8s.io/cluster-api/feature"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
)

‎bootstrap/util/configowner_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/utils/pointer"
28-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
29-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
30-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
28+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
29+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
30+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
3131
"sigs.k8s.io/cluster-api/feature"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3333
)

‎cmd/example-provider/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"k8s.io/client-go/kubernetes/scheme"
2626
"k8s.io/klog"
27-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2828
"sigs.k8s.io/cluster-api/controllers"
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
"sigs.k8s.io/controller-runtime/pkg/controller"

‎controllers/cluster_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
kerrors "k8s.io/apimachinery/pkg/util/errors"
3232
"k8s.io/client-go/rest"
3333
"k8s.io/client-go/tools/record"
34-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
34+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3535
"sigs.k8s.io/cluster-api/controllers/external"
3636
expv1alpha3 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
3737
"sigs.k8s.io/cluster-api/feature"

‎controllers/cluster_controller_phases.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
"k8s.io/utils/pointer"
28-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
28+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2929
"sigs.k8s.io/cluster-api/controllers/external"
3030
capierrors "sigs.k8s.io/cluster-api/errors"
3131
"sigs.k8s.io/cluster-api/util"

‎controllers/cluster_controller_phases_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3030
"k8s.io/client-go/kubernetes/scheme"
31-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
31+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3232
"sigs.k8s.io/cluster-api/controllers/external"
3333
capierrors "sigs.k8s.io/cluster-api/errors"
3434
ctrl "sigs.k8s.io/controller-runtime"

‎controllers/cluster_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/handler"
3737
"sigs.k8s.io/controller-runtime/pkg/log"
3838

39-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
39+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
4040
"sigs.k8s.io/cluster-api/util/patch"
4141
)
4242

‎controllers/external/testing.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/pointer"
23-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
23+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2424
)
2525

2626
var (
@@ -32,7 +32,7 @@ var (
3232
ObjectMeta: metav1.ObjectMeta{
3333
Name: "bootstrapmachines.bootstrap.cluster.x-k8s.io",
3434
Labels: map[string]string{
35-
clusterv1.GroupVersion.String(): "v1alpha3",
35+
clusterv1.GroupVersion.String(): "v1alpha4",
3636
},
3737
},
3838
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
@@ -44,7 +44,7 @@ var (
4444
},
4545
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
4646
{
47-
Name: "v1alpha3",
47+
Name: "v1alpha4",
4848
Served: true,
4949
Storage: true,
5050
Subresources: &apiextensionsv1.CustomResourceSubresources{
@@ -78,7 +78,7 @@ var (
7878
ObjectMeta: metav1.ObjectMeta{
7979
Name: "bootstrapmachinetemplates.bootstrap.cluster.x-k8s.io",
8080
Labels: map[string]string{
81-
clusterv1.GroupVersion.String(): "v1alpha3",
81+
clusterv1.GroupVersion.String(): "v1alpha4",
8282
},
8383
},
8484
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
@@ -90,7 +90,7 @@ var (
9090
},
9191
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
9292
{
93-
Name: "v1alpha3",
93+
Name: "v1alpha4",
9494
Served: true,
9595
Storage: true,
9696
Subresources: &apiextensionsv1.CustomResourceSubresources{
@@ -124,7 +124,7 @@ var (
124124
ObjectMeta: metav1.ObjectMeta{
125125
Name: "infrastructuremachines.infrastructure.cluster.x-k8s.io",
126126
Labels: map[string]string{
127-
clusterv1.GroupVersion.String(): "v1alpha3",
127+
clusterv1.GroupVersion.String(): "v1alpha4",
128128
},
129129
},
130130
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
@@ -136,7 +136,7 @@ var (
136136
},
137137
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
138138
{
139-
Name: "v1alpha3",
139+
Name: "v1alpha4",
140140
Served: true,
141141
Storage: true,
142142
Subresources: &apiextensionsv1.CustomResourceSubresources{
@@ -170,7 +170,7 @@ var (
170170
ObjectMeta: metav1.ObjectMeta{
171171
Name: "infrastructuremachinetemplates.infrastructure.cluster.x-k8s.io",
172172
Labels: map[string]string{
173-
clusterv1.GroupVersion.String(): "v1alpha3",
173+
clusterv1.GroupVersion.String(): "v1alpha4",
174174
},
175175
},
176176
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
@@ -182,7 +182,7 @@ var (
182182
},
183183
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
184184
{
185-
Name: "v1alpha3",
185+
Name: "v1alpha4",
186186
Served: true,
187187
Storage: true,
188188
Subresources: &apiextensionsv1.CustomResourceSubresources{

‎controllers/external/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/apiserver/pkg/storage/names"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929

30-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
30+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3131
)
3232

3333
const (

‎controllers/external/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3333

34-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
34+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3535
)
3636

3737
func TestGetResourceFound(t *testing.T) {

‎controllers/machine_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"k8s.io/client-go/rest"
3535
"k8s.io/client-go/tools/record"
3636
"k8s.io/klog"
37-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
37+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3838
"sigs.k8s.io/cluster-api/controllers/external"
3939
"sigs.k8s.io/cluster-api/controllers/noderefutil"
4040
"sigs.k8s.io/cluster-api/controllers/remote"

‎controllers/machine_controller_noderef.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/pkg/errors"
2424
apicorev1 "k8s.io/api/core/v1"
25-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
25+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2626
"sigs.k8s.io/cluster-api/controllers/noderefutil"
2727
capierrors "sigs.k8s.io/cluster-api/errors"
2828
"sigs.k8s.io/cluster-api/util"

‎controllers/machine_controller_noderef_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
3131

32-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
32+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3333
"sigs.k8s.io/cluster-api/controllers/noderefutil"
3434
)
3535

‎controllers/machine_controller_phases.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3636
"sigs.k8s.io/controller-runtime/pkg/handler"
3737

38-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
38+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3939
"sigs.k8s.io/cluster-api/controllers/external"
4040
capierrors "sigs.k8s.io/cluster-api/errors"
4141
"sigs.k8s.io/cluster-api/util"

‎controllers/machine_controller_phases_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
"k8s.io/client-go/kubernetes/scheme"
3232
"k8s.io/utils/pointer"
33-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
33+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3434
"sigs.k8s.io/cluster-api/controllers/external"
3535
"sigs.k8s.io/cluster-api/util/kubeconfig"
3636
"sigs.k8s.io/controller-runtime/pkg/client/fake"

‎controllers/machine_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/client-go/kubernetes/scheme"
3131
"k8s.io/utils/pointer"
32-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
32+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3333
"sigs.k8s.io/cluster-api/controllers/external"
3434
"sigs.k8s.io/cluster-api/test/helpers"
3535
"sigs.k8s.io/cluster-api/util"

‎controllers/machine_helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/pkg/errors"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/labels"
25-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
25+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
)
2828

‎controllers/machine_helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/client-go/kubernetes/scheme"
2727
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2828

29-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
29+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3030
)
3131

3232
func Test_getActiveMachinesInCluster(t *testing.T) {

‎controllers/machinedeployment_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
kerrors "k8s.io/apimachinery/pkg/util/errors"
3030
"k8s.io/client-go/rest"
3131
"k8s.io/client-go/tools/record"
32-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
32+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3333
"sigs.k8s.io/cluster-api/util"
3434
"sigs.k8s.io/cluster-api/util/annotations"
3535
"sigs.k8s.io/cluster-api/util/patch"

‎controllers/machinedeployment_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/log"
3535
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3636

37-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
37+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3838
"sigs.k8s.io/cluster-api/controllers/external"
3939
"sigs.k8s.io/cluster-api/util"
4040
)

‎controllers/machinedeployment_rolling.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/pkg/errors"
2323
"k8s.io/utils/integer"
24-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
24+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
2525
"sigs.k8s.io/cluster-api/controllers/mdutil"
2626
)
2727

0 commit comments

Comments
 (0)