Addtional changes for zz_generated.deepcopy, taints, kind mappers

spectrocloud · Jan 27, 2025 · c3ac2d3 · c3ac2d3
1 parent 6c10e02
commit c3ac2d3
Show file tree

Hide file tree

Showing 28 changed files with 1,643 additions and 5,529 deletions.
diff --git a/Makefile b/Makefile
@@ -413,14 +413,21 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
 generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
 	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api"
 	$(CONVERSION_GEN) \
-		--output-file=zz_generated.conversion.go \
+		--input-dirs=./bootstrap/kubeadm/api/v1alpha4 \
+		--build-tag=ignore_autogenerated_kubeadm_bootstrap \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
+		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./internal/apis/bootstrap/kubeadm/v1alpha3 \
 		./internal/apis/bootstrap/kubeadm/v1alpha4
-	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
+	$(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 \
+		--input-dirs=./bootstrap/kubeadm/types/upstreamv1beta2 \
+		--input-dirs=./bootstrap/kubeadm/types/upstreamv1beta3 \
+		--build-tag=ignore_autogenerated_kubeadm_types \
+		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
+		./bootstrap/kubeadm/types/upstreamv1beta1 \
 		./bootstrap/kubeadm/types/upstreamv1beta2 \
 		./bootstrap/kubeadm/types/upstreamv1beta3 \
 		./bootstrap/kubeadm/types/upstreamv1beta4