Move ./bootstrap/kubeadm/api => ./api/bootstrap/kubeadm

Author: sbueringer

.golangci-kal.yml

@@ -60,7 +60,7 @@ linters:
     - path-except: "api//*"
       linters:
         - kubeapilinter
-    - path: "api/addons/v1beta2/*|bootstrap/kubeadm/api/v1beta2/*|controlplane/kubeadm/api/v1beta2/*|api/core/v1beta2/*|api/ipam/v1beta2/*|api/runtime/v1beta2/*|api/addons/v1beta1/*|bootstrap/kubeadm/api/v1beta1/*|controlplane/kubeadm/api/v1beta1/*|api/core/v1beta1/*|api/ipam/v1beta1/*|api/ipam/v1alpha1/*|api/runtime/v1alpha1/*"
+    - 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/*"
       text: "Conditions field must be a slice of metav1.Condition"
       linters:
         - kubeapilinter
@@ -88,7 +88,7 @@ linters:
       text: "maxlength: field Items must have a maximum items, add kubebuilder:validation:MaxItems marker"
       linters:
         - kubeapilinter
-    - path: "bootstrap/kubeadm/api/v1beta2/*|controlplane/kubeadm/api/v1beta2/*|api/core/v1beta2/*|api/addons/v1beta2/*|bootstrap/kubeadm/api/v1beta1/*|controlplane/kubeadm/api/v1beta1/*|api/v1alpha1/*|api/core/v1beta1/*|api/addons/v1beta1/*"
+    - 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/*"
       text: "nobools"
       linters:
         - kubeapilinter
@@ -98,7 +98,7 @@ linters:
       linters:
         - kubeapilinter
     # The following rules are disabled until we migrate to the new API.
-    - path: "bootstrap/kubeadm/api/v1beta2/kubeadm_types.go|bootstrap/kubeadm/api/v1beta1/kubeadm_types.go"
+    - path: "api/bootstrap/kubeadm/v1beta2/kubeadm_types.go|api/bootstrap/kubeadm/v1beta1/kubeadm_types.go"
       text: "field Token is marked as required, should not be a pointer"
       linters:
         - kubeapilinter

.golangci.yml

@@ -110,9 +110,9 @@ linters:
           alias: bootstrapv1alpha3
         - pkg: sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4
           alias: bootstrapv1alpha4
-        - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
+        - pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1
           alias: bootstrapv1beta1
-        - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2
+        - pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
           alias: bootstrapv1
         # KCP
         - pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3

Makefile

@@ -332,8 +332,8 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
 generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm bootstrap
 	$(MAKE) clean-generated-yaml SRC_DIRS="./bootstrap/kubeadm/config/crd/bases,./bootstrap/kubeadm/config/webhook/manifests.yaml"
 	$(CONTROLLER_GEN) \
+		paths=./api/bootstrap/kubeadm/... \
 		paths=./bootstrap/kubeadm \
-		paths=./bootstrap/kubeadm/api/... \
 		paths=./bootstrap/kubeadm/internal/controllers/... \
 		paths=./bootstrap/kubeadm/internal/webhooks/... \
 		paths=./internal/apis/bootstrap/kubeadm/... \
@@ -408,10 +408,10 @@ generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for co
 
 .PHONY: generate-go-deepcopy-kubeadm-bootstrap
 generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm bootstrap
-	$(MAKE) clean-generated-deepcopy SRC_DIRS="./bootstrap/kubeadm/api,./bootstrap/kubeadm/types"
+	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/bootstrap/kubeadm,./bootstrap/kubeadm/types"
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-		paths=./bootstrap/kubeadm/api/... \
+		paths=./api/bootstrap/kubeadm/... \
 		paths=./bootstrap/kubeadm/types/...
 
 .PHONY: generate-go-deepcopy-kubeadm-control-plane
@@ -495,13 +495,13 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
 
 .PHONY: generate-go-conversions-kubeadm-bootstrap
 generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
-	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api/v1beta1,./internal/apis/bootstrap/kubeadm"
+	$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1,./internal/apis/bootstrap/kubeadm"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./internal/apis/bootstrap/kubeadm/v1alpha3 \
 		./internal/apis/bootstrap/kubeadm/v1alpha4 \
-		./bootstrap/kubeadm/api/v1beta1
+		./api/bootstrap/kubeadm/v1beta1
 	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta1,./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \

bootstrap/kubeadm/api/.import-restrictions renamed to api/bootstrap/kubeadm/.import-restrictions

@@ -21,9 +21,9 @@ import (
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
+	bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2"
 )
 
 func (src *KubeadmConfig) ConvertTo(dstRaw conversion.Hub) error {

bootstrap/kubeadm/api/v1beta1/condition_consts.go renamed to api/bootstrap/kubeadm/v1beta1/condition_consts.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 
-	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2"
+	bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 

bootstrap/kubeadm/api/v1beta1/conversion.go renamed to api/bootstrap/kubeadm/v1beta1/conversion.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package v1beta1 contains API Schema definitions for the kubeadm v1beta1 API group.
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
 // +kubebuilder:object:generate=true
 // +groupName=bootstrap.cluster.x-k8s.io
 //