Move ./exp/runtime/hooks/api => ./api/runtime/hooks

Author: sbueringer

.golangci-kal.yml

@@ -73,7 +73,7 @@ linters:
       linters:
         - kubeapilinter
     # clusterctl and Runtime Hooks can be fixed once we bump their apiVersion.
-    - path: "cmd/clusterctl/api/v1alpha3|exp/runtime/hooks/api/v1alpha1"
+    - path: "cmd/clusterctl/api/v1alpha3|api/runtime/hooks/v1alpha1"
       text: "maxlength"
       linters:
         - kubeapilinter
@@ -106,7 +106,7 @@ linters:
       text: "field Ref is marked as required, should not be a pointer"
       linters:
         - kubeapilinter
-    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/core/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*"
+    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/core/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*|api/runtime/v1beta2/*|api/runtime/v1alpha1/*|api/runtime/hooks/v1alpha1/*"
       text: "field Items must be marked as optional or required"
       linters:
         - kubeapilinter

.golangci.yml

@@ -151,7 +151,7 @@ linters:
           alias: runtimev1alpha1
         - pkg: sigs.k8s.io/cluster-api/api/runtime/v1beta2
           alias: runtimev1
-        - pkg: sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1
+        - pkg: sigs.k8s.io/cluster-api/api/runtime/hooks/v1alpha1
           alias: runtimehooksv1
         - pkg: sigs.k8s.io/cluster-api/exp/runtime/controllers
           alias: runtimecontrollers

Makefile

@@ -390,16 +390,16 @@ 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/addons,./api/core,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./exp/runtime/hooks/api"
+	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./api/runtime/hooks"
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		paths=./api/addons/... \
 		paths=./api/core/... \
 		paths=./api/ipam/... \
 		paths=./api/runtime/... \
+		paths=./api/runtime/hooks/... \
 		paths=./internal/apis/addons/... \
 		paths=./internal/apis/core/... \
-		paths=./exp/runtime/hooks/api/... \
 		paths=./internal/runtime/test/... \
 		paths=./cmd/clusterctl/... \
 		paths=./util/test/builder/... \
@@ -538,7 +538,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/core/v1beta2" "api/core/v1beta1" "exp/runtime/hooks/api/v1alpha1"; do \
+	for pkg in "api/core/v1beta2" "api/core/v1beta1" "api/runtime/hooks/v1alpha1"; do \
 		(cd ../ && $(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"); \
 		echo "** Generating openapi schema for types in ./$${pkg} **"; \
 		$(OPENAPI_GEN) \