Skip to content

Commit 0877908

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 ec4adf1 commit 0877908

File tree

131 files changed

+310
-472
lines changed

Some content is hidden

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

131 files changed

+310
-472
lines changed

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

-162
This file was deleted.

‎bootstrap/kubeadm/config/crd/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
commonLabels:
2-
cluster.x-k8s.io/v1alpha2: v1alpha2
32
cluster.x-k8s.io/v1alpha3: v1alpha3
3+
cluster.x-k8s.io/v1alpha4: v1alpha4
44

55
# This kustomization.yaml is not intended to be run by itself,
66
# since it depends on service name and namespace that are out of this kustomize package.

‎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
@@ -23,7 +23,7 @@ import (
2323
ctrl "sigs.k8s.io/controller-runtime"
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

26-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
26+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
2727
)
2828

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

‎bootstrap/kubeadm/controllers/kubeadmconfig_controller_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"k8s.io/apimachinery/pkg/types"
3232
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
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
kubeadmv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/types/v1beta1"
3737
fakeremote "sigs.k8s.io/cluster-api/controllers/remote/fake"
38-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
38+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
3939
"sigs.k8s.io/cluster-api/feature"
4040
"sigs.k8s.io/cluster-api/test/helpers"
4141
"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
ctrl "sigs.k8s.io/controller-runtime"
3737
"sigs.k8s.io/controller-runtime/pkg/client"
3838
"sigs.k8s.io/controller-runtime/pkg/client/fake"

‎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
"sigs.k8s.io/cluster-api/util"
4043
ctrl "sigs.k8s.io/controller-runtime"
@@ -52,8 +55,11 @@ func init() {
5255

5356
_ = clientgoscheme.AddToScheme(scheme)
5457
_ = clusterv1alpha3.AddToScheme(scheme)
58+
_ = clusterv1alpha4.AddToScheme(scheme)
5559
_ = expv1alpha3.AddToScheme(scheme)
60+
_ = expv1alpha4.AddToScheme(scheme)
5661
_ = kubeadmbootstrapv1alpha3.AddToScheme(scheme)
62+
_ = kubeadmbootstrapv1alpha4.AddToScheme(scheme)
5763
// +kubebuilder:scaffold:scheme
5864
}
5965

@@ -173,19 +179,19 @@ func setupWebhooks(mgr ctrl.Manager) {
173179
return
174180
}
175181

176-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
182+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfig{}).SetupWebhookWithManager(mgr); err != nil {
177183
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfig")
178184
os.Exit(1)
179185
}
180-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
186+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigList{}).SetupWebhookWithManager(mgr); err != nil {
181187
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigList")
182188
os.Exit(1)
183189
}
184-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
190+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplate{}).SetupWebhookWithManager(mgr); err != nil {
185191
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplate")
186192
os.Exit(1)
187193
}
188-
if err := (&kubeadmbootstrapv1alpha3.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
194+
if err := (&kubeadmbootstrapv1alpha4.KubeadmConfigTemplateList{}).SetupWebhookWithManager(mgr); err != nil {
189195
setupLog.Error(err, "unable to create webhook", "webhook", "KubeadmConfigTemplateList")
190196
os.Exit(1)
191197
}

‎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
@@ -24,9 +24,9 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/utils/pointer"
27-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
28-
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
29-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
28+
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
29+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
3030
"sigs.k8s.io/cluster-api/feature"
3131
ctrl "sigs.k8s.io/controller-runtime"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"

‎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
@@ -30,7 +30,7 @@ import (
3030
kerrors "k8s.io/apimachinery/pkg/util/errors"
3131
"k8s.io/client-go/rest"
3232
"k8s.io/client-go/tools/record"
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
expv1alpha3 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
3636
"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
@@ -27,7 +27,7 @@ import (
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2929
"k8s.io/client-go/kubernetes/scheme"
30-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
30+
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
3131
"sigs.k8s.io/cluster-api/controllers/external"
3232
capierrors "sigs.k8s.io/cluster-api/errors"
3333
ctrl "sigs.k8s.io/controller-runtime"
@@ -51,7 +51,7 @@ func TestClusterReconcilePhases(t *testing.T) {
5151
Port: 8443,
5252
},
5353
InfrastructureRef: &corev1.ObjectReference{
54-
APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha3",
54+
APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha4",
5555
Kind: "InfrastructureMachine",
5656
Name: "test",
5757
},
@@ -81,7 +81,7 @@ func TestClusterReconcilePhases(t *testing.T) {
8181
cluster: cluster,
8282
infraRef: map[string]interface{}{
8383
"kind": "InfrastructureMachine",
84-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
84+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
8585
"metadata": map[string]interface{}{
8686
"name": "test",
8787
"namespace": "test-namespace",
@@ -95,7 +95,7 @@ func TestClusterReconcilePhases(t *testing.T) {
9595
cluster: cluster,
9696
infraRef: map[string]interface{}{
9797
"kind": "InfrastructureMachine",
98-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
98+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
9999
"metadata": map[string]interface{}{
100100
"name": "test",
101101
"namespace": "test-namespace",
@@ -109,7 +109,7 @@ func TestClusterReconcilePhases(t *testing.T) {
109109
cluster: cluster,
110110
infraRef: map[string]interface{}{
111111
"kind": "InfrastructureMachine",
112-
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha3",
112+
"apiVersion": "infrastructure.cluster.x-k8s.io/v1alpha4",
113113
"metadata": map[string]interface{}{
114114
"name": "test",
115115
"namespace": "test-namespace",

0 commit comments

Comments
 (0)