Move ./api => ./api/core

Author: sbueringer

.golangci-kal.yml

@@ -60,11 +60,11 @@ linters:
     - path-except: "api//*"
       linters:
         - kubeapilinter
-    - path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
+    - 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/*"
       text: "Conditions field must be a slice of metav1.Condition"
       linters:
         - kubeapilinter
-    - path: "api/v1beta1/*"
+    - path: "api/core/v1beta1/*"
       text: "type ClusterIPFamily should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
       linters:
         - kubeapilinter
@@ -78,22 +78,22 @@ linters:
       linters:
         - kubeapilinter
     # controller-gen does not allow to add MaxItems to Schemaless fields
-    - path: "api/v1beta2/*|api/v1beta1/*"
+    - path: "api/core/v1beta2/*|api/core/v1beta1/*"
       text: "maxlength: field (AllOf|OneOf|AnyOf) must have a maximum items, add kubebuilder:validation:MaxItems marker"
       linters:
         - kubeapilinter
     # It does not make sense to add a maxItems marker on the *List structs as they are not used to generate CRD YAMLs.
     # This exclude will  be removed once https://github.com/JoelSpeed/kubeapilinter/issues/38 is resolved.
-    - path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
+    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/core/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
       text: "maxlength: field Items must have a maximum items, add kubebuilder:validation:MaxItems marker"
       linters:
         - kubeapilinter
-    - path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/v1beta1/*|api/addons/v1beta1/*"
+    - 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/*"
       text: "nobools"
       linters:
         - kubeapilinter
     # We follow the current CustomResourceDefinition field's json tag pattern.
-    - path: "api/v1beta2/*|api/v1beta1/*"
+    - path: "api/core/v1beta2/*|api/core/v1beta1/*"
       text: "field (XPreserveUnknownFields|XPreserveUnknownFields|XValidations|XMetadata|XIntOrString) json tag does not match pattern"
       linters:
         - kubeapilinter
@@ -102,11 +102,11 @@ linters:
       text: "field Token is marked as required, should not be a pointer"
       linters:
         - kubeapilinter
-    - path: "api/v1beta2/clusterclass_types.go|api/v1beta1/clusterclass_types.go"
+    - path: "api/core/v1beta2/clusterclass_types.go|api/core/v1beta1/clusterclass_types.go"
       text: "field Ref is marked as required, should not be a pointer"
       linters:
         - kubeapilinter
-    - path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*"
+    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/core/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*"
       text: "field Items must be marked as optional or required"
       linters:
         - kubeapilinter

.golangci.yml

@@ -128,9 +128,9 @@ linters:
           alias: clusterv1alpha3
         - pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4
           alias: clusterv1alpha4
-        - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+        - pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
           alias: clusterv1beta1
-        - pkg: sigs.k8s.io/cluster-api/api/v1beta2
+        - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
           alias: clusterv1
         # CAPI exp
         - pkg: sigs.k8s.io/cluster-api/internal/apis/core/exp/v1alpha3

Makefile

@@ -282,7 +282,8 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
 	$(MAKE) clean-generated-yaml SRC_DIRS="./config/crd/bases,./config/webhook/manifests.yaml"
 	$(CONTROLLER_GEN) \
 		paths=./ \
-		paths=./api/... \
+		paths=./api/addons/... \
+		paths=./api/core/... \
 		paths=./api/ipam/... \
 		paths=./api/runtime/... \
 		paths=./internal/apis/core/... \
@@ -391,10 +392,11 @@ generate-go-deepcopy:  ## Run all generate-go-deepcopy-* targets
 
 .PHONY: generate-go-deepcopy-core
 generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
-	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/hooks/api"
+	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/hooks/api"
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-		paths=./api/... \
+		paths=./api/addons/... \
+		paths=./api/core/... \
 		paths=./api/ipam/... \
 		paths=./api/runtime/... \
 		paths=./internal/apis/addons/... \
@@ -454,13 +456,13 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
 
 .PHONY: generate-go-conversions-core-api
 generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
-	$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1beta1,./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
+	$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./internal/apis/core/v1alpha3 \
 		./internal/apis/core/v1alpha4 \
-		./api/v1beta1
+		./api/core/v1beta1
 
 .PHONY: generate-go-conversions-addons-api
 generate-go-conversions-addons-api: $(CONVERSION_GEN) ## Generate conversions go code for addons api
@@ -550,7 +552,7 @@ generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversion
 .PHONY: generate-go-openapi
 generate-go-openapi: $(OPENAPI_GEN) ## Generate openapi go code for runtime SDK
 	@mkdir -p ./tmp/sigs.k8s.io; ln -s $(ROOT_DIR) ./tmp/sigs.k8s.io/; cd ./tmp; \
-	for pkg in "api/v1beta2" "api/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
+	for pkg in "api/core/v1beta2" "api/core/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
 		(cd ../ && $(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"); \
 		echo "** Generating openapi schema for types in ./$${pkg} **"; \
 		$(OPENAPI_GEN) \

api/addons/v1beta1/clusterresourceset_types.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // ClusterResourceSet's ResourcesApplied condition and corresponding reasons that will be used in v1Beta2 API version.

api/addons/v1beta1/condition_consts.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // Conditions and condition Reasons for the ClusterResourceSet object.

api/addons/v1beta1/conversion.go

@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 func (src *ClusterResourceSet) ConvertTo(dstRaw conversion.Hub) error {

api/addons/v1beta1/v1beta2_condition_consts.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 // Conditions that will be used for the ClusterResourceSet object in v1Beta2 API version.
 const (

api/addons/v1beta1/zz_generated.conversion.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // ClusterResourceSet's ResourcesApplied condition and corresponding reasons.