From f6a1253d56c639867eb08c411578d0f4a072d5af Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Fri, 22 Aug 2025 19:12:55 +0200 Subject: [PATCH] Cleanup CAPD exp packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- Makefile | 14 +- .../handlers/topologymutation/handler.go | 10 +- .../handlers/topologymutation/handler_test.go | 24 +- test/framework/finalizers_helpers.go | 3 +- test/framework/ownerreference_helpers.go | 4 +- .../docker/api/v1alpha3/conversion.go | 52 ++ .../docker/api/v1alpha3/conversion_test.go | 21 + .../api/v1alpha3/dockermachinepool_types.go | 3 +- .../api/v1alpha3/zz_generated.conversion.go | 261 ++++++++++ .../api/v1alpha3/zz_generated.deepcopy.go | 164 ++++++ .../docker/api/v1alpha4/conversion.go | 51 ++ .../docker/api/v1alpha4/conversion_test.go | 21 + .../api/v1alpha4/dockermachinepool_types.go | 3 +- .../api/v1alpha4/zz_generated.conversion.go | 261 ++++++++++ .../api/v1alpha4/zz_generated.deepcopy.go | 164 ++++++ .../docker/api/v1beta1/conversion.go | 57 +++ .../docker/api/v1beta1/conversion_test.go | 27 + .../api/v1beta1/dockermachinepool_types.go | 3 +- .../dockermachinepooltemplate_types.go | 0 .../api/v1beta1/zz_generated.conversion.go | 424 ++++++++++++++++ .../api/v1beta1/zz_generated.deepcopy.go | 255 ++++++++++ .../docker/api/v1beta2/conversion.go | 18 +- .../api/v1beta2/dockermachinepool_types.go | 3 +- .../dockermachinepooltemplate_types.go | 0 .../api/v1beta2/zz_generated.deepcopy.go | 302 +++++++++++ .../docker/controllers/alias.go | 18 + test/infrastructure/docker/exp/README.md | 21 - .../docker/exp/api/.import-restrictions | 7 - .../exp/api/v1alpha3/.import-restrictions | 5 - .../docker/exp/api/v1alpha3/conversion.go | 78 --- .../exp/api/v1alpha3/conversion_test.go | 57 --- .../docker/exp/api/v1alpha3/doc.go | 21 - .../exp/api/v1alpha3/groupversion_info.go | 48 -- .../api/v1alpha3/zz_generated.conversion.go | 306 ------------ .../exp/api/v1alpha3/zz_generated.deepcopy.go | 191 ------- .../exp/api/v1alpha4/.import-restrictions | 5 - .../docker/exp/api/v1alpha4/conversion.go | 77 --- .../exp/api/v1alpha4/conversion_test.go | 57 --- .../docker/exp/api/v1alpha4/doc.go | 21 - .../exp/api/v1alpha4/groupversion_info.go | 48 -- .../api/v1alpha4/zz_generated.conversion.go | 306 ------------ .../exp/api/v1alpha4/zz_generated.deepcopy.go | 191 ------- .../exp/api/v1beta1/.import-restrictions | 5 - .../docker/exp/api/v1beta1/conversion.go | 83 ---- .../docker/exp/api/v1beta1/conversion_test.go | 62 --- .../docker/exp/api/v1beta1/doc.go | 23 - .../exp/api/v1beta1/groupversion_info.go | 45 -- .../api/v1beta1/zz_generated.conversion.go | 469 ------------------ .../exp/api/v1beta1/zz_generated.deepcopy.go | 282 ----------- .../docker/exp/api/v1beta2/conversion.go | 20 - .../docker/exp/api/v1beta2/doc.go | 20 - .../exp/api/v1beta2/groupversion_info.go | 42 -- .../exp/api/v1beta2/zz_generated.deepcopy.go | 330 ------------ .../docker/exp/controllers/alias.go | 47 -- .../docker/exp/controllers/exp.go | 23 - .../docker/exp/internal/webhooks/doc.go | 18 - .../docker/exp/webhooks/alias.go | 31 -- .../infrastructure/docker/exp/webhooks/doc.go | 18 - .../dockermachinepool_controller.go | 27 +- .../dockermachinepool_controller_phases.go | 17 +- .../webhooks/dockermachinepool_webhook.go | 4 +- test/infrastructure/docker/main.go | 18 +- test/infrastructure/docker/webhooks/alias.go | 8 + 63 files changed, 2147 insertions(+), 3047 deletions(-) rename test/infrastructure/docker/{exp => }/api/v1alpha3/dockermachinepool_types.go (97%) rename test/infrastructure/docker/{exp => }/api/v1alpha4/dockermachinepool_types.go (97%) rename test/infrastructure/docker/{exp => }/api/v1beta1/dockermachinepool_types.go (97%) rename test/infrastructure/docker/{exp => }/api/v1beta1/dockermachinepooltemplate_types.go (100%) rename test/infrastructure/docker/{exp => }/api/v1beta2/dockermachinepool_types.go (98%) rename test/infrastructure/docker/{exp => }/api/v1beta2/dockermachinepooltemplate_types.go (100%) delete mode 100644 test/infrastructure/docker/exp/README.md delete mode 100644 test/infrastructure/docker/exp/api/.import-restrictions delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/.import-restrictions delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/doc.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/groupversion_info.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha3/zz_generated.deepcopy.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/.import-restrictions delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/doc.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/groupversion_info.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1alpha4/zz_generated.deepcopy.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/.import-restrictions delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/conversion_test.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/doc.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta2/conversion.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta2/doc.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go delete mode 100644 test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go delete mode 100644 test/infrastructure/docker/exp/controllers/alias.go delete mode 100644 test/infrastructure/docker/exp/controllers/exp.go delete mode 100644 test/infrastructure/docker/exp/internal/webhooks/doc.go delete mode 100644 test/infrastructure/docker/exp/webhooks/alias.go delete mode 100644 test/infrastructure/docker/exp/webhooks/doc.go rename test/infrastructure/docker/{exp => }/internal/controllers/dockermachinepool_controller.go (94%) rename test/infrastructure/docker/{exp => }/internal/controllers/dockermachinepool_controller_phases.go (96%) rename test/infrastructure/docker/{exp => }/internal/webhooks/dockermachinepool_webhook.go (88%) diff --git a/Makefile b/Makefile index e36f2024493d..b20c69ac56fc 100644 --- a/Makefile +++ b/Makefile @@ -370,9 +370,6 @@ generate-manifests-docker-infrastructure: $(CONTROLLER_GEN) ## Generate manifest cd $(CAPD_DIR); $(CONTROLLER_GEN) \ paths=./ \ paths=./api/... \ - paths=./exp/api/... \ - paths=./exp/internal/controllers/... \ - paths=./exp/internal/webhooks/... \ paths=./internal/controllers/... \ paths=./internal/webhooks/... \ crd:crdVersions=v1 \ @@ -430,11 +427,10 @@ generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepco .PHONY: generate-go-deepcopy-docker-infrastructure generate-go-deepcopy-docker-infrastructure: $(CONTROLLER_GEN) generate-go-deepcopy-in-memory-infrastructure ## Generate deepcopy go code for docker infrastructure provider - $(MAKE) clean-generated-deepcopy SRC_DIRS="$(CAPD_DIR)/api,$(CAPD_DIR)/exp/api" + $(MAKE) clean-generated-deepcopy SRC_DIRS="$(CAPD_DIR)/api" cd $(CAPD_DIR); $(CONTROLLER_GEN) \ object:headerFile=../../../hack/boilerplate/boilerplate.generatego.txt \ - paths=./api/... \ - paths=./exp/api/... + paths=./api/... .PHONY: generate-go-deepcopy-in-memory-infrastructure generate-go-deepcopy-in-memory-infrastructure: $(CONTROLLER_GEN) ## Generate deepcopy go code for in-memory cloud resources @@ -534,10 +530,7 @@ generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate con --go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \ ./api/v1alpha3 \ ./api/v1alpha4 \ - ./api/v1beta1 \ - ./exp/api/v1alpha3 \ - ./exp/api/v1alpha4 \ - ./exp/api/v1beta1 + ./api/v1beta1 .PHONY: generate-go-conversions-test-extension generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversions go code for test runtime extension provider @@ -729,7 +722,6 @@ verify-conversions: $(CONVERSION_VERIFIER) ## Verifies expected API conversion ./api/... \ ./internal/api/... \ ./test/infrastructure/docker/api/... \ - ./test/infrastructure/docker/exp/api/... .PHONY: verify-doctoc verify-doctoc: generate-doctoc diff --git a/test/extension/handlers/topologymutation/handler.go b/test/extension/handlers/topologymutation/handler.go index 9ab4cda33e24..d434213b69d9 100644 --- a/test/extension/handlers/topologymutation/handler.go +++ b/test/extension/handlers/topologymutation/handler.go @@ -43,8 +43,6 @@ import ( "sigs.k8s.io/cluster-api/exp/runtime/topologymutation" infrav1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - infraexpv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" "sigs.k8s.io/cluster-api/test/infrastructure/kind" ) @@ -64,8 +62,6 @@ func NewExtensionHandlers() *ExtensionHandlers { scheme := runtime.NewScheme() _ = infrav1beta1.AddToScheme(scheme) _ = infrav1.AddToScheme(scheme) - _ = infraexpv1beta1.AddToScheme(scheme) - _ = infraexpv1.AddToScheme(scheme) _ = bootstrapv1beta1.AddToScheme(scheme) _ = bootstrapv1.AddToScheme(scheme) _ = controlplanev1beta1.AddToScheme(scheme) @@ -125,7 +121,7 @@ func (h *ExtensionHandlers) GeneratePatches(ctx context.Context, req *runtimehoo log.Error(err, "Error patching DockerMachineTemplate") return errors.Wrap(err, "error patching DockerMachineTemplate") } - case *infraexpv1beta1.DockerMachinePoolTemplate, *infraexpv1.DockerMachinePoolTemplate: + case *infrav1beta1.DockerMachinePoolTemplate, *infrav1.DockerMachinePoolTemplate: if err := patchDockerMachinePoolTemplate(ctx, obj, variables); err != nil { log.Error(err, "Error patching DockerMachinePoolTemplate") return errors.Wrap(err, "error patching DockerMachinePoolTemplate") @@ -370,12 +366,12 @@ func patchDockerMachinePoolTemplate(ctx context.Context, obj runtime.Object, tem log.Info(fmt.Sprintf("Setting MachinePool customImage to %q", kindMapping.Image)) - dockerMachinePoolTemplateV1Beta1, ok := obj.(*infraexpv1beta1.DockerMachinePoolTemplate) + dockerMachinePoolTemplateV1Beta1, ok := obj.(*infrav1beta1.DockerMachinePoolTemplate) if ok { dockerMachinePoolTemplateV1Beta1.Spec.Template.Spec.Template.CustomImage = kindMapping.Image } - dockerMachinePoolTemplate, ok := obj.(*infraexpv1.DockerMachinePoolTemplate) + dockerMachinePoolTemplate, ok := obj.(*infrav1.DockerMachinePoolTemplate) if ok { dockerMachinePoolTemplate.Spec.Template.Spec.Template.CustomImage = kindMapping.Image } diff --git a/test/extension/handlers/topologymutation/handler_test.go b/test/extension/handlers/topologymutation/handler_test.go index 598b318ebf89..27dfa7a4067b 100644 --- a/test/extension/handlers/topologymutation/handler_test.go +++ b/test/extension/handlers/topologymutation/handler_test.go @@ -35,7 +35,6 @@ import ( controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2" runtimehooksv1 "sigs.k8s.io/cluster-api/api/runtime/hooks/v1alpha1" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" ) var ( @@ -44,7 +43,6 @@ var ( func init() { _ = infrav1.AddToScheme(testScheme) - _ = infraexpv1.AddToScheme(testScheme) _ = controlplanev1.AddToScheme(testScheme) _ = bootstrapv1.AddToScheme(testScheme) } @@ -250,21 +248,21 @@ func Test_patchDockerMachinePoolTemplate(t *testing.T) { tests := []struct { name string - template *infraexpv1.DockerMachinePoolTemplate + template *infrav1.DockerMachinePoolTemplate variables map[string]apiextensionsv1.JSON - expectedTemplate *infraexpv1.DockerMachinePoolTemplate + expectedTemplate *infrav1.DockerMachinePoolTemplate expectedErr bool }{ { name: "fails if builtin.controlPlane.version nor builtin.machinePool.version is not set", - template: &infraexpv1.DockerMachinePoolTemplate{}, + template: &infrav1.DockerMachinePoolTemplate{}, variables: nil, - expectedTemplate: &infraexpv1.DockerMachinePoolTemplate{}, + expectedTemplate: &infrav1.DockerMachinePoolTemplate{}, expectedErr: true, }, { name: "sets customImage for templates linked to ControlPlane", - template: &infraexpv1.DockerMachinePoolTemplate{}, + template: &infrav1.DockerMachinePoolTemplate{}, variables: map[string]apiextensionsv1.JSON{ runtimehooksv1.BuiltinsName: {Raw: toJSON(runtimehooksv1.Builtins{ ControlPlane: &runtimehooksv1.ControlPlaneBuiltins{ @@ -276,11 +274,11 @@ func Test_patchDockerMachinePoolTemplate(t *testing.T) { }, })}, }, - expectedTemplate: &infraexpv1.DockerMachinePoolTemplate{ - Spec: infraexpv1.DockerMachinePoolTemplateSpec{ - Template: infraexpv1.DockerMachinePoolTemplateResource{ - Spec: infraexpv1.DockerMachinePoolSpec{ - Template: infraexpv1.DockerMachinePoolMachineTemplate{ + expectedTemplate: &infrav1.DockerMachinePoolTemplate{ + Spec: infrav1.DockerMachinePoolTemplateSpec{ + Template: infrav1.DockerMachinePoolTemplateResource{ + Spec: infrav1.DockerMachinePoolSpec{ + Template: infrav1.DockerMachinePoolMachineTemplate{ CustomImage: "kindest/node:v1.23.0", }, }, @@ -346,7 +344,7 @@ func TestHandler_GeneratePatches(t *testing.T) { APIVersion: infrav1.GroupVersion.String(), }, } - dockerMachinePoolTemplate := infraexpv1.DockerMachinePoolTemplate{ + dockerMachinePoolTemplate := infrav1.DockerMachinePoolTemplate{ TypeMeta: metav1.TypeMeta{ Kind: "DockerMachinePoolTemplate", APIVersion: infrav1.GroupVersion.String(), diff --git a/test/framework/finalizers_helpers.go b/test/framework/finalizers_helpers.go index e6ed894c9cf3..318a13483e5a 100644 --- a/test/framework/finalizers_helpers.go +++ b/test/framework/finalizers_helpers.go @@ -35,7 +35,6 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2" clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" "sigs.k8s.io/cluster-api/util/patch" ) @@ -72,7 +71,7 @@ var ExpFinalizersAssertion = map[string]func(types.NamespacedName) []string{ var DockerInfraFinalizersAssertion = map[string]func(types.NamespacedName) []string{ dockerMachineKind: func(_ types.NamespacedName) []string { return []string{infrav1.MachineFinalizer} }, dockerClusterKind: func(_ types.NamespacedName) []string { return []string{infrav1.ClusterFinalizer} }, - dockerMachinePoolKind: func(_ types.NamespacedName) []string { return []string{infraexpv1.MachinePoolFinalizer} }, + dockerMachinePoolKind: func(_ types.NamespacedName) []string { return []string{infrav1.MachinePoolFinalizer} }, } // KubeadmControlPlaneFinalizersAssertion maps Kubeadm resource types to their expected finalizers. diff --git a/test/framework/ownerreference_helpers.go b/test/framework/ownerreference_helpers.go index ac855bbaa4bb..67ff6e49d0cd 100644 --- a/test/framework/ownerreference_helpers.go +++ b/test/framework/ownerreference_helpers.go @@ -39,7 +39,7 @@ import ( controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2" clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2" clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" "sigs.k8s.io/cluster-api/util/patch" ) @@ -301,7 +301,7 @@ var ( dockerClusterKind = "DockerCluster" dockerClusterTemplateKind = "DockerClusterTemplate" - dockerMachinePoolController = metav1.OwnerReference{Kind: dockerMachinePoolKind, APIVersion: infraexpv1.GroupVersion.String()} + dockerMachinePoolController = metav1.OwnerReference{Kind: dockerMachinePoolKind, APIVersion: infrav1.GroupVersion.String()} ) // DockerInfraOwnerReferenceAssertions maps Docker Infrastructure types to functions which return an error if the passed diff --git a/test/infrastructure/docker/api/v1alpha3/conversion.go b/test/infrastructure/docker/api/v1alpha3/conversion.go index baa836efff98..b03b61b069d1 100644 --- a/test/infrastructure/docker/api/v1alpha3/conversion.go +++ b/test/infrastructure/docker/api/v1alpha3/conversion.go @@ -355,3 +355,55 @@ func Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerC func Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *infrav1.DockerMachineTemplate, out *DockerMachineTemplate, s apiconversion.Scope) error { return autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in, out, s) } + +func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + // Reset conditions from autogenerated conversions + // NOTE: v1beta3 conditions should not be automatically be converted into v1beta2 conditions. + dst.Status.Conditions = nil + if src.Status.Conditions != nil { + dst.Status.Deprecated = &infrav1.DockerMachinePoolDeprecatedStatus{} + dst.Status.Deprecated.V1Beta1 = &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{} + clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) + } + + // Manually restore data. + restored := &infrav1.DockerMachinePool{} + if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { + return err + } + + dst.Status.InfrastructureMachineKind = restored.Status.InfrastructureMachineKind + dst.Status.Conditions = restored.Status.Conditions + + return nil +} + +func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + // Reset conditions from autogenerated conversions + // NOTE: v1beta2 conditions should not be automatically be converted into v1alpha3 conditions. + dst.Status.Conditions = nil + if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { + clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) + } + + // Preserve Hub data on down-conversion except for metadata + return utilconversion.MarshalData(src, dst) +} + +// Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { + // NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1. + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s) +} diff --git a/test/infrastructure/docker/api/v1alpha3/conversion_test.go b/test/infrastructure/docker/api/v1alpha3/conversion_test.go index 2754f16d60c7..0bce48770d7e 100644 --- a/test/infrastructure/docker/api/v1alpha3/conversion_test.go +++ b/test/infrastructure/docker/api/v1alpha3/conversion_test.go @@ -52,6 +52,11 @@ func TestFuzzyConversion(t *testing.T) { Spoke: &DockerMachineTemplate{}, FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachineTemplateFuzzFunc}, })) + t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachinePool{}, + Spoke: &DockerMachinePool{}, + FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, + })) } func DockerClusterFuzzFunc(_ runtimeserializer.CodecFactory) []any { @@ -109,3 +114,19 @@ func DockerMachineTemplateFuzzFunc(_ runtimeserializer.CodecFactory) []any { spokeDockerMachineSpec, } } + +func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { + return []any{ + hubDockerMachinePoolStatus, + } +} + +func hubDockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, c randfill.Continue) { + c.FillNoCustom(in) + + if in.Deprecated != nil { + if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { + in.Deprecated = nil + } + } +} diff --git a/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go b/test/infrastructure/docker/api/v1alpha3/dockermachinepool_types.go similarity index 97% rename from test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go rename to test/infrastructure/docker/api/v1alpha3/dockermachinepool_types.go index 02e57223ae30..6d3e6fd5e172 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go +++ b/test/infrastructure/docker/api/v1alpha3/dockermachinepool_types.go @@ -20,7 +20,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3" - infrav1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" ) const ( @@ -43,7 +42,7 @@ type DockerMachinePoolMachineTemplate struct { // ExtraMounts describes additional mount points for the node container // These may be used to bind a hostPath // +optional - ExtraMounts []infrav1alpha3.Mount `json:"extraMounts,omitempty"` + ExtraMounts []Mount `json:"extraMounts,omitempty"` } // DockerMachinePoolSpec defines the desired state of DockerMachinePool. diff --git a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go index b7b0f9d6b975..5517e475aceb 100644 --- a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go @@ -89,6 +89,61 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*DockerMachineSpec)(nil), (*v1beta2.DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(a.(*DockerMachineSpec), b.(*v1beta2.DockerMachineSpec), scope) }); err != nil { @@ -169,6 +224,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta2.DockerMachineSpec)(nil), (*DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(a.(*v1beta2.DockerMachineSpec), b.(*DockerMachineSpec), scope) }); err != nil { @@ -414,6 +474,207 @@ func Convert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1beta2 return autoConvert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(in, out, s) } +func autoConvert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in, out, s) +} + +func autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.InstanceName = in.InstanceName + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + out.Version = (*string)(unsafe.Pointer(in.Version)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + 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)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]v1.Condition, len(*in)) + for i := range *in { + if err := Convert_v1alpha3_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil +} + +// Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1alpha3.Conditions, len(*in)) + for i := range *in { + if err := Convert_v1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type + // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type + return nil +} + func autoConvert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { if err := v1.Convert_Pointer_string_To_string(&in.ProviderID, &out.ProviderID, s); err != nil { return err diff --git a/test/infrastructure/docker/api/v1alpha3/zz_generated.deepcopy.go b/test/infrastructure/docker/api/v1alpha3/zz_generated.deepcopy.go index 61c8ba3f9da7..20f80efbb389 100644 --- a/test/infrastructure/docker/api/v1alpha3/zz_generated.deepcopy.go +++ b/test/infrastructure/docker/api/v1alpha3/zz_generated.deepcopy.go @@ -210,6 +210,170 @@ func (in *DockerMachineList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. +func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { + if in == nil { + return nil + } + out := new(DockerMachinePool) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePool) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]corev1alpha3.MachineAddress, len(*in)) + copy(*out, *in) + } + if in.ProviderID != nil { + in, out := &in.ProviderID, &out.ProviderID + *out = new(string) + **out = **in + } + if in.Version != nil { + in, out := &in.Version, &out.Version + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. +func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolInstanceStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. +func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { + if in == nil { + return nil + } + out := new(DockerMachinePoolList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { + *out = *in + if in.PreLoadImages != nil { + in, out := &in.PreLoadImages, &out.PreLoadImages + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.ExtraMounts != nil { + in, out := &in.ExtraMounts, &out.ExtraMounts + *out = make([]Mount, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. +func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolMachineTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) + if in.ProviderIDList != nil { + in, out := &in.ProviderIDList, &out.ProviderIDList + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. +func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { + *out = *in + if in.Instances != nil { + in, out := &in.Instances, &out.Instances + *out = make([]DockerMachinePoolInstanceStatus, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1alpha3.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. +func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DockerMachineSpec) DeepCopyInto(out *DockerMachineSpec) { *out = *in diff --git a/test/infrastructure/docker/api/v1alpha4/conversion.go b/test/infrastructure/docker/api/v1alpha4/conversion.go index 0a165f05b730..4bf0a72f12f7 100644 --- a/test/infrastructure/docker/api/v1alpha4/conversion.go +++ b/test/infrastructure/docker/api/v1alpha4/conversion.go @@ -405,3 +405,54 @@ func Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *infrav1 return nil } + +func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + // Reset conditions from autogenerated conversions + // NOTE: v1beta4 conditions should not be automatically be converted into v1beta2 conditions. + dst.Status.Conditions = nil + if src.Status.Conditions != nil { + dst.Status.Deprecated = &infrav1.DockerMachinePoolDeprecatedStatus{} + dst.Status.Deprecated.V1Beta1 = &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{} + clusterv1alpha4.Convert_v1alpha4_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) + } + + // Manually restore data. + restored := &infrav1.DockerMachinePool{} + if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { + return err + } + + dst.Status.InfrastructureMachineKind = restored.Status.InfrastructureMachineKind + dst.Status.Conditions = restored.Status.Conditions + + return nil +} + +func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + // Reset conditions from autogenerated conversions + // NOTE: v1beta2 conditions should not be automatically be converted into v1alpha4 conditions. + dst.Status.Conditions = nil + if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { + clusterv1alpha4.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha4_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) + } + + // Preserve Hub data on down-conversion except for metadata + return utilconversion.MarshalData(src, dst) +} + +func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { + // NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1. + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s) +} diff --git a/test/infrastructure/docker/api/v1alpha4/conversion_test.go b/test/infrastructure/docker/api/v1alpha4/conversion_test.go index 0fceaf8252a3..36e4c31d8202 100644 --- a/test/infrastructure/docker/api/v1alpha4/conversion_test.go +++ b/test/infrastructure/docker/api/v1alpha4/conversion_test.go @@ -58,6 +58,11 @@ func TestFuzzyConversion(t *testing.T) { Spoke: &DockerMachineTemplate{}, FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachineTemplateFuzzFunc}, })) + t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachinePool{}, + Spoke: &DockerMachinePool{}, + FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, + })) } func DockerClusterFuzzFunc(_ runtimeserializer.CodecFactory) []any { @@ -121,3 +126,19 @@ func DockerMachineTemplateFuzzFunc(_ runtimeserializer.CodecFactory) []any { spokeDockerMachineSpec, } } + +func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { + return []any{ + hubDockerMachinePoolStatus, + } +} + +func hubDockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, c randfill.Continue) { + c.FillNoCustom(in) + + if in.Deprecated != nil { + if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { + in.Deprecated = nil + } + } +} diff --git a/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go b/test/infrastructure/docker/api/v1alpha4/dockermachinepool_types.go similarity index 97% rename from test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go rename to test/infrastructure/docker/api/v1alpha4/dockermachinepool_types.go index fe21ee0db310..9f313fcbfb3d 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go +++ b/test/infrastructure/docker/api/v1alpha4/dockermachinepool_types.go @@ -20,7 +20,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1alpha4 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha4" - infrav1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" ) const ( @@ -43,7 +42,7 @@ type DockerMachinePoolMachineTemplate struct { // ExtraMounts describes additional mount points for the node container // These may be used to bind a hostPath // +optional - ExtraMounts []infrav1alpha4.Mount `json:"extraMounts,omitempty"` + ExtraMounts []Mount `json:"extraMounts,omitempty"` } // DockerMachinePoolSpec defines the desired state of DockerMachinePool. diff --git a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go index 37a931254e6e..abc118668ab4 100644 --- a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go @@ -114,6 +114,61 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*DockerMachineSpec)(nil), (*v1beta2.DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(a.(*DockerMachineSpec), b.(*v1beta2.DockerMachineSpec), scope) }); err != nil { @@ -224,6 +279,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta2.DockerMachineSpec)(nil), (*DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(a.(*v1beta2.DockerMachineSpec), b.(*DockerMachineSpec), scope) }); err != nil { @@ -596,6 +656,207 @@ func Convert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1beta2 return autoConvert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(in, out, s) } +func autoConvert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in, out, s) +} + +func autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.InstanceName = in.InstanceName + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + out.Version = (*string)(unsafe.Pointer(in.Version)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + 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)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]v1.Condition, len(*in)) + for i := range *in { + if err := Convert_v1alpha4_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil +} + +// Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1alpha4.Conditions, len(*in)) + for i := range *in { + if err := Convert_v1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type + // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type + return nil +} + func autoConvert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { if err := v1.Convert_Pointer_string_To_string(&in.ProviderID, &out.ProviderID, s); err != nil { return err diff --git a/test/infrastructure/docker/api/v1alpha4/zz_generated.deepcopy.go b/test/infrastructure/docker/api/v1alpha4/zz_generated.deepcopy.go index 13bf2d198e1c..acb7c91772ed 100644 --- a/test/infrastructure/docker/api/v1alpha4/zz_generated.deepcopy.go +++ b/test/infrastructure/docker/api/v1alpha4/zz_generated.deepcopy.go @@ -317,6 +317,170 @@ func (in *DockerMachineList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. +func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { + if in == nil { + return nil + } + out := new(DockerMachinePool) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePool) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]corev1alpha4.MachineAddress, len(*in)) + copy(*out, *in) + } + if in.ProviderID != nil { + in, out := &in.ProviderID, &out.ProviderID + *out = new(string) + **out = **in + } + if in.Version != nil { + in, out := &in.Version, &out.Version + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. +func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolInstanceStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. +func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { + if in == nil { + return nil + } + out := new(DockerMachinePoolList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { + *out = *in + if in.PreLoadImages != nil { + in, out := &in.PreLoadImages, &out.PreLoadImages + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.ExtraMounts != nil { + in, out := &in.ExtraMounts, &out.ExtraMounts + *out = make([]Mount, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. +func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolMachineTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) + if in.ProviderIDList != nil { + in, out := &in.ProviderIDList, &out.ProviderIDList + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. +func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { + *out = *in + if in.Instances != nil { + in, out := &in.Instances, &out.Instances + *out = make([]DockerMachinePoolInstanceStatus, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1alpha4.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. +func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DockerMachineSpec) DeepCopyInto(out *DockerMachineSpec) { *out = *in diff --git a/test/infrastructure/docker/api/v1beta1/conversion.go b/test/infrastructure/docker/api/v1beta1/conversion.go index ec32610cc6a4..f1175f9245a1 100644 --- a/test/infrastructure/docker/api/v1beta1/conversion.go +++ b/test/infrastructure/docker/api/v1beta1/conversion.go @@ -658,3 +658,60 @@ func Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in * func Convert_v1beta2_DevMachineTemplate_To_v1beta1_DevMachineTemplate(in *infrav1.DevMachineTemplate, out *DevMachineTemplate, s apiconversion.Scope) error { return autoConvert_v1beta2_DevMachineTemplate_To_v1beta1_DevMachineTemplate(in, out, s) } + +func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + // Reset conditions from autogenerated conversions + // NOTE: v1beta1 conditions should not be automatically be converted into v1beta2 conditions. + dst.Status.Conditions = nil + if src.Status.Conditions != nil { + dst.Status.Deprecated = &infrav1.DockerMachinePoolDeprecatedStatus{} + dst.Status.Deprecated.V1Beta1 = &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{} + clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) + } + + restored := &infrav1.DockerMachinePool{} + if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { + return err + } + + dst.Status.Conditions = restored.Status.Conditions + + return nil +} + +func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachinePool) + + if err := Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil); err != nil { + return err + } + + dst.Status.Conditions = nil + if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { + clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) + } + + return utilconversion.MarshalData(src, dst) +} + +func (src *DockerMachinePoolTemplate) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachinePoolTemplate) + + return Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(src, dst, nil) +} + +func (dst *DockerMachinePoolTemplate) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachinePoolTemplate) + + return Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(src, dst, nil) +} + +func Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in, out, s) +} diff --git a/test/infrastructure/docker/api/v1beta1/conversion_test.go b/test/infrastructure/docker/api/v1beta1/conversion_test.go index 4dd3acc069f9..9080ad6c1a1c 100644 --- a/test/infrastructure/docker/api/v1beta1/conversion_test.go +++ b/test/infrastructure/docker/api/v1beta1/conversion_test.go @@ -82,6 +82,17 @@ func TestFuzzyConversion(t *testing.T) { Spoke: &DevMachineTemplate{}, FuzzerFuncs: []fuzzer.FuzzerFuncs{DevMachineTemplateFuzzFunc}, })) + + t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachinePool{}, + Spoke: &DockerMachinePool{}, + FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, + })) + + t.Run("for DockerMachinePoolTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachinePoolTemplate{}, + Spoke: &DockerMachinePoolTemplate{}, + })) } func DockerClusterFuzzFunc(_ runtimeserializer.CodecFactory) []any { @@ -247,3 +258,19 @@ func DevMachineTemplateFuzzFunc(_ runtimeserializer.CodecFactory) []any { spokeDevMachineSpec, } } + +func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { + return []any{ + hubDockerMachinePoolStatus, + } +} + +func hubDockerMachinePoolStatus(in *infrav1.DockerMachinePoolStatus, c randfill.Continue) { + c.FillNoCustom(in) + + if in.Deprecated != nil { + if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infrav1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { + in.Deprecated = nil + } + } +} diff --git a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go b/test/infrastructure/docker/api/v1beta1/dockermachinepool_types.go similarity index 97% rename from test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go rename to test/infrastructure/docker/api/v1beta1/dockermachinepool_types.go index 55da19d22153..8891b640010d 100644 --- a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go +++ b/test/infrastructure/docker/api/v1beta1/dockermachinepool_types.go @@ -20,7 +20,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" - infrav1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" ) const ( @@ -43,7 +42,7 @@ type DockerMachinePoolMachineTemplate struct { // ExtraMounts describes additional mount points for the node container // These may be used to bind a hostPath // +optional - ExtraMounts []infrav1beta1.Mount `json:"extraMounts,omitempty"` + ExtraMounts []Mount `json:"extraMounts,omitempty"` } // DockerMachinePoolSpec defines the desired state of DockerMachinePool. diff --git a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepooltemplate_types.go b/test/infrastructure/docker/api/v1beta1/dockermachinepooltemplate_types.go similarity index 100% rename from test/infrastructure/docker/exp/api/v1beta1/dockermachinepooltemplate_types.go rename to test/infrastructure/docker/api/v1beta1/dockermachinepooltemplate_types.go diff --git a/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go b/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go index 6f737c92c21a..d7c481b6b50b 100644 --- a/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go @@ -335,6 +335,101 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplate)(nil), (*v1beta2.DockerMachinePoolTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(a.(*DockerMachinePoolTemplate), b.(*v1beta2.DockerMachinePoolTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplate)(nil), (*DockerMachinePoolTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(a.(*v1beta2.DockerMachinePoolTemplate), b.(*DockerMachinePoolTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateList)(nil), (*v1beta2.DockerMachinePoolTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(a.(*DockerMachinePoolTemplateList), b.(*v1beta2.DockerMachinePoolTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateList)(nil), (*DockerMachinePoolTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(a.(*v1beta2.DockerMachinePoolTemplateList), b.(*DockerMachinePoolTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateResource)(nil), (*v1beta2.DockerMachinePoolTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(a.(*DockerMachinePoolTemplateResource), b.(*v1beta2.DockerMachinePoolTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateResource)(nil), (*DockerMachinePoolTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(a.(*v1beta2.DockerMachinePoolTemplateResource), b.(*DockerMachinePoolTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateSpec)(nil), (*v1beta2.DockerMachinePoolTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(a.(*DockerMachinePoolTemplateSpec), b.(*v1beta2.DockerMachinePoolTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateSpec)(nil), (*DockerMachinePoolTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(a.(*v1beta2.DockerMachinePoolTemplateSpec), b.(*DockerMachinePoolTemplateSpec), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*DockerMachineSpec)(nil), (*v1beta2.DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(a.(*DockerMachineSpec), b.(*v1beta2.DockerMachineSpec), scope) }); err != nil { @@ -535,6 +630,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta2.DockerMachineStatus)(nil), (*DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(a.(*v1beta2.DockerMachineStatus), b.(*DockerMachineStatus), scope) }); err != nil { @@ -1617,6 +1717,330 @@ func Convert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(in *v1beta2. return autoConvert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(in, out, s) } +func autoConvert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.InstanceName = in.InstanceName + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + out.Version = (*string)(unsafe.Pointer(in.Version)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + out.Addresses = *(*[]corev1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.InstanceName = in.InstanceName + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + out.Version = (*string)(unsafe.Pointer(in.Version)) + out.Ready = in.Ready + out.Bootstrapped = in.Bootstrapped + return nil +} + +// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + out.CustomImage = in.CustomImage + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { + return err + } + out.ProviderID = in.ProviderID + out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]v1.Condition, len(*in)) + for i := range *in { + if err := Convert_v1beta1_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.InfrastructureMachineKind = in.InfrastructureMachineKind + return nil +} + +// Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1beta1.Conditions, len(*in)) + for i := range *in { + if err := Convert_v1_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.InfrastructureMachineKind = in.InfrastructureMachineKind + // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type + return nil +} + +func autoConvert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in *DockerMachinePoolTemplate, out *v1beta2.DockerMachinePoolTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in *DockerMachinePoolTemplate, out *v1beta2.DockerMachinePoolTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in *v1beta2.DockerMachinePoolTemplate, out *DockerMachinePoolTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in *v1beta2.DockerMachinePoolTemplate, out *DockerMachinePoolTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in *DockerMachinePoolTemplateList, out *v1beta2.DockerMachinePoolTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachinePoolTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in *DockerMachinePoolTemplateList, out *v1beta2.DockerMachinePoolTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in *v1beta2.DockerMachinePoolTemplateList, out *DockerMachinePoolTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePoolTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in *v1beta2.DockerMachinePoolTemplateList, out *DockerMachinePoolTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in *DockerMachinePoolTemplateResource, out *v1beta2.DockerMachinePoolTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_ObjectMeta_To_v1beta2_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in *DockerMachinePoolTemplateResource, out *v1beta2.DockerMachinePoolTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in *v1beta2.DockerMachinePoolTemplateResource, out *DockerMachinePoolTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta2_ObjectMeta_To_v1beta1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in *v1beta2.DockerMachinePoolTemplateResource, out *DockerMachinePoolTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in, out, s) +} + +func autoConvert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in *DockerMachinePoolTemplateSpec, out *v1beta2.DockerMachinePoolTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in *DockerMachinePoolTemplateSpec, out *v1beta2.DockerMachinePoolTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in *v1beta2.DockerMachinePoolTemplateSpec, out *DockerMachinePoolTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in *v1beta2.DockerMachinePoolTemplateSpec, out *DockerMachinePoolTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in, out, s) +} + func autoConvert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { if err := v1.Convert_Pointer_string_To_string(&in.ProviderID, &out.ProviderID, s); err != nil { return err diff --git a/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go b/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go index 24179bd0edf0..173459a0e511 100644 --- a/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go +++ b/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go @@ -959,6 +959,261 @@ func (in *DockerMachineList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. +func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { + if in == nil { + return nil + } + out := new(DockerMachinePool) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePool) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]corev1beta1.MachineAddress, len(*in)) + copy(*out, *in) + } + if in.ProviderID != nil { + in, out := &in.ProviderID, &out.ProviderID + *out = new(string) + **out = **in + } + if in.Version != nil { + in, out := &in.Version, &out.Version + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. +func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolInstanceStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. +func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { + if in == nil { + return nil + } + out := new(DockerMachinePoolList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { + *out = *in + if in.PreLoadImages != nil { + in, out := &in.PreLoadImages, &out.PreLoadImages + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.ExtraMounts != nil { + in, out := &in.ExtraMounts, &out.ExtraMounts + *out = make([]Mount, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. +func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolMachineTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) + if in.ProviderIDList != nil { + in, out := &in.ProviderIDList, &out.ProviderIDList + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. +func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { + *out = *in + if in.Instances != nil { + in, out := &in.Instances, &out.Instances + *out = make([]DockerMachinePoolInstanceStatus, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1beta1.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. +func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplate) DeepCopyInto(out *DockerMachinePoolTemplate) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplate. +func (in *DockerMachinePoolTemplate) DeepCopy() *DockerMachinePoolTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolTemplate) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateList) DeepCopyInto(out *DockerMachinePoolTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePoolTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateList. +func (in *DockerMachinePoolTemplateList) DeepCopy() *DockerMachinePoolTemplateList { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolTemplateList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateResource) DeepCopyInto(out *DockerMachinePoolTemplateResource) { + *out = *in + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateResource. +func (in *DockerMachinePoolTemplateResource) DeepCopy() *DockerMachinePoolTemplateResource { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateResource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateSpec) DeepCopyInto(out *DockerMachinePoolTemplateSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateSpec. +func (in *DockerMachinePoolTemplateSpec) DeepCopy() *DockerMachinePoolTemplateSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DockerMachineSpec) DeepCopyInto(out *DockerMachineSpec) { *out = *in diff --git a/test/infrastructure/docker/api/v1beta2/conversion.go b/test/infrastructure/docker/api/v1beta2/conversion.go index e9ebe23fbbe4..39d65c9a538f 100644 --- a/test/infrastructure/docker/api/v1beta2/conversion.go +++ b/test/infrastructure/docker/api/v1beta2/conversion.go @@ -16,11 +16,13 @@ limitations under the License. package v1beta2 -func (*DockerCluster) Hub() {} -func (*DockerClusterTemplate) Hub() {} -func (*DockerMachine) Hub() {} -func (*DockerMachineTemplate) Hub() {} -func (*DevCluster) Hub() {} -func (*DevClusterTemplate) Hub() {} -func (*DevMachine) Hub() {} -func (*DevMachineTemplate) Hub() {} +func (*DockerCluster) Hub() {} +func (*DockerClusterTemplate) Hub() {} +func (*DockerMachine) Hub() {} +func (*DockerMachineTemplate) Hub() {} +func (*DevCluster) Hub() {} +func (*DevClusterTemplate) Hub() {} +func (*DevMachine) Hub() {} +func (*DevMachineTemplate) Hub() {} +func (*DockerMachinePool) Hub() {} +func (*DockerMachinePoolTemplate) Hub() {} diff --git a/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go b/test/infrastructure/docker/api/v1beta2/dockermachinepool_types.go similarity index 98% rename from test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go rename to test/infrastructure/docker/api/v1beta2/dockermachinepool_types.go index 769fcad4fcaf..b050393d6c3e 100644 --- a/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go +++ b/test/infrastructure/docker/api/v1beta2/dockermachinepool_types.go @@ -20,7 +20,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) const ( @@ -43,7 +42,7 @@ type DockerMachinePoolMachineTemplate struct { // ExtraMounts describes additional mount points for the node container // These may be used to bind a hostPath // +optional - ExtraMounts []infrav1.Mount `json:"extraMounts,omitempty"` + ExtraMounts []Mount `json:"extraMounts,omitempty"` } // DockerMachinePoolSpec defines the desired state of DockerMachinePool. diff --git a/test/infrastructure/docker/exp/api/v1beta2/dockermachinepooltemplate_types.go b/test/infrastructure/docker/api/v1beta2/dockermachinepooltemplate_types.go similarity index 100% rename from test/infrastructure/docker/exp/api/v1beta2/dockermachinepooltemplate_types.go rename to test/infrastructure/docker/api/v1beta2/dockermachinepooltemplate_types.go diff --git a/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go b/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go index efa1f01244c0..59ccae81616d 100644 --- a/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go +++ b/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go @@ -1140,6 +1140,308 @@ func (in *DockerMachineList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. +func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { + if in == nil { + return nil + } + out := new(DockerMachinePool) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePool) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolDeprecatedStatus) DeepCopyInto(out *DockerMachinePoolDeprecatedStatus) { + *out = *in + if in.V1Beta1 != nil { + in, out := &in.V1Beta1, &out.V1Beta1 + *out = new(DockerMachinePoolV1Beta1DeprecatedStatus) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolDeprecatedStatus. +func (in *DockerMachinePoolDeprecatedStatus) DeepCopy() *DockerMachinePoolDeprecatedStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolDeprecatedStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]corev1beta2.MachineAddress, len(*in)) + copy(*out, *in) + } + if in.ProviderID != nil { + in, out := &in.ProviderID, &out.ProviderID + *out = new(string) + **out = **in + } + if in.Version != nil { + in, out := &in.Version, &out.Version + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. +func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolInstanceStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePool, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. +func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { + if in == nil { + return nil + } + out := new(DockerMachinePoolList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { + *out = *in + if in.PreLoadImages != nil { + in, out := &in.PreLoadImages, &out.PreLoadImages + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.ExtraMounts != nil { + in, out := &in.ExtraMounts, &out.ExtraMounts + *out = make([]Mount, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. +func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolMachineTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) + if in.ProviderIDList != nil { + in, out := &in.ProviderIDList, &out.ProviderIDList + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. +func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]v1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Instances != nil { + in, out := &in.Instances, &out.Instances + *out = make([]DockerMachinePoolInstanceStatus, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Deprecated != nil { + in, out := &in.Deprecated, &out.Deprecated + *out = new(DockerMachinePoolDeprecatedStatus) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. +func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplate) DeepCopyInto(out *DockerMachinePoolTemplate) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplate. +func (in *DockerMachinePoolTemplate) DeepCopy() *DockerMachinePoolTemplate { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolTemplate) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateList) DeepCopyInto(out *DockerMachinePoolTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachinePoolTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateList. +func (in *DockerMachinePoolTemplateList) DeepCopy() *DockerMachinePoolTemplateList { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachinePoolTemplateList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateResource) DeepCopyInto(out *DockerMachinePoolTemplateResource) { + *out = *in + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateResource. +func (in *DockerMachinePoolTemplateResource) DeepCopy() *DockerMachinePoolTemplateResource { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateResource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolTemplateSpec) DeepCopyInto(out *DockerMachinePoolTemplateSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateSpec. +func (in *DockerMachinePoolTemplateSpec) DeepCopy() *DockerMachinePoolTemplateSpec { + if in == nil { + return nil + } + out := new(DockerMachinePoolTemplateSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachinePoolV1Beta1DeprecatedStatus) DeepCopyInto(out *DockerMachinePoolV1Beta1DeprecatedStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(corev1beta2.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolV1Beta1DeprecatedStatus. +func (in *DockerMachinePoolV1Beta1DeprecatedStatus) DeepCopy() *DockerMachinePoolV1Beta1DeprecatedStatus { + if in == nil { + return nil + } + out := new(DockerMachinePoolV1Beta1DeprecatedStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DockerMachineSpec) DeepCopyInto(out *DockerMachineSpec) { *out = *in diff --git a/test/infrastructure/docker/controllers/alias.go b/test/infrastructure/docker/controllers/alias.go index b98c933935c7..6e7d0fee93ce 100644 --- a/test/infrastructure/docker/controllers/alias.go +++ b/test/infrastructure/docker/controllers/alias.go @@ -153,3 +153,21 @@ func (r *DevMachineTemplateReconciler) SetupWithManager(ctx context.Context, mgr WatchFilterValue: r.WatchFilterValue, }).SetupWithManager(ctx, mgr, options) } + +// DockerMachinePoolReconciler reconciles a DockerMachinePool object. +type DockerMachinePoolReconciler struct { + Client client.Client + ContainerRuntime container.Runtime + + // WatchFilterValue is the label value used to filter events prior to reconciliation. + WatchFilterValue string +} + +// SetupWithManager will add watches for this controller. +func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error { + return (&dockercontrollers.DockerMachinePoolReconciler{ + Client: r.Client, + ContainerRuntime: r.ContainerRuntime, + WatchFilterValue: r.WatchFilterValue, + }).SetupWithManager(ctx, mgr, options) +} diff --git a/test/infrastructure/docker/exp/README.md b/test/infrastructure/docker/exp/README.md deleted file mode 100644 index d512970b016e..000000000000 --- a/test/infrastructure/docker/exp/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# exp - -This subrepository holds experimental code and API types. - -**Warning**: Packages here are experimental and unreliable. Some may one day be promoted to the main repository, or they may be modified arbitrarily or even disappear altogether. - -In short, code in this subrepository is not subject to any compatibility or deprecation promise. - -Experiments follow a strict lifecycle: Alpha -> Beta prior to Graduation. - -For more information on graduation criteria, see: [Contributing Guidelines](../../../../CONTRIBUTING.md#experiments) - -## Active Features - DockerMachinePool (alpha) - -## Create a new Resource -Below is an example of creating a `DockerMachinePool` resource in the experimental group. -```bash -kubebuilder create api --kind DockerMachinePool --group infrastructure --version v1alpha3 \ - --controller=true --resource=true --make=false -``` \ No newline at end of file diff --git a/test/infrastructure/docker/exp/api/.import-restrictions b/test/infrastructure/docker/exp/api/.import-restrictions deleted file mode 100644 index 20a227c51abd..000000000000 --- a/test/infrastructure/docker/exp/api/.import-restrictions +++ /dev/null @@ -1,7 +0,0 @@ -rules: - # Enforce that our APIs do not depend on CR packages. - # This is overwritten e.g. in packages that require conversion. - - selectorRegexp: sigs[.]k8s[.]io/controller-runtime - allowedPrefixes: [] - forbiddenPrefixes: - - "sigs.k8s.io/controller-runtime" diff --git a/test/infrastructure/docker/exp/api/v1alpha3/.import-restrictions b/test/infrastructure/docker/exp/api/v1alpha3/.import-restrictions deleted file mode 100644 index f6f10b3ff544..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/.import-restrictions +++ /dev/null @@ -1,5 +0,0 @@ -rules: - - selectorRegexp: sigs[.]k8s[.]io/controller-runtime - allowedPrefixes: - - "sigs.k8s.io/controller-runtime/pkg/conversion" - forbiddenPrefixes: [] diff --git a/test/infrastructure/docker/exp/api/v1alpha3/conversion.go b/test/infrastructure/docker/exp/api/v1alpha3/conversion.go deleted file mode 100644 index 2c385582417b..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/conversion.go +++ /dev/null @@ -1,78 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha3 - -import ( - apiconversion "k8s.io/apimachinery/pkg/conversion" - "sigs.k8s.io/controller-runtime/pkg/conversion" - - clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { - dst := dstRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - // Reset conditions from autogenerated conversions - // NOTE: v1beta3 conditions should not be automatically be converted into v1beta2 conditions. - dst.Status.Conditions = nil - if src.Status.Conditions != nil { - dst.Status.Deprecated = &infraexpv1.DockerMachinePoolDeprecatedStatus{} - dst.Status.Deprecated.V1Beta1 = &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{} - clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) - } - - // Manually restore data. - restored := &infraexpv1.DockerMachinePool{} - if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { - return err - } - - dst.Status.InfrastructureMachineKind = restored.Status.InfrastructureMachineKind - dst.Status.Conditions = restored.Status.Conditions - - return nil -} - -func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { - src := srcRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - // Reset conditions from autogenerated conversions - // NOTE: v1beta2 conditions should not be automatically be converted into v1alpha3 conditions. - dst.Status.Conditions = nil - if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { - clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) - } - - // Preserve Hub data on down-conversion except for metadata - return utilconversion.MarshalData(src, dst) -} - -// Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { - // NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1. - return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s) -} diff --git a/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go b/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go deleted file mode 100644 index cd47249d47df..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go +++ /dev/null @@ -1,57 +0,0 @@ -//go:build !race - -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha3 - -import ( - "reflect" - "testing" - - "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" - runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - "sigs.k8s.io/randfill" - - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -// Test is disabled when the race detector is enabled (via "//go:build !race" above) because otherwise the fuzz tests would just time out. - -func TestFuzzyConversion(t *testing.T) { - t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ - Hub: &infraexpv1.DockerMachinePool{}, - Spoke: &DockerMachinePool{}, - FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, - })) -} - -func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { - return []any{ - hubDockerMachinePoolStatus, - } -} - -func hubDockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, c randfill.Continue) { - c.FillNoCustom(in) - - if in.Deprecated != nil { - if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { - in.Deprecated = nil - } - } -} diff --git a/test/infrastructure/docker/exp/api/v1alpha3/doc.go b/test/infrastructure/docker/exp/api/v1alpha3/doc.go deleted file mode 100644 index 7ecebad8ad7f..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/doc.go +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1alpha3 contains the v1alpha3 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 -// -// Deprecated: This package will be removed in one of the next releases. -package v1alpha3 diff --git a/test/infrastructure/docker/exp/api/v1alpha3/groupversion_info.go b/test/infrastructure/docker/exp/api/v1alpha3/groupversion_info.go deleted file mode 100644 index 26f17f0bf104..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/groupversion_info.go +++ /dev/null @@ -1,48 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1alpha3 contains API Schema definitions for the infrastructure v1alpha3 API group -// +kubebuilder:object:generate=true -// +groupName=infrastructure.cluster.x-k8s.io -package v1alpha3 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -var ( - // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha3"} - - // SchemeBuilder is used to add go types to the GroupVersionKind scheme. - schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - - // AddToScheme adds the types in this group-version to the given scheme. - AddToScheme = schemeBuilder.AddToScheme - - objectTypes = []runtime.Object{} - - // localSchemeBuilder is used for type conversions. - localSchemeBuilder = schemeBuilder -) - -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(GroupVersion, objectTypes...) - metav1.AddToGroupVersion(scheme, GroupVersion) - 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 deleted file mode 100644 index 83a4fbd2dc48..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go +++ /dev/null @@ -1,306 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by conversion-gen. DO NOT EDIT. - -package v1alpha3 - -import ( - unsafe "unsafe" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" - corev1beta2 "sigs.k8s.io/cluster-api/api/core/v1beta2" - corev1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3" - apiv1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" - apiv1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - return nil -} - -func autoConvert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceName = in.InstanceName - out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.Version = (*string)(unsafe.Pointer(in.Version)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - 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)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta2.DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1alpha3.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.Condition, len(*in)) - for i := range *in { - if err := apiv1alpha3.Convert_v1alpha3_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil -} - -// Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - if err := apiv1alpha3.Convert_v1_Condition_To_v1alpha3_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type - // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type - return nil -} diff --git a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.deepcopy.go deleted file mode 100644 index 2915903d65c2..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.deepcopy.go +++ /dev/null @@ -1,191 +0,0 @@ -//go:build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by controller-gen. DO NOT EDIT. - -package v1alpha3 - -import ( - "k8s.io/apimachinery/pkg/runtime" - corev1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3" - apiv1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. -func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { - if in == nil { - return nil - } - out := new(DockerMachinePool) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePool) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { - *out = *in - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha3.MachineAddress, len(*in)) - copy(*out, *in) - } - if in.ProviderID != nil { - in, out := &in.ProviderID, &out.ProviderID - *out = new(string) - **out = **in - } - if in.Version != nil { - in, out := &in.Version, &out.Version - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. -func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolInstanceStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. -func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { - if in == nil { - return nil - } - out := new(DockerMachinePoolList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { - *out = *in - if in.PreLoadImages != nil { - in, out := &in.PreLoadImages, &out.PreLoadImages - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.ExtraMounts != nil { - in, out := &in.ExtraMounts, &out.ExtraMounts - *out = make([]apiv1alpha3.Mount, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. -func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolMachineTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) - if in.ProviderIDList != nil { - in, out := &in.ProviderIDList, &out.ProviderIDList - *out = make([]string, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. -func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { - *out = *in - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha3.Conditions, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. -func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolStatus) - in.DeepCopyInto(out) - return out -} diff --git a/test/infrastructure/docker/exp/api/v1alpha4/.import-restrictions b/test/infrastructure/docker/exp/api/v1alpha4/.import-restrictions deleted file mode 100644 index f6f10b3ff544..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/.import-restrictions +++ /dev/null @@ -1,5 +0,0 @@ -rules: - - selectorRegexp: sigs[.]k8s[.]io/controller-runtime - allowedPrefixes: - - "sigs.k8s.io/controller-runtime/pkg/conversion" - forbiddenPrefixes: [] diff --git a/test/infrastructure/docker/exp/api/v1alpha4/conversion.go b/test/infrastructure/docker/exp/api/v1alpha4/conversion.go deleted file mode 100644 index d99a2a261aa9..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/conversion.go +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha4 - -import ( - apiconversion "k8s.io/apimachinery/pkg/conversion" - "sigs.k8s.io/controller-runtime/pkg/conversion" - - clusterv1alpha4 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha4" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { - dst := dstRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - // Reset conditions from autogenerated conversions - // NOTE: v1beta4 conditions should not be automatically be converted into v1beta2 conditions. - dst.Status.Conditions = nil - if src.Status.Conditions != nil { - dst.Status.Deprecated = &infraexpv1.DockerMachinePoolDeprecatedStatus{} - dst.Status.Deprecated.V1Beta1 = &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{} - clusterv1alpha4.Convert_v1alpha4_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) - } - - // Manually restore data. - restored := &infraexpv1.DockerMachinePool{} - if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { - return err - } - - dst.Status.InfrastructureMachineKind = restored.Status.InfrastructureMachineKind - dst.Status.Conditions = restored.Status.Conditions - - return nil -} - -func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { - src := srcRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - // Reset conditions from autogenerated conversions - // NOTE: v1beta2 conditions should not be automatically be converted into v1alpha4 conditions. - dst.Status.Conditions = nil - if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { - clusterv1alpha4.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha4_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) - } - - // Preserve Hub data on down-conversion except for metadata - return utilconversion.MarshalData(src, dst) -} - -func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { - // NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1. - return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s) -} diff --git a/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go b/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go deleted file mode 100644 index 4a9c5866bb86..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go +++ /dev/null @@ -1,57 +0,0 @@ -//go:build !race - -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha4 - -import ( - "reflect" - "testing" - - "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" - runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - "sigs.k8s.io/randfill" - - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -// Test is disabled when the race detector is enabled (via "//go:build !race" above) because otherwise the fuzz tests would just time out. - -func TestFuzzyConversion(t *testing.T) { - t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ - Hub: &infraexpv1.DockerMachinePool{}, - Spoke: &DockerMachinePool{}, - FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, - })) -} - -func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { - return []any{ - hubDockerMachinePoolStatus, - } -} - -func hubDockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, c randfill.Continue) { - c.FillNoCustom(in) - - if in.Deprecated != nil { - if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { - in.Deprecated = nil - } - } -} diff --git a/test/infrastructure/docker/exp/api/v1alpha4/doc.go b/test/infrastructure/docker/exp/api/v1alpha4/doc.go deleted file mode 100644 index f33f54fb7e43..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/doc.go +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1alpha4 contains the v1alpha4 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 -// -// Deprecated: This package will be removed in one of the next releases. -package v1alpha4 diff --git a/test/infrastructure/docker/exp/api/v1alpha4/groupversion_info.go b/test/infrastructure/docker/exp/api/v1alpha4/groupversion_info.go deleted file mode 100644 index 068abb9aae54..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/groupversion_info.go +++ /dev/null @@ -1,48 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1alpha4 contains API Schema definitions for the infrastructure v1alpha4 API group -// +kubebuilder:object:generate=true -// +groupName=infrastructure.cluster.x-k8s.io -package v1alpha4 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -var ( - // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha4"} - - // SchemeBuilder is used to add go types to the GroupVersionKind scheme. - schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - - // AddToScheme adds the types in this group-version to the given scheme. - AddToScheme = schemeBuilder.AddToScheme - - objectTypes = []runtime.Object{} - - // localSchemeBuilder is used for type conversions. - localSchemeBuilder = schemeBuilder -) - -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(GroupVersion, objectTypes...) - metav1.AddToGroupVersion(scheme, GroupVersion) - 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 deleted file mode 100644 index 2f6bc3071198..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go +++ /dev/null @@ -1,306 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by conversion-gen. DO NOT EDIT. - -package v1alpha4 - -import ( - unsafe "unsafe" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" - corev1beta2 "sigs.k8s.io/cluster-api/api/core/v1beta2" - corev1alpha4 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha4" - apiv1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" - apiv1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - return nil -} - -func autoConvert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceName = in.InstanceName - out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.Version = (*string)(unsafe.Pointer(in.Version)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - 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)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta2.DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1alpha4.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.Condition, len(*in)) - for i := range *in { - if err := apiv1alpha4.Convert_v1alpha4_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil -} - -// Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - if err := apiv1alpha4.Convert_v1_Condition_To_v1alpha4_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - // WARNING: in.InfrastructureMachineKind requires manual conversion: does not exist in peer-type - // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type - return nil -} diff --git a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.deepcopy.go deleted file mode 100644 index 636e22b0a36d..000000000000 --- a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.deepcopy.go +++ /dev/null @@ -1,191 +0,0 @@ -//go:build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by controller-gen. DO NOT EDIT. - -package v1alpha4 - -import ( - "k8s.io/apimachinery/pkg/runtime" - corev1alpha4 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha4" - apiv1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. -func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { - if in == nil { - return nil - } - out := new(DockerMachinePool) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePool) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { - *out = *in - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1alpha4.MachineAddress, len(*in)) - copy(*out, *in) - } - if in.ProviderID != nil { - in, out := &in.ProviderID, &out.ProviderID - *out = new(string) - **out = **in - } - if in.Version != nil { - in, out := &in.Version, &out.Version - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. -func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolInstanceStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. -func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { - if in == nil { - return nil - } - out := new(DockerMachinePoolList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { - *out = *in - if in.PreLoadImages != nil { - in, out := &in.PreLoadImages, &out.PreLoadImages - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.ExtraMounts != nil { - in, out := &in.ExtraMounts, &out.ExtraMounts - *out = make([]apiv1alpha4.Mount, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. -func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolMachineTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) - if in.ProviderIDList != nil { - in, out := &in.ProviderIDList, &out.ProviderIDList - *out = make([]string, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. -func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { - *out = *in - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1alpha4.Conditions, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. -func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolStatus) - in.DeepCopyInto(out) - return out -} diff --git a/test/infrastructure/docker/exp/api/v1beta1/.import-restrictions b/test/infrastructure/docker/exp/api/v1beta1/.import-restrictions deleted file mode 100644 index f6f10b3ff544..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/.import-restrictions +++ /dev/null @@ -1,5 +0,0 @@ -rules: - - selectorRegexp: sigs[.]k8s[.]io/controller-runtime - allowedPrefixes: - - "sigs.k8s.io/controller-runtime/pkg/conversion" - forbiddenPrefixes: [] diff --git a/test/infrastructure/docker/exp/api/v1beta1/conversion.go b/test/infrastructure/docker/exp/api/v1beta1/conversion.go deleted file mode 100644 index ed417aad7a66..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/conversion.go +++ /dev/null @@ -1,83 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -import ( - apiconversion "k8s.io/apimachinery/pkg/conversion" - "sigs.k8s.io/controller-runtime/pkg/conversion" - - clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { - dst := dstRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - // Reset conditions from autogenerated conversions - // NOTE: v1beta1 conditions should not be automatically be converted into v1beta2 conditions. - dst.Status.Conditions = nil - if src.Status.Conditions != nil { - dst.Status.Deprecated = &infraexpv1.DockerMachinePoolDeprecatedStatus{} - dst.Status.Deprecated.V1Beta1 = &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{} - clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&src.Status.Conditions, &dst.Status.Deprecated.V1Beta1.Conditions) - } - - restored := &infraexpv1.DockerMachinePool{} - if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { - return err - } - - dst.Status.Conditions = restored.Status.Conditions - - return nil -} - -func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { - src := srcRaw.(*infraexpv1.DockerMachinePool) - - if err := Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil); err != nil { - return err - } - - dst.Status.Conditions = nil - if src.Status.Deprecated != nil && src.Status.Deprecated.V1Beta1 != nil && src.Status.Deprecated.V1Beta1.Conditions != nil { - clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&src.Status.Deprecated.V1Beta1.Conditions, &dst.Status.Conditions) - } - - return utilconversion.MarshalData(src, dst) -} - -func (src *DockerMachinePoolTemplate) ConvertTo(dstRaw conversion.Hub) error { - dst := dstRaw.(*infraexpv1.DockerMachinePoolTemplate) - - return Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(src, dst, nil) -} - -func (dst *DockerMachinePoolTemplate) ConvertFrom(srcRaw conversion.Hub) error { - src := srcRaw.(*infraexpv1.DockerMachinePoolTemplate) - - return Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(src, dst, nil) -} - -func Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in, out, s) -} diff --git a/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go b/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go deleted file mode 100644 index 79ceefc0e256..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go +++ /dev/null @@ -1,62 +0,0 @@ -//go:build !race - -/* -Copyright 2025 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -import ( - "reflect" - "testing" - - "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" - runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - "sigs.k8s.io/randfill" - - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - utilconversion "sigs.k8s.io/cluster-api/util/conversion" -) - -// Test is disabled when the race detector is enabled (via "//go:build !race" above) because otherwise the fuzz tests would just time out. - -func TestFuzzyConversion(t *testing.T) { - t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ - Hub: &infraexpv1.DockerMachinePool{}, - Spoke: &DockerMachinePool{}, - FuzzerFuncs: []fuzzer.FuzzerFuncs{DockerMachinePoolFuzzFunc}, - })) - - t.Run("for DockerMachinePoolTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ - Hub: &infraexpv1.DockerMachinePoolTemplate{}, - Spoke: &DockerMachinePoolTemplate{}, - })) -} - -func DockerMachinePoolFuzzFunc(_ runtimeserializer.CodecFactory) []any { - return []any{ - hubDockerMachinePoolStatus, - } -} - -func hubDockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, c randfill.Continue) { - c.FillNoCustom(in) - - if in.Deprecated != nil { - if in.Deprecated.V1Beta1 == nil || reflect.DeepEqual(in.Deprecated.V1Beta1, &infraexpv1.DockerMachinePoolV1Beta1DeprecatedStatus{}) { - in.Deprecated = nil - } - } -} diff --git a/test/infrastructure/docker/exp/api/v1beta1/doc.go b/test/infrastructure/docker/exp/api/v1beta1/doc.go deleted file mode 100644 index ee9ee7f193fe..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/doc.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2025 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1beta1 contains API Schema definitions for the infrastructure v1beta1 API group -// +kubebuilder:object:generate=true -// +groupName=infrastructure.cluster.x-k8s.io -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 -// -// Deprecated: This package will be removed in one of the next releases. -package v1beta1 diff --git a/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go deleted file mode 100644 index b7592ae31d9a..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -var ( - // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"} - - // schemeBuilder is used to add go types to the GroupVersionKind scheme. - schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - - // AddToScheme adds the types in this group-version to the given scheme. - AddToScheme = schemeBuilder.AddToScheme - - objectTypes = []runtime.Object{} - - // localSchemeBuilder is used for type conversions. - localSchemeBuilder = schemeBuilder -) - -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(GroupVersion, objectTypes...) - metav1.AddToGroupVersion(scheme, GroupVersion) - return nil -} diff --git a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go deleted file mode 100644 index a931dfc50389..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go +++ /dev/null @@ -1,469 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by conversion-gen. DO NOT EDIT. - -package v1beta1 - -import ( - unsafe "unsafe" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" - corev1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" - corev1beta2 "sigs.k8s.io/cluster-api/api/core/v1beta2" - apiv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - apiv1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*DockerMachinePool)(nil), (*v1beta2.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta2.DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(a.(*v1beta2.DockerMachinePool), b.(*DockerMachinePool), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolInstanceStatus)(nil), (*v1beta2.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta2.DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(a.(*v1beta2.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolList)(nil), (*v1beta2.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta2.DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(a.(*v1beta2.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolMachineTemplate)(nil), (*v1beta2.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta2.DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(a.(*v1beta2.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolSpec)(nil), (*v1beta2.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta2.DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(a.(*v1beta2.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolStatus)(nil), (*v1beta2.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta2.DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplate)(nil), (*v1beta2.DockerMachinePoolTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(a.(*DockerMachinePoolTemplate), b.(*v1beta2.DockerMachinePoolTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplate)(nil), (*DockerMachinePoolTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(a.(*v1beta2.DockerMachinePoolTemplate), b.(*DockerMachinePoolTemplate), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateList)(nil), (*v1beta2.DockerMachinePoolTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(a.(*DockerMachinePoolTemplateList), b.(*v1beta2.DockerMachinePoolTemplateList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateList)(nil), (*DockerMachinePoolTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(a.(*v1beta2.DockerMachinePoolTemplateList), b.(*DockerMachinePoolTemplateList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateResource)(nil), (*v1beta2.DockerMachinePoolTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(a.(*DockerMachinePoolTemplateResource), b.(*v1beta2.DockerMachinePoolTemplateResource), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateResource)(nil), (*DockerMachinePoolTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(a.(*v1beta2.DockerMachinePoolTemplateResource), b.(*DockerMachinePoolTemplateResource), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*DockerMachinePoolTemplateSpec)(nil), (*v1beta2.DockerMachinePoolTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(a.(*DockerMachinePoolTemplateSpec), b.(*v1beta2.DockerMachinePoolTemplateSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachinePoolTemplateSpec)(nil), (*DockerMachinePoolTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(a.(*v1beta2.DockerMachinePoolTemplateSpec), b.(*DockerMachinePoolTemplateSpec), scope) - }); err != nil { - return err - } - if err := s.AddConversionFunc((*v1beta2.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(a.(*v1beta2.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) - }); err != nil { - return err - } - return nil -} - -func autoConvert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in *DockerMachinePool, out *v1beta2.DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - out.Addresses = *(*[]corev1beta2.MachineAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceName = in.InstanceName - out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.Version = (*string)(unsafe.Pointer(in.Version)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - out.Addresses = *(*[]corev1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceName = in.InstanceName - out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.Version = (*string)(unsafe.Pointer(in.Version)) - out.Ready = in.Ready - out.Bootstrapped = in.Bootstrapped - return nil -} - -// Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta2.DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta2.DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - if err := Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *v1beta2.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta2.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - out.CustomImage = in.CustomImage - out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]apiv1beta1.Mount)(unsafe.Pointer(&in.ExtraMounts)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *v1beta2.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1beta2_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta2.DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta2_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { - return err - } - out.ProviderID = in.ProviderID - out.ProviderIDList = *(*[]string)(unsafe.Pointer(&in.ProviderIDList)) - return nil -} - -// Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *v1beta2.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]v1beta2.DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.Condition, len(*in)) - for i := range *in { - if err := apiv1beta1.Convert_v1beta1_Condition_To_v1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.InfrastructureMachineKind = in.InfrastructureMachineKind - return nil -} - -// Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta2.DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1beta1.Conditions, len(*in)) - for i := range *in { - if err := apiv1beta1.Convert_v1_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Ready = in.Ready - out.Replicas = in.Replicas - out.ObservedGeneration = in.ObservedGeneration - out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) - out.InfrastructureMachineKind = in.InfrastructureMachineKind - // WARNING: in.Deprecated requires manual conversion: does not exist in peer-type - return nil -} - -func autoConvert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in *DockerMachinePoolTemplate, out *v1beta2.DockerMachinePoolTemplate, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in *DockerMachinePoolTemplate, out *v1beta2.DockerMachinePoolTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in *v1beta2.DockerMachinePoolTemplate, out *DockerMachinePoolTemplate, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in *v1beta2.DockerMachinePoolTemplate, out *DockerMachinePoolTemplate, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in *DockerMachinePoolTemplateList, out *v1beta2.DockerMachinePoolTemplateList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]v1beta2.DockerMachinePoolTemplate, len(*in)) - for i := range *in { - if err := Convert_v1beta1_DockerMachinePoolTemplate_To_v1beta2_DockerMachinePoolTemplate(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in *DockerMachinePoolTemplateList, out *v1beta2.DockerMachinePoolTemplateList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolTemplateList_To_v1beta2_DockerMachinePoolTemplateList(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in *v1beta2.DockerMachinePoolTemplateList, out *DockerMachinePoolTemplateList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePoolTemplate, len(*in)) - for i := range *in { - if err := Convert_v1beta2_DockerMachinePoolTemplate_To_v1beta1_DockerMachinePoolTemplate(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in *v1beta2.DockerMachinePoolTemplateList, out *DockerMachinePoolTemplateList, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolTemplateList_To_v1beta1_DockerMachinePoolTemplateList(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in *DockerMachinePoolTemplateResource, out *v1beta2.DockerMachinePoolTemplateResource, s conversion.Scope) error { - if err := apiv1beta1.Convert_v1beta1_ObjectMeta_To_v1beta2_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in *DockerMachinePoolTemplateResource, out *v1beta2.DockerMachinePoolTemplateResource, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in *v1beta2.DockerMachinePoolTemplateResource, out *DockerMachinePoolTemplateResource, s conversion.Scope) error { - if err := apiv1beta1.Convert_v1beta2_ObjectMeta_To_v1beta1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in *v1beta2.DockerMachinePoolTemplateResource, out *DockerMachinePoolTemplateResource, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(in, out, s) -} - -func autoConvert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in *DockerMachinePoolTemplateSpec, out *v1beta2.DockerMachinePoolTemplateSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachinePoolTemplateResource_To_v1beta2_DockerMachinePoolTemplateResource(&in.Template, &out.Template, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in *DockerMachinePoolTemplateSpec, out *v1beta2.DockerMachinePoolTemplateSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolTemplateSpec_To_v1beta2_DockerMachinePoolTemplateSpec(in, out, s) -} - -func autoConvert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in *v1beta2.DockerMachinePoolTemplateSpec, out *DockerMachinePoolTemplateSpec, s conversion.Scope) error { - if err := Convert_v1beta2_DockerMachinePoolTemplateResource_To_v1beta1_DockerMachinePoolTemplateResource(&in.Template, &out.Template, s); err != nil { - return err - } - return nil -} - -// Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec is an autogenerated conversion function. -func Convert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in *v1beta2.DockerMachinePoolTemplateSpec, out *DockerMachinePoolTemplateSpec, s conversion.Scope) error { - return autoConvert_v1beta2_DockerMachinePoolTemplateSpec_To_v1beta1_DockerMachinePoolTemplateSpec(in, out, s) -} diff --git a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 339907bbf31e..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,282 +0,0 @@ -//go:build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by controller-gen. DO NOT EDIT. - -package v1beta1 - -import ( - "k8s.io/apimachinery/pkg/runtime" - corev1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" - apiv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. -func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { - if in == nil { - return nil - } - out := new(DockerMachinePool) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePool) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { - *out = *in - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1beta1.MachineAddress, len(*in)) - copy(*out, *in) - } - if in.ProviderID != nil { - in, out := &in.ProviderID, &out.ProviderID - *out = new(string) - **out = **in - } - if in.Version != nil { - in, out := &in.Version, &out.Version - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. -func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolInstanceStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. -func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { - if in == nil { - return nil - } - out := new(DockerMachinePoolList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { - *out = *in - if in.PreLoadImages != nil { - in, out := &in.PreLoadImages, &out.PreLoadImages - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.ExtraMounts != nil { - in, out := &in.ExtraMounts, &out.ExtraMounts - *out = make([]apiv1beta1.Mount, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. -func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolMachineTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) - if in.ProviderIDList != nil { - in, out := &in.ProviderIDList, &out.ProviderIDList - *out = make([]string, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. -func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { - *out = *in - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1beta1.Conditions, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. -func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplate) DeepCopyInto(out *DockerMachinePoolTemplate) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplate. -func (in *DockerMachinePoolTemplate) DeepCopy() *DockerMachinePoolTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolTemplate) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateList) DeepCopyInto(out *DockerMachinePoolTemplateList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePoolTemplate, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateList. -func (in *DockerMachinePoolTemplateList) DeepCopy() *DockerMachinePoolTemplateList { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolTemplateList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateResource) DeepCopyInto(out *DockerMachinePoolTemplateResource) { - *out = *in - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateResource. -func (in *DockerMachinePoolTemplateResource) DeepCopy() *DockerMachinePoolTemplateResource { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateResource) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateSpec) DeepCopyInto(out *DockerMachinePoolTemplateSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateSpec. -func (in *DockerMachinePoolTemplateSpec) DeepCopy() *DockerMachinePoolTemplateSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateSpec) - in.DeepCopyInto(out) - return out -} diff --git a/test/infrastructure/docker/exp/api/v1beta2/conversion.go b/test/infrastructure/docker/exp/api/v1beta2/conversion.go deleted file mode 100644 index 10ca38c21724..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta2/conversion.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2025 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta2 - -func (*DockerMachinePool) Hub() {} -func (*DockerMachinePoolTemplate) Hub() {} diff --git a/test/infrastructure/docker/exp/api/v1beta2/doc.go b/test/infrastructure/docker/exp/api/v1beta2/doc.go deleted file mode 100644 index 8b1f7f39744d..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta2/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2025 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group -// +kubebuilder:object:generate=true -// +groupName=infrastructure.cluster.x-k8s.io -package v1beta2 diff --git a/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go b/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go deleted file mode 100644 index fde742dec471..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2025 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta2 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -var ( - // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta2"} - - // schemeBuilder is used to add go types to the GroupVersionKind scheme. - schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - - // AddToScheme adds the types in this group-version to the given scheme. - AddToScheme = schemeBuilder.AddToScheme - - objectTypes = []runtime.Object{} -) - -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(GroupVersion, objectTypes...) - metav1.AddToGroupVersion(scheme, GroupVersion) - return nil -} diff --git a/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go deleted file mode 100644 index 9ed05233f795..000000000000 --- a/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go +++ /dev/null @@ -1,330 +0,0 @@ -//go:build !ignore_autogenerated - -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by controller-gen. DO NOT EDIT. - -package v1beta2 - -import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - corev1beta2 "sigs.k8s.io/cluster-api/api/core/v1beta2" - apiv1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePool) DeepCopyInto(out *DockerMachinePool) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePool. -func (in *DockerMachinePool) DeepCopy() *DockerMachinePool { - if in == nil { - return nil - } - out := new(DockerMachinePool) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePool) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolDeprecatedStatus) DeepCopyInto(out *DockerMachinePoolDeprecatedStatus) { - *out = *in - if in.V1Beta1 != nil { - in, out := &in.V1Beta1, &out.V1Beta1 - *out = new(DockerMachinePoolV1Beta1DeprecatedStatus) - (*in).DeepCopyInto(*out) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolDeprecatedStatus. -func (in *DockerMachinePoolDeprecatedStatus) DeepCopy() *DockerMachinePoolDeprecatedStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolDeprecatedStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { - *out = *in - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]corev1beta2.MachineAddress, len(*in)) - copy(*out, *in) - } - if in.ProviderID != nil { - in, out := &in.ProviderID, &out.ProviderID - *out = new(string) - **out = **in - } - if in.Version != nil { - in, out := &in.Version, &out.Version - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolInstanceStatus. -func (in *DockerMachinePoolInstanceStatus) DeepCopy() *DockerMachinePoolInstanceStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolInstanceStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolList) DeepCopyInto(out *DockerMachinePoolList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePool, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolList. -func (in *DockerMachinePoolList) DeepCopy() *DockerMachinePoolList { - if in == nil { - return nil - } - out := new(DockerMachinePoolList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolMachineTemplate) DeepCopyInto(out *DockerMachinePoolMachineTemplate) { - *out = *in - if in.PreLoadImages != nil { - in, out := &in.PreLoadImages, &out.PreLoadImages - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.ExtraMounts != nil { - in, out := &in.ExtraMounts, &out.ExtraMounts - *out = make([]apiv1beta2.Mount, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolMachineTemplate. -func (in *DockerMachinePoolMachineTemplate) DeepCopy() *DockerMachinePoolMachineTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolMachineTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolSpec) DeepCopyInto(out *DockerMachinePoolSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) - if in.ProviderIDList != nil { - in, out := &in.ProviderIDList, &out.ProviderIDList - *out = make([]string, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolSpec. -func (in *DockerMachinePoolSpec) DeepCopy() *DockerMachinePoolSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolStatus) DeepCopyInto(out *DockerMachinePoolStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Instances != nil { - in, out := &in.Instances, &out.Instances - *out = make([]DockerMachinePoolInstanceStatus, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Deprecated != nil { - in, out := &in.Deprecated, &out.Deprecated - *out = new(DockerMachinePoolDeprecatedStatus) - (*in).DeepCopyInto(*out) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolStatus. -func (in *DockerMachinePoolStatus) DeepCopy() *DockerMachinePoolStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplate) DeepCopyInto(out *DockerMachinePoolTemplate) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplate. -func (in *DockerMachinePoolTemplate) DeepCopy() *DockerMachinePoolTemplate { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolTemplate) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateList) DeepCopyInto(out *DockerMachinePoolTemplateList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DockerMachinePoolTemplate, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateList. -func (in *DockerMachinePoolTemplateList) DeepCopy() *DockerMachinePoolTemplateList { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *DockerMachinePoolTemplateList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateResource) DeepCopyInto(out *DockerMachinePoolTemplateResource) { - *out = *in - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateResource. -func (in *DockerMachinePoolTemplateResource) DeepCopy() *DockerMachinePoolTemplateResource { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateResource) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolTemplateSpec) DeepCopyInto(out *DockerMachinePoolTemplateSpec) { - *out = *in - in.Template.DeepCopyInto(&out.Template) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolTemplateSpec. -func (in *DockerMachinePoolTemplateSpec) DeepCopy() *DockerMachinePoolTemplateSpec { - if in == nil { - return nil - } - out := new(DockerMachinePoolTemplateSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerMachinePoolV1Beta1DeprecatedStatus) DeepCopyInto(out *DockerMachinePoolV1Beta1DeprecatedStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make(corev1beta2.Conditions, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachinePoolV1Beta1DeprecatedStatus. -func (in *DockerMachinePoolV1Beta1DeprecatedStatus) DeepCopy() *DockerMachinePoolV1Beta1DeprecatedStatus { - if in == nil { - return nil - } - out := new(DockerMachinePoolV1Beta1DeprecatedStatus) - in.DeepCopyInto(out) - return out -} diff --git a/test/infrastructure/docker/exp/controllers/alias.go b/test/infrastructure/docker/exp/controllers/alias.go deleted file mode 100644 index adf1beac6676..000000000000 --- a/test/infrastructure/docker/exp/controllers/alias.go +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2021 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package controllers implements controller functionality. -package controllers - -import ( - "context" - - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - - "sigs.k8s.io/cluster-api/test/infrastructure/container" - dockermachinepoolcontrollers "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/internal/controllers" -) - -// DockerMachinePoolReconciler reconciles a DockerMachinePool object. -type DockerMachinePoolReconciler struct { - Client client.Client - ContainerRuntime container.Runtime - - // WatchFilterValue is the label value used to filter events prior to reconciliation. - WatchFilterValue string -} - -// SetupWithManager will add watches for this controller. -func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error { - return (&dockermachinepoolcontrollers.DockerMachinePoolReconciler{ - Client: r.Client, - ContainerRuntime: r.ContainerRuntime, - WatchFilterValue: r.WatchFilterValue, - }).SetupWithManager(ctx, mgr, options) -} diff --git a/test/infrastructure/docker/exp/controllers/exp.go b/test/infrastructure/docker/exp/controllers/exp.go deleted file mode 100644 index 3b48ff6458e4..000000000000 --- a/test/infrastructure/docker/exp/controllers/exp.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package controllers - -// This file adds RBAC permissions to the Docker Infrastructure manager to operate on objects in the experimental API group. - -// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=dockermachinepools,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=dockermachinepools/status;dockermachinepools/finalizers,verbs=get;list;watch;patch;update -// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machinepools;machinepools/status,verbs=get;list;watch diff --git a/test/infrastructure/docker/exp/internal/webhooks/doc.go b/test/infrastructure/docker/exp/internal/webhooks/doc.go deleted file mode 100644 index 7732f4d31b5f..000000000000 --- a/test/infrastructure/docker/exp/internal/webhooks/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package webhooks implements docker infrastructure exp webhooks. -package webhooks diff --git a/test/infrastructure/docker/exp/webhooks/alias.go b/test/infrastructure/docker/exp/webhooks/alias.go deleted file mode 100644 index 88f6e9ad980c..000000000000 --- a/test/infrastructure/docker/exp/webhooks/alias.go +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2023 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package webhooks - -import ( - ctrl "sigs.k8s.io/controller-runtime" - - "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/internal/webhooks" -) - -// DockerMachinePool implements a validating and defaulting webhook for DockerMachinePool. -type DockerMachinePool struct{} - -// SetupWebhookWithManager sets up DockerMachinePool webhooks. -func (webhook *DockerMachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error { - return (&webhooks.DockerMachinePool{}).SetupWebhookWithManager(mgr) -} diff --git a/test/infrastructure/docker/exp/webhooks/doc.go b/test/infrastructure/docker/exp/webhooks/doc.go deleted file mode 100644 index a24820761de0..000000000000 --- a/test/infrastructure/docker/exp/webhooks/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package webhooks contains docker infrastructure experimental webhook implementations for some of our API types. -package webhooks diff --git a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go b/test/infrastructure/docker/internal/controllers/dockermachinepool_controller.go similarity index 94% rename from test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go rename to test/infrastructure/docker/internal/controllers/dockermachinepool_controller.go index 735e7e0a5011..529048706eaf 100644 --- a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go +++ b/test/infrastructure/docker/internal/controllers/dockermachinepool_controller.go @@ -42,7 +42,6 @@ import ( "sigs.k8s.io/cluster-api/internal/util/ssa" "sigs.k8s.io/cluster-api/test/infrastructure/container" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker" "sigs.k8s.io/cluster-api/util" v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1" @@ -81,7 +80,7 @@ func (r *DockerMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Re ctx = container.RuntimeInto(ctx, r.ContainerRuntime) // Fetch the DockerMachinePool instance. - dockerMachinePool := &infraexpv1.DockerMachinePool{} + dockerMachinePool := &infrav1.DockerMachinePool{} if err := r.Client.Get(ctx, req.NamespacedName, dockerMachinePool); err != nil { if apierrors.IsNotFound(err) { return ctrl.Result{}, nil @@ -141,7 +140,7 @@ func (r *DockerMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Re // Add finalizer and the InfrastructureMachineKind if they aren't already present, and requeue if either were added. // We want to add the finalizer here to avoid the race condition between init and delete. // Note: Finalizers in general can only be added when the deletionTimestamp is not set. - needsPatch := controllerutil.AddFinalizer(dockerMachinePool, infraexpv1.MachinePoolFinalizer) + needsPatch := controllerutil.AddFinalizer(dockerMachinePool, infrav1.MachinePoolFinalizer) needsPatch = setInfrastructureMachineKind(dockerMachinePool) || needsPatch if needsPatch { return ctrl.Result{}, nil @@ -158,19 +157,19 @@ func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr } predicateLog := ctrl.LoggerFrom(ctx).WithValues("controller", "dockermachinepool") - clusterToDockerMachinePools, err := util.ClusterToTypedObjectsMapper(mgr.GetClient(), &infraexpv1.DockerMachinePoolList{}, mgr.GetScheme()) + clusterToDockerMachinePools, err := util.ClusterToTypedObjectsMapper(mgr.GetClient(), &infrav1.DockerMachinePoolList{}, mgr.GetScheme()) if err != nil { return err } c, err := ctrl.NewControllerManagedBy(mgr). - For(&infraexpv1.DockerMachinePool{}). + For(&infrav1.DockerMachinePool{}). WithOptions(options). WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)). Watches( &clusterv1.MachinePool{}, handler.EnqueueRequestsFromMapFunc(util.MachinePoolToInfrastructureMapFunc(ctx, - infraexpv1.GroupVersion.WithKind("DockerMachinePool"))), + infrav1.GroupVersion.WithKind("DockerMachinePool"))), builder.WithPredicates(predicates.ResourceIsChanged(mgr.GetScheme(), predicateLog)), ). Watches( @@ -203,7 +202,7 @@ func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr return nil } -func (r *DockerMachinePoolReconciler) reconcileDelete(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) error { +func (r *DockerMachinePoolReconciler) reconcileDelete(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) error { log := ctrl.LoggerFrom(ctx) dockerMachineList, err := getDockerMachines(ctx, r.Client, *cluster, *machinePool, *dockerMachinePool) @@ -254,12 +253,12 @@ func (r *DockerMachinePoolReconciler) reconcileDelete(ctx context.Context, clust } // Once all DockerMachines and Docker containers are deleted, remove the finalizer. - controllerutil.RemoveFinalizer(dockerMachinePool, infraexpv1.MachinePoolFinalizer) + controllerutil.RemoveFinalizer(dockerMachinePool, infrav1.MachinePoolFinalizer) return nil } -func (r *DockerMachinePoolReconciler) reconcileNormal(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) (ctrl.Result, error) { +func (r *DockerMachinePoolReconciler) reconcileNormal(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) (ctrl.Result, error) { log := ctrl.LoggerFrom(ctx) // Make sure bootstrap data is available and populated. @@ -322,7 +321,7 @@ func (r *DockerMachinePoolReconciler) reconcileNormal(ctx context.Context, clust return r.updateStatus(ctx, cluster, machinePool, dockerMachinePool, dockerMachineList.Items) } -func getDockerMachines(ctx context.Context, c client.Client, cluster clusterv1.Cluster, machinePool clusterv1.MachinePool, dockerMachinePool infraexpv1.DockerMachinePool) (*infrav1.DockerMachineList, error) { +func getDockerMachines(ctx context.Context, c client.Client, cluster clusterv1.Cluster, machinePool clusterv1.MachinePool, dockerMachinePool infrav1.DockerMachinePool) (*infrav1.DockerMachineList, error) { dockerMachineList := &infrav1.DockerMachineList{} labels := map[string]string{ clusterv1.ClusterNameLabel: cluster.Name, @@ -341,7 +340,7 @@ func getDockerMachinePoolProviderID(clusterName, dockerMachinePoolName string) s // setInfrastructureMachineKind sets the infrastructure machine kind in the status if it is not set already to support // MachinePool Machines and returns a boolean indicating if the status was updated. -func setInfrastructureMachineKind(dockerMachinePool *infraexpv1.DockerMachinePool) bool { +func setInfrastructureMachineKind(dockerMachinePool *infrav1.DockerMachinePool) bool { if dockerMachinePool != nil && dockerMachinePool.Status.InfrastructureMachineKind != "DockerMachine" { dockerMachinePool.Status.InfrastructureMachineKind = "DockerMachine" return true @@ -362,7 +361,7 @@ func dockerMachineToDockerMachinePool(_ context.Context, o client.Object) []ctrl if err != nil { return nil } - if ownerRef.Kind == "DockerMachinePool" && gv.Group == infraexpv1.GroupVersion.Group { + if ownerRef.Kind == "DockerMachinePool" && gv.Group == infrav1.GroupVersion.Group { return []ctrl.Request{ { NamespacedName: types.NamespacedName{ @@ -379,7 +378,7 @@ func dockerMachineToDockerMachinePool(_ context.Context, o client.Object) []ctrl // updateStatus updates the Status field for the MachinePool object. // It checks for the current state of the replicas and updates the Status of the MachinePool. -func (r *DockerMachinePoolReconciler) updateStatus(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool, dockerMachines []infrav1.DockerMachine) (ctrl.Result, error) { +func (r *DockerMachinePoolReconciler) updateStatus(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool, dockerMachines []infrav1.DockerMachine) (ctrl.Result, error) { log := ctrl.LoggerFrom(ctx) // List the Docker containers. This corresponds to an InfraMachinePool instance for providers. @@ -435,7 +434,7 @@ func (r *DockerMachinePoolReconciler) updateStatus(ctx context.Context, cluster return ctrl.Result{}, nil } -func patchDockerMachinePool(ctx context.Context, patchHelper *patch.Helper, dockerMachinePool *infraexpv1.DockerMachinePool) error { +func patchDockerMachinePool(ctx context.Context, patchHelper *patch.Helper, dockerMachinePool *infrav1.DockerMachinePool) error { v1beta1conditions.SetSummary(dockerMachinePool, v1beta1conditions.WithConditions( clusterv1.ReplicasReadyV1Beta1Condition, diff --git a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go b/test/infrastructure/docker/internal/controllers/dockermachinepool_controller_phases.go similarity index 96% rename from test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go rename to test/infrastructure/docker/internal/controllers/dockermachinepool_controller_phases.go index f01653849cb6..11138c523dce 100644 --- a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go +++ b/test/infrastructure/docker/internal/controllers/dockermachinepool_controller_phases.go @@ -34,7 +34,6 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2" "sigs.k8s.io/cluster-api/internal/util/ssa" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker" "sigs.k8s.io/cluster-api/test/infrastructure/kind" "sigs.k8s.io/cluster-api/util" @@ -47,7 +46,7 @@ import ( // - Does not delete any containers as that must be triggered in reconcileDockerMachines to ensure node cordon/drain. // // Providers should similarly create their infrastructure instances and reconcile any additional logic. -func (r *DockerMachinePoolReconciler) reconcileDockerContainers(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) error { +func (r *DockerMachinePoolReconciler) reconcileDockerContainers(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) error { log := ctrl.LoggerFrom(ctx) log.V(2).Info("Reconciling Docker containers", "DockerMachinePool", klog.KObj(dockerMachinePool)) @@ -73,7 +72,7 @@ func (r *DockerMachinePoolReconciler) reconcileDockerContainers(ctx context.Cont } // createDockerContainer creates a Docker container to serve as a replica for the MachinePool. -func createDockerContainer(ctx context.Context, name string, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) error { +func createDockerContainer(ctx context.Context, name string, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) error { log := ctrl.LoggerFrom(ctx) labelFilters := map[string]string{dockerMachinePoolLabel: dockerMachinePool.Name} externalMachine, err := docker.NewMachine(ctx, cluster, name, labelFilters) @@ -111,7 +110,7 @@ func createDockerContainer(ctx context.Context, name string, cluster *clusterv1. // - Deleting DockerMachines referencing a container whose Kubernetes version or custom image no longer matches the spec. // - Deleting DockerMachines that correspond to a deleted/non-existent Docker container. // - Deleting DockerMachines when scaling down such that DockerMachines whose owner Machine has the clusterv1.DeleteMachineAnnotation is given priority. -func (r *DockerMachinePoolReconciler) reconcileDockerMachines(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) error { +func (r *DockerMachinePoolReconciler) reconcileDockerMachines(ctx context.Context, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) error { log := ctrl.LoggerFrom(ctx) log.V(2).Info("Reconciling DockerMachines", "DockerMachinePool", klog.KObj(dockerMachinePool)) @@ -245,7 +244,7 @@ func (r *DockerMachinePoolReconciler) reconcileDockerMachines(ctx context.Contex // computeDesiredDockerMachine creates a DockerMachine to represent a Docker container in a DockerMachinePool. // These DockerMachines have the clusterv1.ClusterNameLabel and clusterv1.MachinePoolNameLabel to support MachinePool Machines. -func computeDesiredDockerMachine(name string, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool, existingDockerMachine *infrav1.DockerMachine) *infrav1.DockerMachine { +func computeDesiredDockerMachine(name string, cluster *clusterv1.Cluster, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool, existingDockerMachine *infrav1.DockerMachine) *infrav1.DockerMachine { dockerMachine := &infrav1.DockerMachine{ ObjectMeta: metav1.ObjectMeta{ Namespace: dockerMachinePool.Namespace, @@ -267,7 +266,7 @@ func computeDesiredDockerMachine(name string, cluster *clusterv1.Cluster, machin // Note: Since the MachinePool controller has not created its owner Machine yet, we want to set the DockerMachinePool as the owner so it's not orphaned. dockerMachine.SetOwnerReferences(util.EnsureOwnerRef(dockerMachine.OwnerReferences, metav1.OwnerReference{ - APIVersion: infraexpv1.GroupVersion.String(), + APIVersion: infrav1.GroupVersion.String(), Kind: "DockerMachinePool", Name: dockerMachinePool.Name, UID: dockerMachinePool.UID, @@ -349,7 +348,7 @@ func orderByDeleteMachineAnnotation(machines []infrav1.DockerMachine) []infrav1. } // isMachineMatchingInfrastructureSpec returns true if the Docker container image matches the custom image in the DockerMachinePool spec. -func isMachineMatchingInfrastructureSpec(_ context.Context, machine *docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) bool { +func isMachineMatchingInfrastructureSpec(_ context.Context, machine *docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) bool { // NOTE: With the current implementation we are checking if the machine is using a kindest/node image for the expected version, // but not checking if the machine has the expected extra.mounts or pre.loaded images. @@ -365,7 +364,7 @@ func isMachineMatchingInfrastructureSpec(_ context.Context, machine *docker.Mach } // machinesMatchingInfrastructureSpec returns the Docker containers matching the custom image in the DockerMachinePool spec. -func machinesMatchingInfrastructureSpec(ctx context.Context, machines []*docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) []*docker.Machine { +func machinesMatchingInfrastructureSpec(ctx context.Context, machines []*docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) []*docker.Machine { var matchingMachines []*docker.Machine for _, machine := range machines { if isMachineMatchingInfrastructureSpec(ctx, machine, machinePool, dockerMachinePool) { @@ -377,7 +376,7 @@ func machinesMatchingInfrastructureSpec(ctx context.Context, machines []*docker. } // getDeletionCandidates returns the DockerMachines for a MachinePool that do not match the infrastructure spec followed by any DockerMachines that are ready and up to date, i.e. matching the infrastructure spec. -func (r *DockerMachinePoolReconciler) getDeletionCandidates(ctx context.Context, dockerMachines []infrav1.DockerMachine, externalMachineSet map[string]*docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infraexpv1.DockerMachinePool) (outdatedMachines []infrav1.DockerMachine, readyMatchingMachines []infrav1.DockerMachine, err error) { +func (r *DockerMachinePoolReconciler) getDeletionCandidates(ctx context.Context, dockerMachines []infrav1.DockerMachine, externalMachineSet map[string]*docker.Machine, machinePool *clusterv1.MachinePool, dockerMachinePool *infrav1.DockerMachinePool) (outdatedMachines []infrav1.DockerMachine, readyMatchingMachines []infrav1.DockerMachine, err error) { for i := range dockerMachines { dockerMachine := dockerMachines[i] externalMachine, ok := externalMachineSet[dockerMachine.Name] diff --git a/test/infrastructure/docker/exp/internal/webhooks/dockermachinepool_webhook.go b/test/infrastructure/docker/internal/webhooks/dockermachinepool_webhook.go similarity index 88% rename from test/infrastructure/docker/exp/internal/webhooks/dockermachinepool_webhook.go rename to test/infrastructure/docker/internal/webhooks/dockermachinepool_webhook.go index bbad6647564c..1e3a58b96b5b 100644 --- a/test/infrastructure/docker/exp/internal/webhooks/dockermachinepool_webhook.go +++ b/test/infrastructure/docker/internal/webhooks/dockermachinepool_webhook.go @@ -19,7 +19,7 @@ package webhooks import ( ctrl "sigs.k8s.io/controller-runtime" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) // DockerMachinePool implements a validating and defaulting webhook for DockerMachinePool. @@ -27,6 +27,6 @@ type DockerMachinePool struct{} func (c *DockerMachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error { return ctrl.NewWebhookManagedBy(mgr). - For(&infraexpv1.DockerMachinePool{}). + For(&infrav1.DockerMachinePool{}). Complete() } diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go index cdf00d9c8172..b94864fa2a1a 100644 --- a/test/infrastructure/docker/main.go +++ b/test/infrastructure/docker/main.go @@ -60,12 +60,6 @@ import ( infrav1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" "sigs.k8s.io/cluster-api/test/infrastructure/docker/controllers" - infraexpv1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha3" - infraexpv1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha4" - infraexpv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" - expcontrollers "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/controllers" - infraexpwebhooks "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/webhooks" infrawebhooks "sigs.k8s.io/cluster-api/test/infrastructure/docker/webhooks" cloudv1 "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/cloud/api/v1alpha1" inmemoryruntime "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/runtime" @@ -114,10 +108,6 @@ func init() { _ = infrav1alpha4.AddToScheme(scheme) _ = infrav1beta1.AddToScheme(scheme) _ = infrav1.AddToScheme(scheme) - _ = infraexpv1alpha3.AddToScheme(scheme) - _ = infraexpv1alpha4.AddToScheme(scheme) - _ = infraexpv1beta1.AddToScheme(scheme) - _ = infraexpv1.AddToScheme(scheme) _ = clusterv1.AddToScheme(scheme) // scheme used for operating on the cloud resource. @@ -395,8 +385,8 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager) { &infrav1.DevMachineTemplate{}: {UseCache: false}, } if feature.Gates.Enabled(feature.MachinePool) { - crdMigratorConfig[&infraexpv1.DockerMachinePool{}] = crdmigrator.ByObjectConfig{UseCache: true} - crdMigratorConfig[&infraexpv1.DockerMachinePoolTemplate{}] = crdmigrator.ByObjectConfig{UseCache: false} + crdMigratorConfig[&infrav1.DockerMachinePool{}] = crdmigrator.ByObjectConfig{UseCache: true} + crdMigratorConfig[&infrav1.DockerMachinePoolTemplate{}] = crdmigrator.ByObjectConfig{UseCache: false} } crdMigratorSkipPhases := []crdmigrator.Phase{} for _, p := range skipCRDMigrationPhases { @@ -460,7 +450,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager) { } if feature.Gates.Enabled(feature.MachinePool) { - if err := (&expcontrollers.DockerMachinePoolReconciler{ + if err := (&controllers.DockerMachinePoolReconciler{ Client: mgr.GetClient(), ContainerRuntime: runtimeClient, WatchFilterValue: watchFilterValue, @@ -522,7 +512,7 @@ func setupWebhooks(mgr ctrl.Manager) { } if feature.Gates.Enabled(feature.MachinePool) { - if err := (&infraexpwebhooks.DockerMachinePool{}).SetupWebhookWithManager(mgr); err != nil { + if err := (&infrawebhooks.DockerMachinePool{}).SetupWebhookWithManager(mgr); err != nil { setupLog.Error(err, "Unable to create webhook", "webhook", "DockerMachinePool") os.Exit(1) } diff --git a/test/infrastructure/docker/webhooks/alias.go b/test/infrastructure/docker/webhooks/alias.go index 5bd4ab5afdb4..18efb70e70d0 100644 --- a/test/infrastructure/docker/webhooks/alias.go +++ b/test/infrastructure/docker/webhooks/alias.go @@ -77,3 +77,11 @@ type DevMachineTemplate struct{} func (webhook *DevMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error { return (&webhooks.DevMachineTemplate{}).SetupWebhookWithManager(mgr) } + +// DockerMachinePool implements a validating and defaulting webhook for DockerMachinePool. +type DockerMachinePool struct{} + +// SetupWebhookWithManager sets up DockerMachinePool webhooks. +func (webhook *DockerMachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error { + return (&webhooks.DockerMachinePool{}).SetupWebhookWithManager(mgr) +}