diff --git a/Makefile b/Makefile index 0fb442e6db5d..8e9fa39c48a5 100644 --- a/Makefile +++ b/Makefile @@ -70,10 +70,10 @@ OBSERVABILITY_DIR := hack/observability export PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH) -# Set --output-base for conversion-gen if we are not within GOPATH +# Set --output-dir for conversion-gen if we are not within GOPATH ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api) - CONVERSION_GEN_OUTPUT_BASE := --output-base=$(ROOT_DIR) - CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-base=$(ROOT_DIR)/$(CAPD_DIR) + CONVERSION_GEN_OUTPUT_BASE := --output-dir=$(ROOT_DIR) + CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-dir=$(ROOT_DIR)/$(CAPD_DIR) else export GOPATH := $(shell go env GOPATH) endif @@ -124,7 +124,7 @@ GOTESTSUM_BIN := gotestsum GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)) GOTESTSUM_PKG := gotest.tools/gotestsum -CONVERSION_GEN_VER := v0.29.2 +CONVERSION_GEN_VER := v0.30.0 CONVERSION_GEN_BIN := conversion-gen # We are intentionally using the binary without version suffix, to avoid the version # in generated files. @@ -184,7 +184,7 @@ IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss CONVERSION_VERIFIER_BIN := conversion-verifier CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN)) -OPENAPI_GEN_VER := 70dd376 +OPENAPI_GEN_VER := dc4e619 # main branch as of 22.04.2024 OPENAPI_GEN_BIN := openapi-gen # We are intentionally using the binary without version suffix, to avoid the version # in generated files. @@ -447,90 +447,78 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api $(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4" $(CONVERSION_GEN) \ - --input-dirs=./internal/apis/core/v1alpha3 \ - --input-dirs=./internal/apis/core/v1alpha4 \ - --build-tag=ignore_autogenerated_core \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./internal/apis/core/v1alpha3 \ + ./internal/apis/core/v1alpha4 .PHONY: generate-go-conversions-core-exp generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go code for core exp $(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/exp/v1alpha3,./internal/apis/core/exp/addons/v1alpha3,./internal/apis/core/exp/v1alpha4,./internal/apis/core/exp/addons/v1alpha4" $(CONVERSION_GEN) \ - --input-dirs=./internal/apis/core/exp/v1alpha3 \ - --input-dirs=./internal/apis/core/exp/v1alpha4 \ - --input-dirs=./internal/apis/core/exp/addons/v1alpha3 \ - --input-dirs=./internal/apis/core/exp/addons/v1alpha4 \ - --build-tag=ignore_autogenerated_core_exp \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./internal/apis/core/exp/v1alpha3 \ + ./internal/apis/core/exp/v1alpha4 \ + ./internal/apis/core/exp/addons/v1alpha3 \ + ./internal/apis/core/exp/addons/v1alpha4 .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/v1alpha1" $(CONVERSION_GEN) \ - --input-dirs=./$(EXP_DIR)/ipam/api/v1alpha1 \ - --build-tag=ignore_autogenerated_core_exp_ipam \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./$(EXP_DIR)/ipam/api/v1alpha1 .PHONY: generate-go-conversions-core-runtime generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions go code for core runtime $(MAKE) clean-generated-conversions SRC_DIRS="./internal/runtime/test/v1alpha1,./internal/runtime/test/v1alpha2" $(CONVERSION_GEN) \ - --input-dirs=./internal/runtime/test/v1alpha1 \ - --input-dirs=./internal/runtime/test/v1alpha2 \ - --build-tag=ignore_autogenerated_core_runtime \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./internal/runtime/test/v1alpha1 \ + ./internal/runtime/test/v1alpha2 .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="./internal/apis/bootstrap/kubeadm" $(CONVERSION_GEN) \ - --input-dirs=./internal/apis/bootstrap/kubeadm/v1alpha3 \ - --input-dirs=./internal/apis/bootstrap/kubeadm/v1alpha4 \ - --build-tag=ignore_autogenerated_kubeadm_bootstrap \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --output-file=zz_generated.conversion.go $(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" $(CONVERSION_GEN) \ - --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 + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./bootstrap/kubeadm/types/upstreamv1beta2 \ + ./bootstrap/kubeadm/types/upstreamv1beta3 .PHONY: generate-go-conversions-kubeadm-control-plane generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane $(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/controlplane/kubeadm" $(CONVERSION_GEN) \ - --input-dirs=./internal/apis/controlplane/kubeadm/v1alpha3 \ - --input-dirs=./internal/apis/controlplane/kubeadm/v1alpha4 \ - --build-tag=ignore_autogenerated_kubeadm_controlplane \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4 \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \ - --go-header-file=./hack/boilerplate/boilerplate.generatego.txt + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \ + --extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4 \ + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \ + --go-header-file=./hack/boilerplate/boilerplate.generatego.txt \ + ./internal/apis/controlplane/kubeadm/v1alpha3 \ + ./internal/apis/controlplane/kubeadm/v1alpha4 .PHONY: generate-go-conversions-docker-infrastructure generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider cd $(CAPD_DIR); $(CONVERSION_GEN) \ - --input-dirs=./api/v1alpha3 \ - --input-dirs=./api/v1alpha4 \ - --input-dirs=./$(EXP_DIR)/api/v1alpha3 \ - --input-dirs=./$(EXP_DIR)/api/v1alpha4 \ - --build-tag=ignore_autogenerated_capd \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \ - --extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \ - --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \ - --go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt + --output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \ + --go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \ + ./api/v1alpha3 \ + ./api/v1alpha4 \ + ./$(EXP_DIR)/api/v1alpha3 \ + ./$(EXP_DIR)/api/v1alpha4 .PHONY: generate-go-conversions-in-memory-infrastructure generate-go-conversions-in-memory-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for in-memory infrastructure provider diff --git a/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.conversion.go b/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.conversion.go index 9a40da3b232f..0769ceb3a65f 100644 --- a/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.conversion.go +++ b/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_types -// +build !ignore_autogenerated_kubeadm_types +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.deepcopy.go b/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.deepcopy.go index c4cecbaad29a..4ba216563738 100644 --- a/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.deepcopy.go +++ b/bootstrap/kubeadm/types/upstreamv1beta2/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package upstreamv1beta2 import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.conversion.go b/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.conversion.go index d849616cb3de..0df0b3677e9d 100644 --- a/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.conversion.go +++ b/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_types -// +build !ignore_autogenerated_kubeadm_types +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.deepcopy.go b/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.deepcopy.go index 77bc8ac519f5..ded9eea14be3 100644 --- a/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.deepcopy.go +++ b/bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package upstreamv1beta3 import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/exp/ipam/api/v1alpha1/zz_generated.conversion.go b/exp/ipam/api/v1alpha1/zz_generated.conversion.go index 50d181393b97..3e397d16b8e2 100644 --- a/exp/ipam/api/v1alpha1/zz_generated.conversion.go +++ b/exp/ipam/api/v1alpha1/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_exp_ipam -// +build !ignore_autogenerated_core_exp_ipam +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/internal/apis/bootstrap/kubeadm/v1alpha3/zz_generated.conversion.go b/internal/apis/bootstrap/kubeadm/v1alpha3/zz_generated.conversion.go index fd375ac9db46..aa20da4f7551 100644 --- a/internal/apis/bootstrap/kubeadm/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/bootstrap/kubeadm/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_bootstrap -// +build !ignore_autogenerated_kubeadm_bootstrap +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -545,17 +545,7 @@ func autoConvert_v1alpha3_KubeadmConfigStatus_To_v1beta1_KubeadmConfigStatus(in out.FailureReason = in.FailureReason out.FailureMessage = in.FailureMessage out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -565,17 +555,7 @@ func autoConvert_v1beta1_KubeadmConfigStatus_To_v1alpha3_KubeadmConfigStatus(in out.FailureReason = in.FailureReason out.FailureMessage = in.FailureMessage out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/bootstrap/kubeadm/v1alpha4/zz_generated.conversion.go b/internal/apis/bootstrap/kubeadm/v1alpha4/zz_generated.conversion.go index 5a9c2f8bfaa7..5b88cc6fad97 100644 --- a/internal/apis/bootstrap/kubeadm/v1alpha4/zz_generated.conversion.go +++ b/internal/apis/bootstrap/kubeadm/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_bootstrap -// +build !ignore_autogenerated_kubeadm_bootstrap +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -1197,17 +1197,7 @@ func autoConvert_v1alpha4_KubeadmConfigStatus_To_v1beta1_KubeadmConfigStatus(in out.FailureReason = in.FailureReason out.FailureMessage = in.FailureMessage out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -1222,17 +1212,7 @@ func autoConvert_v1beta1_KubeadmConfigStatus_To_v1alpha4_KubeadmConfigStatus(in out.FailureReason = in.FailureReason out.FailureMessage = in.FailureMessage out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go b/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go index e8fb091e02d0..955f75edfc83 100644 --- a/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go +++ b/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go @@ -22,6 +22,7 @@ import ( bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" + bootstrapv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) @@ -154,3 +155,11 @@ func Convert_v1alpha3_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec out.MachineTemplate.NodeDrainTimeout = in.NodeDrainTimeout return autoConvert_v1alpha3_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec(in, out, s) } + +func Convert_v1beta1_KubeadmConfigSpec_To_v1alpha3_KubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, out *bootstrapv1alpha3.KubeadmConfigSpec, s apiconversion.Scope) error { + return bootstrapv1alpha3.Convert_v1beta1_KubeadmConfigSpec_To_v1alpha3_KubeadmConfigSpec(in, out, s) +} + +func Convert_v1alpha3_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(in *bootstrapv1alpha3.KubeadmConfigSpec, out *bootstrapv1.KubeadmConfigSpec, s apiconversion.Scope) error { + return bootstrapv1alpha3.Convert_v1alpha3_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(in, out, s) +} diff --git a/internal/apis/controlplane/kubeadm/v1alpha3/zz_generated.conversion.go b/internal/apis/controlplane/kubeadm/v1alpha3/zz_generated.conversion.go index 795319d2d4de..9dcb33c824b2 100644 --- a/internal/apis/controlplane/kubeadm/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/controlplane/kubeadm/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_controlplane -// +build !ignore_autogenerated_kubeadm_controlplane +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -27,7 +27,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + clusterapiapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" v1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" errors "sigs.k8s.io/cluster-api/errors" kubeadmv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3" @@ -86,11 +87,21 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*kubeadmv1alpha3.KubeadmConfigSpec)(nil), (*apiv1beta1.KubeadmConfigSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(a.(*kubeadmv1alpha3.KubeadmConfigSpec), b.(*apiv1beta1.KubeadmConfigSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*KubeadmControlPlaneSpec)(nil), (*v1beta1.KubeadmControlPlaneSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec(a.(*KubeadmControlPlaneSpec), b.(*v1beta1.KubeadmControlPlaneSpec), scope) }); err != nil { return err } + if err := s.AddConversionFunc((*apiv1beta1.KubeadmConfigSpec)(nil), (*kubeadmv1alpha3.KubeadmConfigSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeadmConfigSpec_To_v1alpha3_KubeadmConfigSpec(a.(*apiv1beta1.KubeadmConfigSpec), b.(*kubeadmv1alpha3.KubeadmConfigSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta1.KubeadmControlPlaneSpec)(nil), (*KubeadmControlPlaneSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlaneSpec(a.(*v1beta1.KubeadmControlPlaneSpec), b.(*KubeadmControlPlaneSpec), scope) }); err != nil { @@ -182,7 +193,7 @@ func autoConvert_v1alpha3_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlane out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) out.Version = in.Version // WARNING: in.InfrastructureTemplate requires manual conversion: does not exist in peer-type - if err := kubeadmv1alpha3.Convert_v1alpha3_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { + if err := Convert_v1alpha3_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { return err } // WARNING: in.UpgradeAfter requires manual conversion: does not exist in peer-type @@ -195,7 +206,7 @@ func autoConvert_v1beta1_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlane out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) out.Version = in.Version // WARNING: in.MachineTemplate requires manual conversion: does not exist in peer-type - if err := kubeadmv1alpha3.Convert_v1beta1_KubeadmConfigSpec_To_v1alpha3_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { + if err := Convert_v1beta1_KubeadmConfigSpec_To_v1alpha3_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { return err } // WARNING: in.RolloutBefore requires manual conversion: does not exist in peer-type @@ -216,17 +227,7 @@ func autoConvert_v1alpha3_KubeadmControlPlaneStatus_To_v1beta1_KubeadmControlPla out.FailureReason = errors.KubeadmControlPlaneStatusError(in.FailureReason) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*clusterapiapiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -247,17 +248,7 @@ func autoConvert_v1beta1_KubeadmControlPlaneStatus_To_v1alpha3_KubeadmControlPla out.FailureReason = errors.KubeadmControlPlaneStatusError(in.FailureReason) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) // WARNING: in.LastRemediation requires manual conversion: does not exist in peer-type return nil } diff --git a/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go b/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go index 75442d091b28..2fd47a0fe076 100644 --- a/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go +++ b/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go @@ -20,9 +20,12 @@ import ( apiconversion "k8s.io/apimachinery/pkg/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" bootstrapv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4" + clusterv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4" + corev1alpha4 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) @@ -291,3 +294,19 @@ func Convert_v1beta1_KubeadmControlPlaneTemplateResource_To_v1alpha4_KubeadmCont // .metadata and .spec.machineTemplate.metadata was added in v1beta1. return autoConvert_v1beta1_KubeadmControlPlaneTemplateResource_To_v1alpha4_KubeadmControlPlaneTemplateResource(in, out, scope) } + +func Convert_v1beta1_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, out *bootstrapv1alpha4.KubeadmConfigSpec, s apiconversion.Scope) error { + return bootstrapv1alpha4.Convert_v1beta1_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(in, out, s) +} + +func Convert_v1alpha4_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(in *bootstrapv1alpha4.KubeadmConfigSpec, out *bootstrapv1.KubeadmConfigSpec, s apiconversion.Scope) error { + return bootstrapv1alpha4.Convert_v1alpha4_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(in, out, s) +} + +func Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(in *clusterv1alpha4.ObjectMeta, out *clusterv1.ObjectMeta, s apiconversion.Scope) error { + return corev1alpha4.Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(in, out, s) +} + +func Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(in *clusterv1.ObjectMeta, out *clusterv1alpha4.ObjectMeta, s apiconversion.Scope) error { + return corev1alpha4.Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(in, out, s) +} diff --git a/internal/apis/controlplane/kubeadm/v1alpha4/zz_generated.conversion.go b/internal/apis/controlplane/kubeadm/v1alpha4/zz_generated.conversion.go index 222ec1b5af36..4efbb1b7b795 100644 --- a/internal/apis/controlplane/kubeadm/v1alpha4/zz_generated.conversion.go +++ b/internal/apis/controlplane/kubeadm/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_kubeadm_controlplane -// +build !ignore_autogenerated_kubeadm_controlplane +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -28,7 +28,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + clusterapiapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" v1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" errors "sigs.k8s.io/cluster-api/errors" kubeadmv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4" @@ -132,11 +133,26 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*kubeadmv1alpha4.KubeadmConfigSpec)(nil), (*apiv1beta1.KubeadmConfigSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(a.(*kubeadmv1alpha4.KubeadmConfigSpec), b.(*apiv1beta1.KubeadmConfigSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*KubeadmControlPlaneSpec)(nil), (*v1beta1.KubeadmControlPlaneTemplateResourceSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha4_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneTemplateResourceSpec(a.(*KubeadmControlPlaneSpec), b.(*v1beta1.KubeadmControlPlaneTemplateResourceSpec), scope) }); err != nil { return err } + if err := s.AddConversionFunc((*corev1alpha4.ObjectMeta)(nil), (*clusterapiapiv1beta1.ObjectMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(a.(*corev1alpha4.ObjectMeta), b.(*clusterapiapiv1beta1.ObjectMeta), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*apiv1beta1.KubeadmConfigSpec)(nil), (*kubeadmv1alpha4.KubeadmConfigSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(a.(*apiv1beta1.KubeadmConfigSpec), b.(*kubeadmv1alpha4.KubeadmConfigSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta1.KubeadmControlPlaneMachineTemplate)(nil), (*KubeadmControlPlaneMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_KubeadmControlPlaneMachineTemplate_To_v1alpha4_KubeadmControlPlaneMachineTemplate(a.(*v1beta1.KubeadmControlPlaneMachineTemplate), b.(*KubeadmControlPlaneMachineTemplate), scope) }); err != nil { @@ -162,6 +178,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*clusterapiapiv1beta1.ObjectMeta)(nil), (*corev1alpha4.ObjectMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(a.(*clusterapiapiv1beta1.ObjectMeta), b.(*corev1alpha4.ObjectMeta), scope) + }); err != nil { + return err + } return nil } @@ -240,7 +261,7 @@ func Convert_v1beta1_KubeadmControlPlaneList_To_v1alpha4_KubeadmControlPlaneList } func autoConvert_v1alpha4_KubeadmControlPlaneMachineTemplate_To_v1beta1_KubeadmControlPlaneMachineTemplate(in *KubeadmControlPlaneMachineTemplate, out *v1beta1.KubeadmControlPlaneMachineTemplate, s conversion.Scope) error { - if err := corev1alpha4.Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } out.InfrastructureRef = in.InfrastructureRef @@ -254,7 +275,7 @@ func Convert_v1alpha4_KubeadmControlPlaneMachineTemplate_To_v1beta1_KubeadmContr } func autoConvert_v1beta1_KubeadmControlPlaneMachineTemplate_To_v1alpha4_KubeadmControlPlaneMachineTemplate(in *v1beta1.KubeadmControlPlaneMachineTemplate, out *KubeadmControlPlaneMachineTemplate, s conversion.Scope) error { - if err := corev1alpha4.Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } out.InfrastructureRef = in.InfrastructureRef @@ -270,7 +291,7 @@ func autoConvert_v1alpha4_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlane if err := Convert_v1alpha4_KubeadmControlPlaneMachineTemplate_To_v1beta1_KubeadmControlPlaneMachineTemplate(&in.MachineTemplate, &out.MachineTemplate, s); err != nil { return err } - if err := kubeadmv1alpha4.Convert_v1alpha4_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { + if err := Convert_v1alpha4_KubeadmConfigSpec_To_v1beta1_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { return err } out.RolloutAfter = (*v1.Time)(unsafe.Pointer(in.RolloutAfter)) @@ -289,7 +310,7 @@ func autoConvert_v1beta1_KubeadmControlPlaneSpec_To_v1alpha4_KubeadmControlPlane if err := Convert_v1beta1_KubeadmControlPlaneMachineTemplate_To_v1alpha4_KubeadmControlPlaneMachineTemplate(&in.MachineTemplate, &out.MachineTemplate, s); err != nil { return err } - if err := kubeadmv1alpha4.Convert_v1beta1_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { + if err := Convert_v1beta1_KubeadmConfigSpec_To_v1alpha4_KubeadmConfigSpec(&in.KubeadmConfigSpec, &out.KubeadmConfigSpec, s); err != nil { return err } // WARNING: in.RolloutBefore requires manual conversion: does not exist in peer-type @@ -311,17 +332,7 @@ func autoConvert_v1alpha4_KubeadmControlPlaneStatus_To_v1beta1_KubeadmControlPla out.FailureReason = errors.KubeadmControlPlaneStatusError(in.FailureReason) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*clusterapiapiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -342,17 +353,7 @@ func autoConvert_v1beta1_KubeadmControlPlaneStatus_To_v1alpha4_KubeadmControlPla out.FailureReason = errors.KubeadmControlPlaneStatusError(in.FailureReason) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) // WARNING: in.LastRemediation requires manual conversion: does not exist in peer-type return nil } diff --git a/internal/apis/core/exp/addons/v1alpha3/zz_generated.conversion.go b/internal/apis/core/exp/addons/v1alpha3/zz_generated.conversion.go index 5af0bae47341..78ef3a4c549c 100644 --- a/internal/apis/core/exp/addons/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/core/exp/addons/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_exp -// +build !ignore_autogenerated_core_exp +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -260,17 +260,7 @@ func autoConvert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResour func autoConvert_v1alpha3_ClusterResourceSetList_To_v1beta1_ClusterResourceSetList(in *ClusterResourceSetList, out *v1beta1.ClusterResourceSetList, s conversion.Scope) error { out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta1.ClusterResourceSet, len(*in)) - for i := range *in { - if err := Convert_v1alpha3_ClusterResourceSet_To_v1beta1_ClusterResourceSet(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } + out.Items = *(*[]v1beta1.ClusterResourceSet)(unsafe.Pointer(&in.Items)) return nil } @@ -281,17 +271,7 @@ func Convert_v1alpha3_ClusterResourceSetList_To_v1beta1_ClusterResourceSetList(i func autoConvert_v1beta1_ClusterResourceSetList_To_v1alpha3_ClusterResourceSetList(in *v1beta1.ClusterResourceSetList, out *ClusterResourceSetList, s conversion.Scope) error { out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterResourceSet, len(*in)) - for i := range *in { - if err := Convert_v1beta1_ClusterResourceSet_To_v1alpha3_ClusterResourceSet(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } + out.Items = *(*[]ClusterResourceSet)(unsafe.Pointer(&in.Items)) return nil } @@ -326,17 +306,7 @@ func Convert_v1beta1_ClusterResourceSetSpec_To_v1alpha3_ClusterResourceSetSpec(i func autoConvert_v1alpha3_ClusterResourceSetStatus_To_v1beta1_ClusterResourceSetStatus(in *ClusterResourceSetStatus, out *v1beta1.ClusterResourceSetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -347,17 +317,7 @@ func Convert_v1alpha3_ClusterResourceSetStatus_To_v1beta1_ClusterResourceSetStat func autoConvert_v1beta1_ClusterResourceSetStatus_To_v1alpha3_ClusterResourceSetStatus(in *v1beta1.ClusterResourceSetStatus, out *ClusterResourceSetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/core/exp/addons/v1alpha4/zz_generated.conversion.go b/internal/apis/core/exp/addons/v1alpha4/zz_generated.conversion.go index b3868b4ea601..8830345af13f 100644 --- a/internal/apis/core/exp/addons/v1alpha4/zz_generated.conversion.go +++ b/internal/apis/core/exp/addons/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_exp -// +build !ignore_autogenerated_core_exp +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -260,17 +260,7 @@ func autoConvert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResour func autoConvert_v1alpha4_ClusterResourceSetList_To_v1beta1_ClusterResourceSetList(in *ClusterResourceSetList, out *v1beta1.ClusterResourceSetList, s conversion.Scope) error { out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta1.ClusterResourceSet, len(*in)) - for i := range *in { - if err := Convert_v1alpha4_ClusterResourceSet_To_v1beta1_ClusterResourceSet(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } + out.Items = *(*[]v1beta1.ClusterResourceSet)(unsafe.Pointer(&in.Items)) return nil } @@ -281,17 +271,7 @@ func Convert_v1alpha4_ClusterResourceSetList_To_v1beta1_ClusterResourceSetList(i func autoConvert_v1beta1_ClusterResourceSetList_To_v1alpha4_ClusterResourceSetList(in *v1beta1.ClusterResourceSetList, out *ClusterResourceSetList, s conversion.Scope) error { out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterResourceSet, len(*in)) - for i := range *in { - if err := Convert_v1beta1_ClusterResourceSet_To_v1alpha4_ClusterResourceSet(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } + out.Items = *(*[]ClusterResourceSet)(unsafe.Pointer(&in.Items)) return nil } @@ -326,17 +306,7 @@ func Convert_v1beta1_ClusterResourceSetSpec_To_v1alpha4_ClusterResourceSetSpec(i func autoConvert_v1alpha4_ClusterResourceSetStatus_To_v1beta1_ClusterResourceSetStatus(in *ClusterResourceSetStatus, out *v1beta1.ClusterResourceSetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -347,17 +317,7 @@ func Convert_v1alpha4_ClusterResourceSetStatus_To_v1beta1_ClusterResourceSetStat func autoConvert_v1beta1_ClusterResourceSetStatus_To_v1alpha4_ClusterResourceSetStatus(in *v1beta1.ClusterResourceSetStatus, out *ClusterResourceSetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/core/exp/v1alpha3/conversion.go b/internal/apis/core/exp/v1alpha3/conversion.go index 6978b3668890..1aae52b47bee 100644 --- a/internal/apis/core/exp/v1alpha3/conversion.go +++ b/internal/apis/core/exp/v1alpha3/conversion.go @@ -21,7 +21,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/conversion" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" + clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) @@ -96,3 +98,11 @@ func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error { return Convert_v1beta1_MachinePoolList_To_v1alpha3_MachinePoolList(src, dst, nil) } + +func Convert_v1alpha3_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(in *clusterv1alpha3.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error { + return clusterv1alpha3.Convert_v1alpha3_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(in, out, s) +} + +func Convert_v1beta1_MachineTemplateSpec_To_v1alpha3_MachineTemplateSpec(in *clusterv1.MachineTemplateSpec, out *clusterv1alpha3.MachineTemplateSpec, s apimachineryconversion.Scope) error { + return clusterv1alpha3.Convert_v1beta1_MachineTemplateSpec_To_v1alpha3_MachineTemplateSpec(in, out, s) +} diff --git a/internal/apis/core/exp/v1alpha3/zz_generated.conversion.go b/internal/apis/core/exp/v1alpha3/zz_generated.conversion.go index d4609e258090..35410aaf1175 100644 --- a/internal/apis/core/exp/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/core/exp/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_exp -// +build !ignore_autogenerated_core_exp +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -75,11 +75,21 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*corev1alpha3.MachineTemplateSpec)(nil), (*apiv1beta1.MachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(a.(*corev1alpha3.MachineTemplateSpec), b.(*apiv1beta1.MachineTemplateSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta1.MachinePool)(nil), (*MachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_MachinePool_To_v1alpha3_MachinePool(a.(*v1beta1.MachinePool), b.(*MachinePool), scope) }); err != nil { return err } + if err := s.AddConversionFunc((*apiv1beta1.MachineTemplateSpec)(nil), (*corev1alpha3.MachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_MachineTemplateSpec_To_v1alpha3_MachineTemplateSpec(a.(*apiv1beta1.MachineTemplateSpec), b.(*corev1alpha3.MachineTemplateSpec), scope) + }); err != nil { + return err + } return nil } @@ -150,7 +160,7 @@ func Convert_v1beta1_MachinePoolList_To_v1alpha3_MachinePoolList(in *v1beta1.Mac func autoConvert_v1alpha3_MachinePoolSpec_To_v1beta1_MachinePoolSpec(in *MachinePoolSpec, out *v1beta1.MachinePoolSpec, s conversion.Scope) error { out.ClusterName = in.ClusterName out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - if err := corev1alpha3.Convert_v1alpha3_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := Convert_v1alpha3_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } // WARNING: in.Strategy requires manual conversion: does not exist in peer-type @@ -163,7 +173,7 @@ func autoConvert_v1alpha3_MachinePoolSpec_To_v1beta1_MachinePoolSpec(in *Machine func autoConvert_v1beta1_MachinePoolSpec_To_v1alpha3_MachinePoolSpec(in *v1beta1.MachinePoolSpec, out *MachinePoolSpec, s conversion.Scope) error { out.ClusterName = in.ClusterName out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - if err := corev1alpha3.Convert_v1beta1_MachineTemplateSpec_To_v1alpha3_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := Convert_v1beta1_MachineTemplateSpec_To_v1alpha3_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.MinReadySeconds = (*int32)(unsafe.Pointer(in.MinReadySeconds)) @@ -189,17 +199,7 @@ func autoConvert_v1alpha3_MachinePoolStatus_To_v1beta1_MachinePoolStatus(in *Mac out.BootstrapReady = in.BootstrapReady out.InfrastructureReady = in.InfrastructureReady out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -220,17 +220,7 @@ func autoConvert_v1beta1_MachinePoolStatus_To_v1alpha3_MachinePoolStatus(in *v1b out.BootstrapReady = in.BootstrapReady out.InfrastructureReady = in.InfrastructureReady out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/core/exp/v1alpha4/conversion.go b/internal/apis/core/exp/v1alpha4/conversion.go index cb266a915b0c..70d9bde60f00 100644 --- a/internal/apis/core/exp/v1alpha4/conversion.go +++ b/internal/apis/core/exp/v1alpha4/conversion.go @@ -17,9 +17,12 @@ limitations under the License. package v1alpha4 import ( + apimachineryconversion "k8s.io/apimachinery/pkg/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" + clusterv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) @@ -60,3 +63,11 @@ func (dst *MachinePoolList) ConvertFrom(srcRaw conversion.Hub) error { return Convert_v1beta1_MachinePoolList_To_v1alpha4_MachinePoolList(src, dst, nil) } + +func Convert_v1alpha4_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(in *clusterv1alpha4.MachineTemplateSpec, out *clusterv1.MachineTemplateSpec, s apimachineryconversion.Scope) error { + return clusterv1alpha4.Convert_v1alpha4_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(in, out, s) +} + +func Convert_v1beta1_MachineTemplateSpec_To_v1alpha4_MachineTemplateSpec(in *clusterv1.MachineTemplateSpec, out *clusterv1alpha4.MachineTemplateSpec, s apimachineryconversion.Scope) error { + return clusterv1alpha4.Convert_v1beta1_MachineTemplateSpec_To_v1alpha4_MachineTemplateSpec(in, out, s) +} diff --git a/internal/apis/core/exp/v1alpha4/zz_generated.conversion.go b/internal/apis/core/exp/v1alpha4/zz_generated.conversion.go index a8ee378a3c4e..2d0dff177b01 100644 --- a/internal/apis/core/exp/v1alpha4/zz_generated.conversion.go +++ b/internal/apis/core/exp/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_exp -// +build !ignore_autogenerated_core_exp +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -80,6 +80,16 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*corev1alpha4.MachineTemplateSpec)(nil), (*apiv1beta1.MachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(a.(*corev1alpha4.MachineTemplateSpec), b.(*apiv1beta1.MachineTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*apiv1beta1.MachineTemplateSpec)(nil), (*corev1alpha4.MachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_MachineTemplateSpec_To_v1alpha4_MachineTemplateSpec(a.(*apiv1beta1.MachineTemplateSpec), b.(*corev1alpha4.MachineTemplateSpec), scope) + }); err != nil { + return err + } return nil } @@ -160,7 +170,7 @@ func Convert_v1beta1_MachinePoolList_To_v1alpha4_MachinePoolList(in *v1beta1.Mac func autoConvert_v1alpha4_MachinePoolSpec_To_v1beta1_MachinePoolSpec(in *MachinePoolSpec, out *v1beta1.MachinePoolSpec, s conversion.Scope) error { out.ClusterName = in.ClusterName out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - if err := corev1alpha4.Convert_v1alpha4_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := Convert_v1alpha4_MachineTemplateSpec_To_v1beta1_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.MinReadySeconds = (*int32)(unsafe.Pointer(in.MinReadySeconds)) @@ -177,7 +187,7 @@ func Convert_v1alpha4_MachinePoolSpec_To_v1beta1_MachinePoolSpec(in *MachinePool func autoConvert_v1beta1_MachinePoolSpec_To_v1alpha4_MachinePoolSpec(in *v1beta1.MachinePoolSpec, out *MachinePoolSpec, s conversion.Scope) error { out.ClusterName = in.ClusterName out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) - if err := corev1alpha4.Convert_v1beta1_MachineTemplateSpec_To_v1alpha4_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := Convert_v1beta1_MachineTemplateSpec_To_v1alpha4_MachineTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.MinReadySeconds = (*int32)(unsafe.Pointer(in.MinReadySeconds)) @@ -203,17 +213,7 @@ func autoConvert_v1alpha4_MachinePoolStatus_To_v1beta1_MachinePoolStatus(in *Mac out.BootstrapReady = in.BootstrapReady out.InfrastructureReady = in.InfrastructureReady out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -234,17 +234,7 @@ func autoConvert_v1beta1_MachinePoolStatus_To_v1alpha4_MachinePoolStatus(in *v1b out.BootstrapReady = in.BootstrapReady out.InfrastructureReady = in.InfrastructureReady out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/internal/apis/core/v1alpha3/zz_generated.conversion.go b/internal/apis/core/v1alpha3/zz_generated.conversion.go index c7ea14ba3e55..9aa52bb74333 100644 --- a/internal/apis/core/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/core/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core -// +build !ignore_autogenerated_core +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/internal/apis/core/v1alpha4/zz_generated.conversion.go b/internal/apis/core/v1alpha4/zz_generated.conversion.go index e89720cc15fc..4ec7c8d177e1 100644 --- a/internal/apis/core/v1alpha4/zz_generated.conversion.go +++ b/internal/apis/core/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core -// +build !ignore_autogenerated_core +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/internal/runtime/test/v1alpha1/zz_generated.conversion.go b/internal/runtime/test/v1alpha1/zz_generated.conversion.go index 40a1b837657b..6823edc5956d 100644 --- a/internal/runtime/test/v1alpha1/zz_generated.conversion.go +++ b/internal/runtime/test/v1alpha1/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_core_runtime -// +build !ignore_autogenerated_core_runtime +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/internal/runtime/test/v1alpha1/zz_generated.deepcopy.go b/internal/runtime/test/v1alpha1/zz_generated.deepcopy.go index 8d765855d24e..7ce0004f67ab 100644 --- a/internal/runtime/test/v1alpha1/zz_generated.deepcopy.go +++ b/internal/runtime/test/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go index a9d6dee6e1c5..a8e6f4ce294c 100644 --- a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_capd -// +build !ignore_autogenerated_capd +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -281,19 +281,7 @@ func autoConvert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *Doc if err := Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) - if err := corev1alpha3.Convert_v1alpha3_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) return nil } @@ -306,49 +294,15 @@ func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *v1b if err := Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(corev1alpha3.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(corev1alpha3.FailureDomainSpec) - if err := corev1alpha3.Convert_v1beta1_FailureDomainSpec_To_v1alpha3_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } + out.FailureDomains = *(*corev1alpha3.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) // WARNING: in.LoadBalancer requires manual conversion: does not exist in peer-type return nil } func autoConvert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) - if err := corev1alpha3.Convert_v1alpha3_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -359,30 +313,8 @@ func Convert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *Doc func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(corev1alpha3.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(corev1alpha3.FailureDomainSpec) - if err := corev1alpha3.Convert_v1beta1_FailureDomainSpec_To_v1alpha3_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.FailureDomains = *(*corev1alpha3.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -492,28 +424,8 @@ func autoConvert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in *v1b func autoConvert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -525,28 +437,8 @@ func Convert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *Doc func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha3.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_MachineAddress_To_v1alpha3_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Addresses = *(*[]corev1alpha3.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go index d651bd710693..2da19c0eb318 100644 --- a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_capd -// +build !ignore_autogenerated_capd +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -341,19 +341,7 @@ func autoConvert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *Doc if err := Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) - if err := corev1alpha4.Convert_v1alpha4_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if err := Convert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { return err } @@ -369,19 +357,7 @@ func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1b if err := Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(corev1alpha4.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(corev1alpha4.FailureDomainSpec) - if err := corev1alpha4.Convert_v1beta1_FailureDomainSpec_To_v1alpha4_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } + out.FailureDomains = *(*corev1alpha4.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if err := Convert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { return err } @@ -395,30 +371,8 @@ func Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1beta1 func autoConvert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) - if err := corev1alpha4.Convert_v1alpha4_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -429,30 +383,8 @@ func Convert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *Doc func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready - if in.FailureDomains != nil { - in, out := &in.FailureDomains, &out.FailureDomains - *out = make(corev1alpha4.FailureDomains, len(*in)) - for key, val := range *in { - newVal := new(corev1alpha4.FailureDomainSpec) - if err := corev1alpha4.Convert_v1beta1_FailureDomainSpec_To_v1alpha4_FailureDomainSpec(&val, newVal, s); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.FailureDomains = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.FailureDomains = *(*corev1alpha4.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -694,28 +626,8 @@ func autoConvert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in *v1b func autoConvert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -727,28 +639,8 @@ func Convert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *Doc func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha4.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_MachineAddress_To_v1alpha4_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Addresses = *(*[]corev1alpha4.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } diff --git a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go index 15540f9e0138..1d41c7163ec6 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_capd -// +build !ignore_autogenerated_capd +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -136,17 +136,7 @@ func Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta1 } func autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceName = in.InstanceName out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.Version = (*string)(unsafe.Pointer(in.Version)) @@ -161,17 +151,7 @@ func Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePo } func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha3.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_MachineAddress_To_v1alpha3_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } + out.Addresses = *(*[]corev1alpha3.MachineAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceName = in.InstanceName out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.Version = (*string)(unsafe.Pointer(in.Version)) @@ -283,28 +263,8 @@ func autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]v1beta1.DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - if err := Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Instances = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Instances = *(*[]v1beta1.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -317,28 +277,8 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolSt out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - if err := Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Instances = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha3.Convert_v1beta1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.Conditions = *(*corev1alpha3.Conditions)(unsafe.Pointer(&in.Conditions)) // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type return nil } diff --git a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go index 88ec689d9707..10c3cfa992c6 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go @@ -1,5 +1,5 @@ -//go:build !ignore_autogenerated_capd -// +build !ignore_autogenerated_capd +//go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. @@ -136,17 +136,7 @@ func Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta1 } func autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceName = in.InstanceName out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.Version = (*string)(unsafe.Pointer(in.Version)) @@ -161,17 +151,7 @@ func Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePo } func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha4.MachineAddress, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_MachineAddress_To_v1alpha4_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Addresses = nil - } + out.Addresses = *(*[]corev1alpha4.MachineAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceName = in.InstanceName out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.Version = (*string)(unsafe.Pointer(in.Version)) @@ -283,28 +263,8 @@ func autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]v1beta1.DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - if err := Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Instances = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Instances = *(*[]v1beta1.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } @@ -317,28 +277,8 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolSt out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - if err := Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Instances = nil - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := corev1alpha4.Convert_v1beta1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.Conditions = *(*corev1alpha4.Conditions)(unsafe.Pointer(&in.Conditions)) // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type return nil }