Skip to content

Commit da37543

Browse files
srm09srm09
committed
Updates imports for v1alpha4 types
- Adds imports for controllers and test methods - Removes v1alpha3 webhooks from manager Signed-off-by: Sagar Muchhal <[email protected]>
1 parent 6f00057 commit da37543

File tree

122 files changed

+280
-444
lines changed

Some content is hidden

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

122 files changed

+280
-444
lines changed

‎bootstrap/kubeadm/api/v1alpha3/kubeadmbootstrapconfig_types_test.go

-162
This file was deleted.

‎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

+10-4
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

@@ -172,19 +178,19 @@ func setupWebhooks(mgr ctrl.Manager) {
172178
return
173179
}
174180

175-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
181+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
176182
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfig")
177183
os.Exit(1)
178184
}
179-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
185+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
180186
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigList")
181187
os.Exit(1)
182188
}
183-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
189+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
184190
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplate")
185191
os.Exit(1)
186192
}
187-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
193+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
188194
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplateList")
189195
os.Exit(1)
190196
}

‎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

+5-5
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"
@@ -53,7 +53,7 @@ func TestClusterReconcilePhases(t *testing.T) {
5353
Port: 8443,
5454
},
5555
InfrastructureRef: &corev1.ObjectReference{
56-
APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha3",
56+
APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha4",
5757
Kind: "InfrastructureMachine",
5858
Name: "test",
5959
},
@@ -83,7 +83,7 @@ func TestClusterReconcilePhases(t *testing.T) {
8383
cluster: cluster,
8484
infraRef: map[string]interface{}{
8585
"kind": "InfrastructureMachine",
86-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
86+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
8787
"metadata": map[string]interface{}{
8888
"name": "test",
8989
"namespace": "test-namespace",
@@ -97,7 +97,7 @@ func TestClusterReconcilePhases(t *testing.T) {
9797
cluster: cluster,
9898
infraRef: map[string]interface{}{
9999
"kind": "InfrastructureMachine",
100-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
100+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
101101
"metadata": map[string]interface{}{
102102
"name": "test",
103103
"namespace": "test-namespace",
@@ -111,7 +111,7 @@ func TestClusterReconcilePhases(t *testing.T) {
111111
cluster: cluster,
112112
infraRef: map[string]interface{}{
113113
"kind": "InfrastructureMachine",
114-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
114+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
115115
"metadata": map[string]interface{}{
116116
"name": "test",
117117
"namespace": "test-namespace",

‎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

0 commit comments

Comments
 (0)