Skip to content

Commit 235b5d9

Browse files
sbueringersbueringer
committed
Move ./controlplane/kubeadm/api => ./api/controlplane/kubeadm
1 parent 91b6098 commit 235b5d9

File tree

82 files changed

+74
-74
lines changed

Some content is hidden

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

82 files changed

+74
-74
lines changed

‎.golangci-kal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ linters:
6060
- path-except: "api//*"
6161
linters:
6262
- kubeapilinter
63-
- path: "api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta2/*|controlplane/kubeadm/api/v1beta2/*|api/core/v1beta2/*|api/ipam/v1beta2/*|api/runtime/v1beta2/*|api/addons/v1beta1/*|api/bootstrap/kubeadm/v1beta1/*|controlplane/kubeadm/api/v1beta1/*|api/core/v1beta1/*|api/ipam/v1beta1/*|api/ipam/v1alpha1/*|api/runtime/v1alpha1/*"
63+
- path: "api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/ipam/v1beta2/*|api/runtime/v1beta2/*|api/addons/v1beta1/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/core/v1beta1/*|api/ipam/v1beta1/*|api/ipam/v1alpha1/*|api/runtime/v1alpha1/*"
6464
text: "Conditions field must be a slice of metav1.Condition"
6565
linters:
6666
- kubeapilinter
@@ -88,7 +88,7 @@ linters:
8888
text: "maxlength: field Items must have a maximum items, add kubebuilder:validation:MaxItems marker"
8989
linters:
9090
- kubeapilinter
91-
- path: "api/bootstrap/kubeadm/v1beta2/*|controlplane/kubeadm/api/v1beta2/*|api/core/v1beta2/*|api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta1/*|controlplane/kubeadm/api/v1beta1/*|api/v1alpha1/*|api/core/v1beta1/*|api/addons/v1beta1/*"
91+
- path: "api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/v1alpha1/*|api/core/v1beta1/*|api/addons/v1beta1/*"
9292
text: "nobools"
9393
linters:
9494
- kubeapilinter

‎.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ linters:
119119
alias: controlplanev1alpha3
120120
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha4
121121
alias: controlplanev1alpha4
122-
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
122+
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1
123123
alias: controlplanev1beta1
124-
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2
124+
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2
125125
alias: controlplanev1
126126
# CAPI
127127
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
348348
generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm control plane
349349
$(MAKE) clean-generated-yaml SRC_DIRS="./controlplane/kubeadm/config/crd/bases,./controlplane/kubeadm/config/webhook/manifests.yaml"
350350
$(CONTROLLER_GEN) \
351+
paths=./api/controlplane/kubeadm/... \
351352
paths=./controlplane/kubeadm \
352-
paths=./controlplane/kubeadm/api/... \
353353
paths=./controlplane/kubeadm/internal/controllers/... \
354354
paths=./controlplane/kubeadm/internal/webhooks/... \
355355
paths=./internal/apis/controlplane/kubeadm/... \
@@ -416,10 +416,10 @@ generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy g
416416

417417
.PHONY: generate-go-deepcopy-kubeadm-control-plane
418418
generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm control plane
419-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./controlplane/kubeadm/api"
419+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/controlplane/kubeadm"
420420
$(CONTROLLER_GEN) \
421421
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
422-
paths=./controlplane/kubeadm/api/...
422+
paths=./api/controlplane/kubeadm/...
423423

424424
.PHONY: generate-go-deepcopy-docker-infrastructure
425425
generate-go-deepcopy-docker-infrastructure: $(CONTROLLER_GEN) generate-go-deepcopy-in-memory-infrastructure ## Generate deepcopy go code for docker infrastructure provider
@@ -513,13 +513,13 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
513513

514514
.PHONY: generate-go-conversions-kubeadm-control-plane
515515
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
516-
$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api/v1beta1,./internal/apis/controlplane/kubeadm"
516+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1,./internal/apis/controlplane/kubeadm"
517517
$(CONVERSION_GEN) \
518518
--output-file=zz_generated.conversion.go \
519519
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
520520
./internal/apis/controlplane/kubeadm/v1alpha3 \
521521
./internal/apis/controlplane/kubeadm/v1alpha4 \
522-
./controlplane/kubeadm/api/v1beta1
522+
./api/controlplane/kubeadm/v1beta1
523523

524524
.PHONY: generate-go-conversions-docker-infrastructure
525525
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider

‎controlplane/kubeadm/api/.import-restrictions renamed to ‎api/controlplane/kubeadm/.import-restrictions

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/condition_consts.go renamed to ‎api/controlplane/kubeadm/v1beta1/condition_consts.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/conversion.go renamed to ‎api/controlplane/kubeadm/v1beta1/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323

2424
bootstrapv1beta1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1"
2525
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
26+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2627
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2728
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
28-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
2929
)
3030

3131
func (src *KubeadmControlPlane) ConvertTo(dstRaw conversion.Hub) error {

‎controlplane/kubeadm/api/v1beta1/conversion_test.go renamed to ‎api/controlplane/kubeadm/v1beta1/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/utils/ptr"
2929

3030
bootstrapv1beta1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1"
31-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
31+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3232
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
3333
)
3434

‎controlplane/kubeadm/api/v1beta1/doc.go renamed to ‎api/controlplane/kubeadm/v1beta1/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
// Package v1beta1 contains API Schema definitions for the kubeadm v1beta1 API group,
18-
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2
18+
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2
1919
// +kubebuilder:object:generate=true
2020
// +groupName=controlplane.cluster.x-k8s.io
2121
//

‎controlplane/kubeadm/api/v1beta1/groupversion_info.go renamed to ‎api/controlplane/kubeadm/v1beta1/groupversion_info.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_types.go renamed to ‎api/controlplane/kubeadm/v1beta1/kubeadm_control_plane_types.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/kubeadmcontrolplanetemplate_types.go renamed to ‎api/controlplane/kubeadm/v1beta1/kubeadmcontrolplanetemplate_types.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/v1beta2_condition_consts.go renamed to ‎api/controlplane/kubeadm/v1beta1/v1beta2_condition_consts.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta1/zz_generated.conversion.go renamed to ‎api/controlplane/kubeadm/v1beta1/zz_generated.conversion.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controlplane/kubeadm/api/v1beta1/zz_generated.deepcopy.go renamed to ‎api/controlplane/kubeadm/v1beta1/zz_generated.deepcopy.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/.import-restrictions renamed to ‎api/controlplane/kubeadm/v1beta2/.import-restrictions

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/conversion.go renamed to ‎api/controlplane/kubeadm/v1beta2/conversion.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/doc.go renamed to ‎api/controlplane/kubeadm/v1beta2/doc.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/groupversion_info.go renamed to ‎api/controlplane/kubeadm/v1beta2/groupversion_info.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/kubeadm_control_plane_types.go renamed to ‎api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/kubeadmcontrolplanetemplate_types.go renamed to ‎api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/v1beta1_condition_consts.go renamed to ‎api/controlplane/kubeadm/v1beta2/v1beta1_condition_consts.go

File renamed without changes.

‎controlplane/kubeadm/api/v1beta2/zz_generated.deepcopy.go renamed to ‎api/controlplane/kubeadm/v1beta2/zz_generated.deepcopy.go

File renamed without changes.

‎cmd/clusterctl/client/alpha/kubeadmcontrolplane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"k8s.io/apimachinery/pkg/types"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727

28+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2829
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster"
29-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3030
)
3131

3232
// getKubeadmControlPlane retrieves the KubeadmControlPlane object corresponding to the name and namespace specified.

‎cmd/clusterctl/client/alpha/rollout_pauser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727

28+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2829
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2930
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
30-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3131
"sigs.k8s.io/cluster-api/util/annotations"
3232
)
3333

‎cmd/clusterctl/client/alpha/rollout_restarter_test.go

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

29+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2930
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3031
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
31-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3232
)
3333

3434
func Test_ObjectRestarter(t *testing.T) {

‎cmd/clusterctl/client/alpha/rollout_resumer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727

28+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2829
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2930
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
30-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3131
"sigs.k8s.io/cluster-api/util/annotations"
3232
)
3333

‎cmd/clusterctl/internal/scheme/scheme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2727

2828
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
29+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2930
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
3031
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3132
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
32-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3333
)
3434

3535
var (

‎cmd/clusterctl/internal/test/fake_proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3232

3333
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
34+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3435
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3536
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
3637
fakebootstrap "sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/bootstrap"
3738
fakecontrolplane "sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/controlplane"
3839
fakeexternal "sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/external"
3940
fakeinfrastructure "sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/infrastructure"
40-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
4141
)
4242

4343
type FakeProxy struct {

‎controlplane/kubeadm/internal/cluster_labels.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package internal
1818

1919
import (
20+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2021
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
21-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
2222
"sigs.k8s.io/cluster-api/util/labels/format"
2323
)
2424

‎controlplane/kubeadm/internal/control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131

3232
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
33+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3334
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3435
"sigs.k8s.io/cluster-api/controllers/external"
35-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3636
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
3737
"sigs.k8s.io/cluster-api/util/collections"
3838
"sigs.k8s.io/cluster-api/util/conditions"

‎controlplane/kubeadm/internal/control_plane_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/utils/ptr"
2828

29+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2930
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
30-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3131
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
3232
"sigs.k8s.io/cluster-api/util/collections"
3333
)

‎controlplane/kubeadm/internal/controllers/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ import (
4141
"sigs.k8s.io/controller-runtime/pkg/handler"
4242

4343
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
44+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
4445
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
4546
"sigs.k8s.io/cluster-api/controllers/clustercache"
46-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
4747
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
4848
"sigs.k8s.io/cluster-api/feature"
4949
"sigs.k8s.io/cluster-api/internal/contract"

‎controlplane/kubeadm/internal/controllers/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ import (
4848
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4949

5050
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
51+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
5152
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
5253
"sigs.k8s.io/cluster-api/controllers/clustercache"
5354
"sigs.k8s.io/cluster-api/controllers/external"
54-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
5555
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
5656
controlplanev1webhooks "sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/webhooks"
5757
"sigs.k8s.io/cluster-api/feature"

‎controlplane/kubeadm/internal/controllers/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434

3535
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
36+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3637
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3738
"sigs.k8s.io/cluster-api/controllers/external"
38-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3939
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
4040
topologynames "sigs.k8s.io/cluster-api/internal/topology/names"
4141
"sigs.k8s.io/cluster-api/internal/util/ssa"

‎controlplane/kubeadm/internal/controllers/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434

3535
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
36+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3637
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3738
"sigs.k8s.io/cluster-api/controllers/external"
38-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3939
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
4040
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
4141
"sigs.k8s.io/cluster-api/util/kubeconfig"

‎controlplane/kubeadm/internal/controllers/remediation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"k8s.io/utils/ptr"
3232
ctrl "sigs.k8s.io/controller-runtime"
3333

34+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3435
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
35-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3636
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3737
"sigs.k8s.io/cluster-api/feature"
3838
"sigs.k8s.io/cluster-api/util/annotations"

‎controlplane/kubeadm/internal/controllers/remediation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
utilptr "k8s.io/utils/ptr"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535

36+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3637
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
37-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3838
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3939
"sigs.k8s.io/cluster-api/feature"
4040
"sigs.k8s.io/cluster-api/util/collections"

‎controlplane/kubeadm/internal/controllers/scale.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"k8s.io/klog/v2"
3030
ctrl "sigs.k8s.io/controller-runtime"
3131

32+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3233
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
33-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3434
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3535
"sigs.k8s.io/cluster-api/feature"
3636
"sigs.k8s.io/cluster-api/util/collections"

‎controlplane/kubeadm/internal/controllers/scale_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333

3434
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
35+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3536
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
36-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3737
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3838
"sigs.k8s.io/cluster-api/feature"
3939
"sigs.k8s.io/cluster-api/util"

‎controlplane/kubeadm/internal/controllers/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/utils/ptr"
3131
ctrl "sigs.k8s.io/controller-runtime"
3232

33+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3334
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
34-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3535
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3636
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
3737
"sigs.k8s.io/cluster-api/util/collections"

‎controlplane/kubeadm/internal/controllers/status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131

3232
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
33+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3334
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
34-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3535
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3636
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
3737
controlplanev1webhooks "sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/webhooks"

‎controlplane/kubeadm/internal/controllers/upgrade.go

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

2727
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
28-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
28+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2929
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
3030
"sigs.k8s.io/cluster-api/util/collections"
3131
"sigs.k8s.io/cluster-api/util/version"

‎controlplane/kubeadm/internal/filters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2727

2828
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
29+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2930
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
30-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3131
"sigs.k8s.io/cluster-api/internal/util/compare"
3232
"sigs.k8s.io/cluster-api/util/collections"
3333
)

‎controlplane/kubeadm/internal/filters_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"k8s.io/utils/ptr"
2929

3030
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
31+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3132
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
32-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3333
)
3434

3535
func TestMatchClusterConfiguration(t *testing.T) {

‎controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3737

3838
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
39+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3940
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
40-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
4141
topologynames "sigs.k8s.io/cluster-api/internal/topology/names"
4242
"sigs.k8s.io/cluster-api/internal/util/kubeadm"
4343
"sigs.k8s.io/cluster-api/util/container"

‎controlplane/kubeadm/internal/webhooks/kubeadm_control_plane_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
ctrl "sigs.k8s.io/controller-runtime"
3131

3232
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
33-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
33+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3434
"sigs.k8s.io/cluster-api/feature"
3535
"sigs.k8s.io/cluster-api/internal/webhooks/util"
3636
)

‎controlplane/kubeadm/internal/webhooks/kubeadmcontrolplanetemplate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/webhook"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2929

30+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3031
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
31-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3232
"sigs.k8s.io/cluster-api/feature"
3333
"sigs.k8s.io/cluster-api/internal/util/compare"
3434
)

‎controlplane/kubeadm/internal/webhooks/kubeadmcontrolplanetemplate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
utilfeature "k8s.io/component-base/featuregate/testing"
2727

2828
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
29+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
2930
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
30-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3131
"sigs.k8s.io/cluster-api/feature"
3232
"sigs.k8s.io/cluster-api/internal/webhooks/util"
3333
)

‎controlplane/kubeadm/internal/webhooks/scale.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/webhook"
2929
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3030

31-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
31+
controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
3232
)
3333

3434
func (v *ScaleValidator) SetupWebhookWithManager(mgr ctrl.Manager) error {

0 commit comments

Comments
 (0)