Move ./exp/ipam/api => ./api/ipam

Author: sbueringer

.golangci-kal.yml

@@ -68,7 +68,7 @@ linters:
       text: "type ClusterIPFamily should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
       linters:
         - kubeapilinter
-    - path: "exp/ipam/api/v1beta2/*|exp/ipam/api/v1alpha1/*|exp/ipam/api/v1beta1/*"
+    - path: "api/ipam/v1beta2/*|api/ipam/v1alpha1/*|api/ipam/v1beta1/*"
       text: "field Prefix should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
       linters:
         - kubeapilinter

.golangci.yml

@@ -151,9 +151,9 @@ linters:
         - pkg: sigs.k8s.io/cluster-api/api/addons/v1beta2
           alias: addonsv1
         # CAPI exp IPAM
-        - pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1
+        - pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta1
           alias: ipamv1beta1
-        - pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2
+        - pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta2
           alias: ipamv1
         # CAPI exp runtime
         - pkg: sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1

Makefile

@@ -283,14 +283,14 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
 	$(CONTROLLER_GEN) \
 		paths=./ \
 		paths=./api/... \
+		paths=./api/ipam/... \
 		paths=./internal/apis/core/... \
 		paths=./internal/controllers/... \
 		paths=./internal/webhooks/... \
 		paths=./internal/apis/addons/... \
 		paths=./$(EXP_DIR)/api/... \
 		paths=./$(EXP_DIR)/internal/controllers/... \
 		paths=./$(EXP_DIR)/internal/webhooks/... \
-		paths=./$(EXP_DIR)/ipam/api/... \
 		paths=./$(EXP_DIR)/ipam/internal/webhooks/... \
 		paths=./$(EXP_DIR)/runtime/api/... \
 		paths=./$(EXP_DIR)/runtime/internal/controllers/... \
@@ -391,14 +391,14 @@ 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,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
+	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./api/ipam,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		paths=./api/... \
+		paths=./api/ipam/... \
 		paths=./internal/apis/addons/... \
 		paths=./internal/apis/core/... \
 		paths=./$(EXP_DIR)/api/... \
-		paths=./$(EXP_DIR)/ipam/api/... \
 		paths=./$(EXP_DIR)/runtime/api/... \
 		paths=./$(EXP_DIR)/runtime/hooks/api/... \
 		paths=./internal/runtime/test/... \
@@ -449,7 +449,7 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
 	$(MAKE) generate-go-conversions-core-api
 	$(MAKE) generate-go-conversions-addons-api
 	$(MAKE) generate-go-conversions-core-exp
-	$(MAKE) generate-go-conversions-core-exp-ipam
+	$(MAKE) generate-go-conversions-core-ipam
 	$(MAKE) generate-go-conversions-core-runtime
 
 .PHONY: generate-go-conversions-core-api
@@ -482,14 +482,14 @@ generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go c
 		./internal/apis/core/exp/v1alpha4 \
 		./$(EXP_DIR)/api/v1beta1
 
-.PHONY: generate-go-conversions-core-exp-ipam
-generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
-	$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1beta1,./$(EXP_DIR)/ipam/api/v1alpha1"
+.PHONY: generate-go-conversions-core-ipam
+generate-go-conversions-core-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
+	$(MAKE) clean-generated-conversions SRC_DIRS="./api/ipam/v1beta1,./api/ipam/v1alpha1"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
-		./$(EXP_DIR)/ipam/api/v1alpha1 \
-		./$(EXP_DIR)/ipam/api/v1beta1
+		./api/ipam/v1alpha1 \
+		./api/ipam/v1beta1
 
 .PHONY: generate-go-conversions-core-runtime
 generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions go code for core runtime

exp/ipam/api/.import-restrictions renamed to api/ipam/.import-restrictions

@@ -20,9 +20,9 @@ import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
+	ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
-	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 

exp/ipam/api/v1alpha1/conversion.go renamed to api/ipam/v1alpha1/conversion.go

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

exp/ipam/api/v1alpha1/conversion_test.go renamed to api/ipam/v1alpha1/conversion_test.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package v1alpha1 contains API Schema definitions for the exp v1alpha1 IPAM API.
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/ipam/v1beta2
 //
 // Deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.
 package v1alpha1