diff --git a/.gitignore b/.gitignore index 7c17efc3df3f..f0e0cf5f7f85 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ hack/tools/bin test/e2e/data/infrastructure-docker/v1alpha3/cluster-template*.yaml test/e2e/data/infrastructure-docker/v1alpha4/cluster-template*.yaml test/e2e/data/infrastructure-docker/v1beta1/cluster-template*.yaml +test/e2e/data/infrastructure-docker/v1beta2/cluster-template*.yaml # E2e test extension deployment test/e2e/data/test-extension/deployment.yaml diff --git a/.golangci.yml b/.golangci.yml index 042dd0bfaebc..ec9922d800da 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -128,6 +128,8 @@ linters-settings: - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4 alias: infrav1alpha4 - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1 + alias: infrav1beta1 + - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2 alias: infrav1 # CAPD exp - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha3 @@ -135,6 +137,8 @@ linters-settings: - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha4 alias: infraexpv1alpha4 - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1 + alias: infraexpv1beta1 + - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 alias: infraexpv1 nolintlint: allow-unused: false diff --git a/Makefile b/Makefile index 57bc48049ac4..46d6ced45a8f 100644 --- a/Makefile +++ b/Makefile @@ -410,11 +410,14 @@ generate-go-conversions-capd: $(CONVERSION_GEN) ## Generate conversions go code cd $(CAPD_DIR); $(CONVERSION_GEN) \ --input-dirs=./api/v1alpha3 \ --input-dirs=./api/v1alpha4 \ + --input-dirs=./api/v1beta1 \ --input-dirs=./$(EXP_DIR)/api/v1alpha3 \ --input-dirs=./$(EXP_DIR)/api/v1alpha4 \ + --input-dirs=./$(EXP_DIR)/api/v1beta1 \ --build-tag=ignore_autogenerated_capd \ --extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \ --extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \ + --extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \ --output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \ --go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 742beba4c086..e010a0ccd4e5 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -66,7 +66,7 @@ $(KUSTOMIZE_BIN): $(KUSTOMIZE) ## Build a local copy of kustomize DOCKER_TEMPLATES := $(REPO_ROOT)/test/e2e/data/infrastructure-docker .PHONY: cluster-templates -cluster-templates: $(KUSTOMIZE) cluster-templates-v1alpha3 cluster-templates-v1alpha4 cluster-templates-v1beta1 ## Generate cluster templates for all versions +cluster-templates: $(KUSTOMIZE) cluster-templates-v1alpha3 cluster-templates-v1alpha4 cluster-templates-v1beta1 cluster-templates-v1beta2 ## Generate cluster templates for all versions cluster-templates-v1alpha3: $(KUSTOMIZE) ## Generate cluster templates for v1alpha3 $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1alpha3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1alpha3/cluster-template.yaml @@ -101,6 +101,24 @@ cluster-templates-v1beta1: $(KUSTOMIZE) ## Generate cluster templates for v1beta $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-topology.yaml $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-ignition --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-ignition.yaml +cluster-templates-v1beta2: $(KUSTOMIZE) ## Generate cluster templates for v1beta2 + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-md-remediation.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-remediation.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-adoption/step1 --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-adoption.yaml + echo "---" >> $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-adoption.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-adoption/step2 --load-restrictor LoadRestrictionsNone >> $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-adoption.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-machine-pool --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-machine-pool.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-node-drain --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-node-drain.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-cgroupfs --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-cgroupfs.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-runtimesdk --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-runtimesdk.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-kcp-scale-in.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-ipv6 --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-ipv6.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-topology.yaml + $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta2/cluster-template-ignition --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta2/cluster-template-ignition.yaml + test-extension-deployment: $(KUSTOMIZE) ## Generate deployment for test extension mkdir -p $(REPO_ROOT)/test/e2e/data/test-extension $(KUSTOMIZE) build $(REPO_ROOT)/test/extension/config/default > $(REPO_ROOT)/test/e2e/data/test-extension/deployment.yaml diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml index 226f812ee4c6..7867450fec20 100644 --- a/test/e2e/config/docker.yaml +++ b/test/e2e/config/docker.yaml @@ -182,22 +182,22 @@ providers: new: "--metrics-bind-addr=:8080\n - --logging-format=json" files: # Add cluster templates - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-md-remediation.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-kcp-remediation.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-kcp-adoption.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-machine-pool.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-node-drain.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades-cgroupfs.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-kcp-scale-in.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-ipv6.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-topology.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-ignition.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml" - - sourcePath: "../data/infrastructure-docker/v1beta1/clusterclass-quick-start-runtimesdk.yaml" - - sourcePath: "../data/shared/v1beta1/metadata.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-md-remediation.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-machine-pool.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-node-drain.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-upgrades.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-ipv6.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-topology.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/cluster-template-ignition.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/clusterclass-quick-start.yaml" + - sourcePath: "../data/infrastructure-docker/v1beta2/clusterclass-quick-start-runtimesdk.yaml" + - sourcePath: "../data/shared/v1beta2/metadata.yaml" variables: # Default variables for the e2e test; those values could be overridden via env variables, thus diff --git a/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-kcp.yaml new file mode 100644 index 000000000000..265f005ded38 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-kcp.yaml @@ -0,0 +1,95 @@ +--- +# DockerCluster object referenced by the Cluster object +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerCluster +metadata: + name: '${CLUSTER_NAME}' +spec: + failureDomains: + fd1: + controlPlane: true + fd2: + controlPlane: true + fd3: + controlPlane: true + fd4: + controlPlane: false + fd5: + controlPlane: false + fd6: + controlPlane: false + fd7: + controlPlane: false + fd8: + controlPlane: false +--- +# Cluster object with +# - Reference to the KubeadmControlPlane object +# - the label cni=${CLUSTER_NAME}-crs-0, so the cluster can be selected by the ClusterResourceSet. +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' + labels: + cni: "${CLUSTER_NAME}-crs-0" +spec: + clusterNetwork: + services: + cidrBlocks: ['${DOCKER_SERVICE_CIDRS}'] + pods: + cidrBlocks: ['${DOCKER_POD_CIDRS}'] + serviceDomain: '${DOCKER_SERVICE_DOMAIN}' + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerCluster + name: '${CLUSTER_NAME}' + controlPlaneRef: + kind: KubeadmControlPlane + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + name: "${CLUSTER_NAME}-control-plane" +--- +# DockerMachineTemplate object referenced by the KubeadmControlPlane object +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: "${CLUSTER_NAME}-control-plane" +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +# KubeadmControlPlane referenced by the Cluster object with +# - the label kcp-adoption.step2, because it should be created in the second step of the kcp-adoption test. +kind: KubeadmControlPlane +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: "${CLUSTER_NAME}-control-plane" + labels: + kcp-adoption.step2: "" +spec: + replicas: ${CONTROL_PLANE_MACHINE_COUNT} + machineTemplate: + infrastructureRef: + kind: DockerMachineTemplate + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + name: "${CLUSTER_NAME}-control-plane" + kubeadmConfigSpec: + clusterConfiguration: + controllerManager: + extraArgs: {enable-hostpath-provisioner: 'true'} + apiServer: + # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. + certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal] + initConfiguration: + nodeRegistration: + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + joinConfiguration: + nodeRegistration: + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + version: "${KUBERNETES_VERSION}" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-topology.yaml b/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-topology.yaml new file mode 100644 index 000000000000..86dd08459353 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/bases/cluster-with-topology.yaml @@ -0,0 +1,36 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' + namespace: default + labels: + cni: "${CLUSTER_NAME}-crs-0" +spec: + clusterNetwork: + services: + cidrBlocks: ['${DOCKER_SERVICE_CIDRS}'] + pods: + cidrBlocks: ['${DOCKER_POD_CIDRS}'] + serviceDomain: '${DOCKER_SERVICE_DOMAIN}' + topology: + class: "quick-start" + version: "${KUBERNETES_VERSION}" + controlPlane: + metadata: {} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} + workers: + machineDeployments: + - class: "default-worker" + name: "md-0" + replicas: ${WORKER_MACHINE_COUNT} + failureDomain: fd4 + variables: + # The imageRepository variable is defaulted by the Cluster webhook. + #- name: imageRepository + # value: k8s.gcr.io + - name: etcdImageTag + # We set an empty value to use the default tag kubeadm init is using. + value: "" + - name: coreDNSImageTag + # We set an empty value to use the default tag kubeadm init is using. + value: "" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/bases/crs.yaml b/test/e2e/data/infrastructure-docker/v1beta2/bases/crs.yaml new file mode 100644 index 000000000000..b1b61237dc62 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/bases/crs.yaml @@ -0,0 +1,24 @@ +--- +# ConfigMap object referenced by the ClusterResourceSet object and with +# the CNI resource defined in the test config file +apiVersion: v1 +kind: ConfigMap +metadata: + name: "cni-${CLUSTER_NAME}-crs-0" +data: ${CNI_RESOURCES} +binaryData: +--- +# ClusterResourceSet object with +# a selector that targets all the Cluster with label cni=${CLUSTER_NAME}-crs-0 +apiVersion: addons.cluster.x-k8s.io/v1beta1 +kind: ClusterResourceSet +metadata: + name: "${CLUSTER_NAME}-crs-0" +spec: + strategy: ApplyOnce + clusterSelector: + matchLabels: + cni: "${CLUSTER_NAME}-crs-0" + resources: + - name: "cni-${CLUSTER_NAME}-crs-0" + kind: ConfigMap diff --git a/test/e2e/data/infrastructure-docker/v1beta2/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1beta2/bases/md.yaml new file mode 100644 index 000000000000..0b061d012a59 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/bases/md.yaml @@ -0,0 +1,52 @@ +--- +# DockerMachineTemplate referenced by the MachineDeployment and with +# - extraMounts for the docker sock, thus allowing self-hosting test +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +# KubeadmConfigTemplate referenced by the MachineDeployment +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfigTemplate +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + spec: + joinConfiguration: + nodeRegistration: + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' +--- +# MachineDeployment object +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineDeployment +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + clusterName: "${CLUSTER_NAME}" + replicas: ${WORKER_MACHINE_COUNT} + selector: + matchLabels: + template: + spec: + clusterName: "${CLUSTER_NAME}" + version: "${KUBERNETES_VERSION}" + bootstrap: + configRef: + name: "${CLUSTER_NAME}-md-0" + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfigTemplate + infrastructureRef: + name: "${CLUSTER_NAME}-md-0" + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + failureDomain: fd4 diff --git a/test/e2e/data/infrastructure-docker/v1beta2/bases/mp.yaml b/test/e2e/data/infrastructure-docker/v1beta2/bases/mp.yaml new file mode 100644 index 000000000000..3a0534326f21 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/bases/mp.yaml @@ -0,0 +1,45 @@ +--- +# MachinePool which references the DockerMachinePool and KubeadmConfigTemplate below +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachinePool +metadata: + name: "${CLUSTER_NAME}-mp-0" +spec: + clusterName: '${CLUSTER_NAME}' + replicas: ${WORKER_MACHINE_COUNT} + template: + spec: + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfig + name: "${CLUSTER_NAME}-mp-0-config" + clusterName: '${CLUSTER_NAME}' + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachinePool + name: "${CLUSTER_NAME}-dmp-0" + version: "${KUBERNETES_VERSION}" + failureDomains: + - fd4 + - fd5 + - fd6 + - fd7 + - fd8 +--- +# DockerMachinePool using default values referenced by the MachinePool +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachinePool +metadata: + name: "${CLUSTER_NAME}-dmp-0" +--- +# KubeadmConfigTemplate referenced by the MachinePool +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfig +metadata: + name: "${CLUSTER_NAME}-mp-0-config" +spec: + joinConfiguration: + nodeRegistration: + kubeletExtraArgs: + eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/ignition.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/ignition.yaml new file mode 100644 index 000000000000..11f07f4ce964 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/ignition.yaml @@ -0,0 +1,26 @@ +kind: KubeadmControlPlane +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: "${CLUSTER_NAME}-control-plane" +spec: + kubeadmConfigSpec: + format: ignition +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfigTemplate +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + spec: + format: ignition + ignition: + containerLinuxConfig: + additionalConfig: | + storage: + files: + - path: /opt/foo + filesystem: root + contents: + inline: Howdy! + mode: 0644 diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/kustomization.yaml new file mode 100644 index 000000000000..f1c273da9b6c --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ignition/kustomization.yaml @@ -0,0 +1,7 @@ +bases: + - ../bases/cluster-with-kcp.yaml + - ../bases/md.yaml + - ../bases/crs.yaml + +patchesStrategicMerge: + - ./ignition.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/cluster-ipv6.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/cluster-ipv6.yaml new file mode 100644 index 000000000000..90b25a2ae493 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/cluster-ipv6.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' +spec: + clusterNetwork: + services: + cidrBlocks: ['${DOCKER_SERVICE_IPV6_CIDRS}'] + pods: + cidrBlocks: ['${DOCKER_POD_IPV6_CIDRS}'] diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kcp-ipv6.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kcp-ipv6.yaml new file mode 100644 index 000000000000..9315c5472381 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kcp-ipv6.yaml @@ -0,0 +1,22 @@ +--- +kind: KubeadmControlPlane +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: "${CLUSTER_NAME}-control-plane" +spec: + kubeadmConfigSpec: + clusterConfiguration: + apiServer: + # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. + certSANs: [localhost, "::", "::1", host.docker.internal] + initConfiguration: + localAPIEndpoint: + advertiseAddress: '::' + bindPort: 6443 + nodeRegistration: + kubeletExtraArgs: + node-ip: "::" + joinConfiguration: + nodeRegistration: + kubeletExtraArgs: + node-ip: "::" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kustomization.yaml new file mode 100644 index 000000000000..77ef4e301733 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/kustomization.yaml @@ -0,0 +1,9 @@ +bases: + - ../bases/cluster-with-kcp.yaml + - ../bases/md.yaml + - ../bases/crs.yaml + +patchesStrategicMerge: + - ./cluster-ipv6.yaml + - ./md-ipv6.yaml + - ./kcp-ipv6.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/md-ipv6.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/md-ipv6.yaml new file mode 100644 index 000000000000..715888fdf3d6 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-ipv6/md-ipv6.yaml @@ -0,0 +1,16 @@ +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfigTemplate +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + spec: + initConfiguration: + nodeRegistration: + kubeletExtraArgs: + node-ip: "::" + joinConfiguration: + nodeRegistration: + kubeletExtraArgs: + node-ip: "::" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml new file mode 100644 index 000000000000..a884499d6f61 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml @@ -0,0 +1,76 @@ +--- +# DockerCluster object referenced by the Cluster object +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerCluster +metadata: + name: '${CLUSTER_NAME}' +--- +# Cluster object with +# - No reference to the KubeadmControlPlane object +# - the label cni=${CLUSTER_NAME}-crs-0, so the cluster can be selected by the ClusterResourceSet. +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' + labels: + cni: "${CLUSTER_NAME}-crs-0" +spec: + clusterNetwork: + services: + cidrBlocks: ['${DOCKER_SERVICE_CIDRS}'] + pods: + cidrBlocks: ['${DOCKER_POD_CIDRS}'] + serviceDomain: '${DOCKER_SERVICE_DOMAIN}' + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerCluster + name: '${CLUSTER_NAME}' +--- +# DockerMachine referenced by the Machine cp0 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachine +metadata: + name: "${CLUSTER_NAME}-control-plane-0" +spec: {} +--- +# KubeadmConfig referenced by the Machine cp0 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfig +metadata: + name: "${CLUSTER_NAME}-control-plane-0" +spec: + clusterConfiguration: + controllerManager: + extraArgs: {enable-hostpath-provisioner: 'true'} + apiServer: + certSANs: [localhost, 127.0.0.1] + initConfiguration: + nodeRegistration: + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + joinConfiguration: + nodeRegistration: + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' +--- +# cp0 Machine +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Machine +metadata: + name: "${CLUSTER_NAME}-control-plane-0" + labels: + cluster.x-k8s.io/control-plane: '' +spec: + clusterName: "${ CLUSTER_NAME }" + version: "${ KUBERNETES_VERSION }" + bootstrap: + configRef: + name: "${ CLUSTER_NAME }-control-plane-0" + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfig + infrastructureRef: + name: "${ CLUSTER_NAME }-control-plane-0" + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachine diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/kustomization.yaml new file mode 100644 index 000000000000..fa5f1edcc2f5 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step1/kustomization.yaml @@ -0,0 +1,8 @@ +commonLabels: + kcp-adoption.step1: "" + +bases: + - cluster-with-cp0.yaml + - ../../bases/crs.yaml + + diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step2/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step2/kustomization.yaml new file mode 100644 index 000000000000..f7b1382cfa0e --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-adoption/step2/kustomization.yaml @@ -0,0 +1,6 @@ +commonLabels: + kcp-adoption.step2: "" + +bases: + - ../../bases/cluster-with-kcp.yaml + diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/kustomization.yaml new file mode 100644 index 000000000000..e234e37be1b2 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/kustomization.yaml @@ -0,0 +1,5 @@ +bases: + - ../bases/cluster-with-kcp.yaml + - ../bases/md.yaml + - ../bases/crs.yaml + - mhc.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/mhc.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/mhc.yaml new file mode 100644 index 000000000000..3ed3e0a9473a --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-remediation/mhc.yaml @@ -0,0 +1,18 @@ +--- +# MachineHealthCheck object with +# - a selector that targets all the machines with label cluster.x-k8s.io/control-plane="" +# - unhealthyConditions triggering remediation after 10s the condition is set +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: "${CLUSTER_NAME}-mhc-0" +spec: + clusterName: "${CLUSTER_NAME}" + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - type: e2e.remediation.condition + status: "False" + timeout: 10s diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kcp-scale-in-variable.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kcp-scale-in-variable.yaml new file mode 100644 index 000000000000..6cfd1c6e516b --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kcp-scale-in-variable.yaml @@ -0,0 +1,5 @@ +- op: add + path: /spec/topology/variables/- + value: + name: kubeadmControlPlaneMaxSurge + value: "0" \ No newline at end of file diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kustomization.yaml new file mode 100644 index 000000000000..a82c063276d1 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-kcp-scale-in/kustomization.yaml @@ -0,0 +1,10 @@ +bases: +- ../bases/crs.yaml +- ../bases/cluster-with-topology.yaml + +patches: +- path: ./kcp-scale-in-variable.yaml + target: + group: cluster.x-k8s.io + version: v1beta1 + kind: Cluster \ No newline at end of file diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-machine-pool/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-machine-pool/kustomization.yaml new file mode 100644 index 000000000000..2323bae83aea --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-machine-pool/kustomization.yaml @@ -0,0 +1,4 @@ +resources: + - ../bases/cluster-with-kcp.yaml + - ../bases/mp.yaml + - ../bases/crs.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/kustomization.yaml new file mode 100644 index 000000000000..82c8029e8b38 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/kustomization.yaml @@ -0,0 +1,8 @@ +bases: + - ../bases/cluster-with-kcp.yaml + - ../bases/md.yaml + - ../bases/crs.yaml + - mhc.yaml + +patchesStrategicMerge: +- ./md.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/md.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/md.yaml new file mode 100644 index 000000000000..13968556b60a --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/md.yaml @@ -0,0 +1,9 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineDeployment +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + metadata: + labels: + "e2e.remediation.label": "" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/mhc.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/mhc.yaml new file mode 100644 index 000000000000..c10722590945 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-md-remediation/mhc.yaml @@ -0,0 +1,18 @@ +--- +# MachineHealthCheck object with +# - a selector that targets all the machines with label e2e.remediation.label="" +# - unhealthyConditions triggering remediation after 10s the condition is set +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: "${CLUSTER_NAME}-mhc-0" +spec: + clusterName: "${CLUSTER_NAME}" + maxUnhealthy: 100% + selector: + matchLabels: + e2e.remediation.label: "" + unhealthyConditions: + - type: e2e.remediation.condition + status: "False" + timeout: 10s diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/cluster-with-kcp.yaml new file mode 100644 index 000000000000..91a5a7f4728f --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/cluster-with-kcp.yaml @@ -0,0 +1,9 @@ +# KubeadmControlPlane referenced by the Cluster object with +# - the label kcp-adoption.step2, because it should be created in the second step of the kcp-adoption test. +kind: KubeadmControlPlane +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: "${CLUSTER_NAME}-control-plane" +spec: + machineTemplate: + nodeDrainTimeout: ${NODE_DRAIN_TIMEOUT} diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/kustomization.yaml new file mode 100644 index 000000000000..dde0c51f0d2d --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/kustomization.yaml @@ -0,0 +1,8 @@ +bases: +- ../bases/crs.yaml +- ../bases/md.yaml +- ../bases/cluster-with-kcp.yaml + +patchesStrategicMerge: +- ./md.yaml +- ./cluster-with-kcp.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/md.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/md.yaml new file mode 100644 index 000000000000..bc4577762f31 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-node-drain/md.yaml @@ -0,0 +1,8 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineDeployment +metadata: + name: "${CLUSTER_NAME}-md-0" +spec: + template: + spec: + nodeDrainTimeout: "${NODE_DRAIN_TIMEOUT}" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-topology/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-topology/kustomization.yaml new file mode 100644 index 000000000000..44c449548234 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-topology/kustomization.yaml @@ -0,0 +1,3 @@ +resources: + - ../bases/cluster-with-topology.yaml + - ../bases/crs.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/kustomization.yaml new file mode 100644 index 000000000000..5a55a97c8e22 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/kustomization.yaml @@ -0,0 +1,6 @@ +resources: + - ../cluster-template-upgrades + - ./mp-cgroupfs.yaml + +patches: +- ./mp-default-cgroupfs.yaml \ No newline at end of file diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml new file mode 100644 index 000000000000..b9a5097f135d --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml @@ -0,0 +1,13 @@ +# KubeadmConfigTemplate referenced by the MachinePool for cgroupfs +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfig +metadata: + name: "${CLUSTER_NAME}-mp-0-config-cgroupfs" +spec: + joinConfiguration: + nodeRegistration: + kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd + # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726 + cgroup-driver: cgroupfs + eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-default-cgroupfs.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-default-cgroupfs.yaml new file mode 100644 index 000000000000..08d8252542f3 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-cgroupfs/mp-default-cgroupfs.yaml @@ -0,0 +1,10 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachinePool +metadata: + name: "${CLUSTER_NAME}-mp-0" +spec: + template: + spec: + bootstrap: + configRef: + name: "${CLUSTER_NAME}-mp-0-config-cgroupfs" \ No newline at end of file diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/cluster-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/cluster-runtimesdk.yaml new file mode 100644 index 000000000000..b0d438e585ae --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/cluster-runtimesdk.yaml @@ -0,0 +1,8 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' + namespace: default +spec: + topology: + class: "quick-start-runtimesdk" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/kustomization.yaml new file mode 100644 index 000000000000..4e0073d2ce2d --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk-cgroupfs/kustomization.yaml @@ -0,0 +1,5 @@ +resources: +- ../cluster-template-upgrades-cgroupfs + +patches: +- ./cluster-runtimesdk.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml new file mode 100644 index 000000000000..b0d438e585ae --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml @@ -0,0 +1,8 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: '${CLUSTER_NAME}' + namespace: default +spec: + topology: + class: "quick-start-runtimesdk" diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/kustomization.yaml new file mode 100644 index 000000000000..8555d6df9920 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades-runtimesdk/kustomization.yaml @@ -0,0 +1,5 @@ +resources: +- ../cluster-template-upgrades + +patches: +- ./cluster-runtimesdk.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades/kustomization.yaml new file mode 100644 index 000000000000..4a6a5032d533 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template-upgrades/kustomization.yaml @@ -0,0 +1,4 @@ +resources: + - ../bases/cluster-with-topology.yaml + - ../bases/crs.yaml + - ../bases/mp.yaml diff --git a/test/e2e/data/infrastructure-docker/v1beta2/cluster-template/kustomization.yaml b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template/kustomization.yaml new file mode 100644 index 000000000000..adb5919cec6f --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/cluster-template/kustomization.yaml @@ -0,0 +1,5 @@ +bases: +- ../bases/cluster-with-kcp.yaml +- ../bases/md.yaml +- ../bases/crs.yaml + diff --git a/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start-runtimesdk.yaml new file mode 100644 index 000000000000..e181acec7db2 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start-runtimesdk.yaml @@ -0,0 +1,290 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: ClusterClass +metadata: + name: quick-start-runtimesdk +spec: + controlPlane: + ref: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + name: quick-start-control-plane + machineInfrastructure: + ref: + kind: DockerMachineTemplate + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + name: quick-start-control-plane + infrastructure: + ref: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerClusterTemplate + name: quick-start-cluster + workers: + machineDeployments: + - class: default-worker + template: + bootstrap: + ref: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfigTemplate + name: quick-start-default-worker-bootstraptemplate + infrastructure: + ref: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + name: quick-start-default-worker-machinetemplate + variables: + - name: lbImageRepository + required: true + schema: + openAPIV3Schema: + type: string + default: kindest + - name: imageRepository + required: true + schema: + openAPIV3Schema: + type: string + default: "k8s.gcr.io" + example: "k8s.gcr.io" + description: "imageRepository sets the container registry to pull images from. If empty, `k8s.gcr.io` will be used by default." + - name: etcdImageTag + required: true + schema: + openAPIV3Schema: + type: string + default: "" + example: "3.5.3-0" + description: "etcdImageTag sets the tag for the etcd image." + - name: coreDNSImageTag + required: true + schema: + openAPIV3Schema: + type: string + default: "" + example: "v1.8.5" + description: "coreDNSImageTag sets the tag for the coreDNS image." + - name: kubeadmControlPlaneMaxSurge + required: false + schema: + openAPIV3Schema: + type: string + default: "" + example: "0" + description: "kubeadmControlPlaneMaxSurge is the maximum number of control planes that can be scheduled above or under the desired number of control plane machines." + patches: + - name: lbImageRepository + external: + generateExtension: generate-patches.k8s-upgrade-with-runtimesdk + validateExtension: validate-topology.k8s-upgrade-with-runtimesdk + - name: imageRepository + description: "Sets the imageRepository used for the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/imageRepository" + valueFrom: + variable: imageRepository + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + - name: cgroupDriver-controlPlane + description: | + Sets the cgroupDriver to cgroupfs if a Kubernetes version < v1.24 is referenced. + This is required because kind and the node images do not support the default + systemd cgroupDriver for kubernetes < v1.24. + enabledIf: '{{ semverCompare "<= v1.23" .builtin.controlPlane.version }}' + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - name: cgroupDriver-machineDeployment + description: | + Sets the cgroupDriver to cgroupfs if a Kubernetes version < v1.24 is referenced. + This is required because kind and the node images do not support the default + systemd cgroupDriver for kubernetes < v1.24. + enabledIf: '{{ semverCompare "<= v1.23" .builtin.machineDeployment.version }}' + definitions: + - selector: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfigTemplate + matchResources: + machineDeploymentClass: + names: + - default-worker + jsonPatches: + - op: add + path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - name: etcdImageTag + description: "Sets tag to use for the etcd image in the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/etcd" + valueFrom: + template: | + local: + imageTag: {{ .etcdImageTag }} + - name: coreDNSImageTag + description: "Sets tag to use for the etcd image in the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/dns" + valueFrom: + template: | + imageTag: {{ .coreDNSImageTag }} + - name: customImage + description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments." + definitions: + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + matchResources: + machineDeploymentClass: + names: + - default-worker + jsonPatches: + - op: add + path: "/spec/template/spec/customImage" + valueFrom: + template: | + kindest/node:{{ .builtin.machineDeployment.version | replace "+" "_" }} + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/customImage" + valueFrom: + template: | + kindest/node:{{ .builtin.controlPlane.version | replace "+" "_" }} + - name: kubeadmControlPlaneMaxSurge + description: "Sets the maxSurge value used for rolloutStrategy in the KubeadmControlPlane." + enabledIf: '{{ ne .kubeadmControlPlaneMaxSurge "" }}' + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: /spec/template/spec/rolloutStrategy/rollingUpdate/maxSurge + valueFrom: + template: "{{ .kubeadmControlPlaneMaxSurge }}" +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerClusterTemplate +metadata: + name: quick-start-cluster +spec: + template: + spec: + failureDomains: + fd1: + controlPlane: true + fd2: + controlPlane: true + fd3: + controlPlane: true + fd4: + controlPlane: false + fd5: + controlPlane: false + fd6: + controlPlane: false + fd7: + controlPlane: false + fd8: + controlPlane: false +--- +kind: KubeadmControlPlaneTemplate +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: quick-start-control-plane +spec: + template: + spec: + machineTemplate: + nodeDrainTimeout: 1s + kubeadmConfigSpec: + clusterConfiguration: + controllerManager: + extraArgs: { enable-hostpath-provisioner: 'true' } + apiServer: + # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. + certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal] + initConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + joinConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: quick-start-control-plane +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: quick-start-default-worker-machinetemplate +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfigTemplate +metadata: + name: quick-start-default-worker-bootstraptemplate +spec: + template: + spec: + joinConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + diff --git a/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start.yaml new file mode 100644 index 000000000000..979ec0ecff25 --- /dev/null +++ b/test/e2e/data/infrastructure-docker/v1beta2/clusterclass-quick-start.yaml @@ -0,0 +1,311 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: ClusterClass +metadata: + name: quick-start +spec: + controlPlane: + ref: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + name: quick-start-control-plane + machineInfrastructure: + ref: + kind: DockerMachineTemplate + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + name: quick-start-control-plane + machineHealthCheck: + maxUnhealthy: 100% + unhealthyConditions: + - type: e2e.remediation.condition + status: "False" + timeout: 20s + infrastructure: + ref: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerClusterTemplate + name: quick-start-cluster + workers: + machineDeployments: + - class: default-worker + template: + bootstrap: + ref: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfigTemplate + name: quick-start-default-worker-bootstraptemplate + infrastructure: + ref: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + name: quick-start-default-worker-machinetemplate + machineHealthCheck: + maxUnhealthy: 100% + unhealthyConditions: + - type: e2e.remediation.condition + status: "False" + timeout: 20s + variables: + - name: lbImageRepository + required: true + schema: + openAPIV3Schema: + type: string + default: kindest + - name: imageRepository + required: true + schema: + openAPIV3Schema: + type: string + default: "k8s.gcr.io" + example: "k8s.gcr.io" + description: "imageRepository sets the container registry to pull images from. If empty, `k8s.gcr.io` will be used by default." + - name: etcdImageTag + required: true + schema: + openAPIV3Schema: + type: string + default: "" + example: "3.5.3-0" + description: "etcdImageTag sets the tag for the etcd image." + - name: coreDNSImageTag + required: true + schema: + openAPIV3Schema: + type: string + default: "" + example: "v1.8.5" + description: "coreDNSImageTag sets the tag for the coreDNS image." + - name: kubeadmControlPlaneMaxSurge + required: false + schema: + openAPIV3Schema: + type: string + default: "" + example: "0" + description: "kubeadmControlPlaneMaxSurge is the maximum number of control planes that can be scheduled above or under the desired number of control plane machines." + patches: + - name: lbImageRepository + definitions: + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerClusterTemplate + matchResources: + infrastructureCluster: true + jsonPatches: + - op: add + path: "/spec/template/spec/loadBalancer" + valueFrom: + template: | + imageRepository: {{ .lbImageRepository }} + - name: imageRepository + description: "Sets the imageRepository used for the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/imageRepository" + valueFrom: + variable: imageRepository + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + - name: cgroupDriver-controlPlane + description: | + Sets the cgroupDriver to cgroupfs if a Kubernetes version < v1.24 is referenced. + This is required because kind and the node images do not support the default + systemd cgroupDriver for kubernetes < v1.24. + enabledIf: '{{ semverCompare "<= v1.23" .builtin.controlPlane.version }}' + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - name: cgroupDriver-machineDeployment + description: | + Sets the cgroupDriver to cgroupfs if a Kubernetes version < v1.24 is referenced. + This is required because kind and the node images do not support the default + systemd cgroupDriver for kubernetes < v1.24. + enabledIf: '{{ semverCompare "<= v1.23" .builtin.machineDeployment.version }}' + definitions: + - selector: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: KubeadmConfigTemplate + matchResources: + machineDeploymentClass: + names: + - default-worker + jsonPatches: + - op: add + path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver" + value: cgroupfs + - name: etcdImageTag + description: "Sets tag to use for the etcd image in the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/etcd" + valueFrom: + template: | + local: + imageTag: {{ .etcdImageTag }} + - name: coreDNSImageTag + description: "Sets tag to use for the etcd image in the KubeadmControlPlane." + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/dns" + valueFrom: + template: | + imageTag: {{ .coreDNSImageTag }} + - name: customImage + description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments." + definitions: + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + matchResources: + machineDeploymentClass: + names: + - default-worker + jsonPatches: + - op: add + path: "/spec/template/spec/customImage" + valueFrom: + template: | + kindest/node:{{ .builtin.machineDeployment.version | replace "+" "_" }} + - selector: + apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 + kind: DockerMachineTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: "/spec/template/spec/customImage" + valueFrom: + template: | + kindest/node:{{ .builtin.controlPlane.version | replace "+" "_" }} + - name: kubeadmControlPlaneMaxSurge + description: "Sets the maxSurge value used for rolloutStrategy in the KubeadmControlPlane." + enabledIf: '{{ ne .kubeadmControlPlaneMaxSurge "" }}' + definitions: + - selector: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: KubeadmControlPlaneTemplate + matchResources: + controlPlane: true + jsonPatches: + - op: add + path: /spec/template/spec/rolloutStrategy/rollingUpdate/maxSurge + valueFrom: + template: "{{ .kubeadmControlPlaneMaxSurge }}" +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerClusterTemplate +metadata: + name: quick-start-cluster +spec: + template: + spec: + failureDomains: + fd1: + controlPlane: true + fd2: + controlPlane: true + fd3: + controlPlane: true + fd4: + controlPlane: false + fd5: + controlPlane: false + fd6: + controlPlane: false + fd7: + controlPlane: false + fd8: + controlPlane: false +--- +kind: KubeadmControlPlaneTemplate +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +metadata: + name: quick-start-control-plane +spec: + template: + spec: + machineTemplate: + nodeDrainTimeout: 1s + kubeadmConfigSpec: + clusterConfiguration: + controllerManager: + extraArgs: { enable-hostpath-provisioner: 'true' } + apiServer: + # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied. + certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal] + initConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + joinConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: quick-start-control-plane +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 +kind: DockerMachineTemplate +metadata: + name: quick-start-default-worker-machinetemplate +spec: + template: + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +kind: KubeadmConfigTemplate +metadata: + name: quick-start-default-worker-bootstraptemplate +spec: + template: + spec: + joinConfiguration: + nodeRegistration: + # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found + criSocket: unix:///var/run/containerd/containerd.sock + kubeletExtraArgs: + eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' + diff --git a/test/e2e/data/shared/v1beta2/metadata.yaml b/test/e2e/data/shared/v1beta2/metadata.yaml new file mode 100644 index 000000000000..ff9cdc10131b --- /dev/null +++ b/test/e2e/data/shared/v1beta2/metadata.yaml @@ -0,0 +1,24 @@ +apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 +kind: Metadata +releaseSeries: + - major: 1 + minor: 3 + contract: v1beta1 + - major: 1 + minor: 2 + contract: v1beta1 + - major: 1 + minor: 1 + contract: v1beta1 + - major: 1 + minor: 0 + contract: v1beta1 + - major: 0 + minor: 4 + contract: v1alpha4 + - major: 0 + minor: 3 + contract: v1alpha3 + - major: 0 + minor: 2 + contract: v1alpha2 diff --git a/test/extension/handlers/topologymutation/handler.go b/test/extension/handlers/topologymutation/handler.go index 330d6a55eba9..d3bf19b1db85 100644 --- a/test/extension/handlers/topologymutation/handler.go +++ b/test/extension/handlers/topologymutation/handler.go @@ -36,7 +36,7 @@ import ( controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" patchvariables "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/patches/variables" - infrav1 "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/util/version" ) @@ -183,7 +183,7 @@ func patchDockerClusterTemplate(_ context.Context, dockerClusterTemplate *infrav return errors.Wrap(err, "could not set DockerClusterTemplate loadBalancer imageRepository") } if found { - dockerClusterTemplate.Spec.Template.Spec.LoadBalancer.ImageRepository = lbImageRepo + dockerClusterTemplate.Spec.Template.Spec.LoadBalancer.NewImageRepository = lbImageRepo } return nil } @@ -256,7 +256,7 @@ func patchDockerMachineTemplate(ctx context.Context, dockerMachineTemplate *infr } customImage := fmt.Sprintf("kindest/node:%s", strings.ReplaceAll(cpVersion, "+", "_")) log.Info(fmt.Sprintf("Setting MachineDeployment custom image to %q", customImage)) - dockerMachineTemplate.Spec.Template.Spec.CustomImage = customImage + dockerMachineTemplate.Spec.Template.Spec.NewCustomImage = customImage // return early if we have successfully patched a control plane dockerMachineTemplate return nil } @@ -273,7 +273,7 @@ func patchDockerMachineTemplate(ctx context.Context, dockerMachineTemplate *infr } customImage := fmt.Sprintf("kindest/node:%s", strings.ReplaceAll(mdVersion, "+", "_")) log.Info(fmt.Sprintf("Setting MachineDeployment customImage to %q", customImage)) - dockerMachineTemplate.Spec.Template.Spec.CustomImage = customImage + dockerMachineTemplate.Spec.Template.Spec.NewCustomImage = customImage return nil } // If the Docker Machine didn't have variables for either a control plane or a machineDeployment return an error. diff --git a/test/extension/main.go b/test/extension/main.go index aba809d09338..47839b17f97b 100644 --- a/test/extension/main.go +++ b/test/extension/main.go @@ -42,7 +42,7 @@ import ( "sigs.k8s.io/cluster-api/exp/runtime/server" "sigs.k8s.io/cluster-api/test/extension/handlers/lifecycle" "sigs.k8s.io/cluster-api/test/extension/handlers/topologymutation" - infrav1 "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/version" ) diff --git a/test/infrastructure/docker/api/v1alpha3/conversion.go b/test/infrastructure/docker/api/v1alpha3/conversion.go index 6bdb64825187..1958ce2715fd 100644 --- a/test/infrastructure/docker/api/v1alpha3/conversion.go +++ b/test/infrastructure/docker/api/v1alpha3/conversion.go @@ -20,14 +20,14 @@ import ( apiconversion "k8s.io/apimachinery/pkg/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerCluster) - if err := Convert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(src, dst, nil); err != nil { + if err := Convert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(src, dst, nil); err != nil { return err } @@ -37,13 +37,13 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error { return err } - if restored.Spec.LoadBalancer.ImageRepository != "" { - dst.Spec.LoadBalancer.ImageRepository = restored.Spec.LoadBalancer.ImageRepository + if restored.Spec.LoadBalancer.NewImageRepository != "" { + dst.Spec.LoadBalancer.NewImageRepository = restored.Spec.LoadBalancer.NewImageRepository } - if restored.Spec.LoadBalancer.ImageTag != "" { - dst.Spec.LoadBalancer.ImageTag = restored.Spec.LoadBalancer.ImageTag - } + //if restored.Spec.LoadBalancer.ImageTag != "" { + // dst.Spec.LoadBalancer.ImageTag = restored.Spec.LoadBalancer.ImageTag + //} return nil } @@ -51,7 +51,7 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error { func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerCluster) - if err := Convert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(src, dst, nil); err != nil { + if err := Convert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(src, dst, nil); err != nil { return err } @@ -66,43 +66,43 @@ func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error { func (src *DockerClusterList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerClusterList) - return Convert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(src, dst, nil) + return Convert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList(src, dst, nil) } func (dst *DockerClusterList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerClusterList) - return Convert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(src, dst, nil) + return Convert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList(src, dst, nil) } func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachine) - return Convert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(src, dst, nil) + return Convert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(src, dst, nil) } func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachine) - return Convert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(src, dst, nil) + return Convert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(src, dst, nil) } func (src *DockerMachineList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineList) - return Convert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(src, dst, nil) + return Convert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList(src, dst, nil) } func (dst *DockerMachineList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineList) - return Convert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(src, dst, nil) + return Convert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(src, dst, nil) } func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineTemplate) - if err := Convert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(src, dst, nil); err != nil { + if err := Convert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(src, dst, nil); err != nil { return err } @@ -120,7 +120,7 @@ func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineTemplate) - if err := Convert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(src, dst, nil); err != nil { + if err := Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(src, dst, nil); err != nil { return err } @@ -135,22 +135,40 @@ func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error { func (src *DockerMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineTemplateList) - return Convert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(src, dst, nil) + return Convert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(src, dst, nil) } func (dst *DockerMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineTemplateList) - return Convert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(src, dst, nil) + return Convert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(src, dst, nil) } -// Convert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *infrav1.DockerClusterSpec, out *DockerClusterSpec, s apiconversion.Scope) error { +// Convert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *infrav1.DockerClusterSpec, out *DockerClusterSpec, s apiconversion.Scope) error { // DockerClusterSpec.LoadBalancer was added in v1alpha4, so automatic conversion is not possible - return autoConvert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in, out, s) + return autoConvert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in, out, s) +} + +func Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in *infrav1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s apiconversion.Scope) error { + // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta2. + return autoConvert_v1beta2_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in, out, s) } -func Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in *infrav1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s apiconversion.Scope) error { - // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta1. - return autoConvert_v1beta1_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in, out, s) +// Convert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *infrav1.DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.NewCustomImage = in.CustomImage + return nil +} + +// Convert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in *infrav1.DockerMachineSpec, out *DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.CustomImage = in.NewCustomImage + return nil } diff --git a/test/infrastructure/docker/api/v1alpha3/conversion_test.go b/test/infrastructure/docker/api/v1alpha3/conversion_test.go index 234cdc14c917..181b8ebcaf62 100644 --- a/test/infrastructure/docker/api/v1alpha3/conversion_test.go +++ b/test/infrastructure/docker/api/v1alpha3/conversion_test.go @@ -19,7 +19,7 @@ package v1alpha3 import ( "testing" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) diff --git a/test/infrastructure/docker/api/v1alpha3/doc.go b/test/infrastructure/docker/api/v1alpha3/doc.go index 78f3cde2fb62..0b2d2d7d9584 100644 --- a/test/infrastructure/docker/api/v1alpha3/doc.go +++ b/test/infrastructure/docker/api/v1alpha3/doc.go @@ -15,5 +15,5 @@ limitations under the License. */ // Package v1alpha3 contains the v1alpha3 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2 package v1alpha3 diff --git a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go index d86ac186fff9..4662802d2a8f 100644 --- a/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha3/zz_generated.conversion.go @@ -27,8 +27,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" apiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - v1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) func init() { @@ -38,210 +38,210 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*APIEndpoint)(nil), (*v1beta1.APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(a.(*APIEndpoint), b.(*v1beta1.APIEndpoint), scope) + if err := s.AddGeneratedConversionFunc((*APIEndpoint)(nil), (*v1beta2.APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint(a.(*APIEndpoint), b.(*v1beta2.APIEndpoint), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.APIEndpoint)(nil), (*APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(a.(*v1beta1.APIEndpoint), b.(*APIEndpoint), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.APIEndpoint)(nil), (*APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint(a.(*v1beta2.APIEndpoint), b.(*APIEndpoint), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerCluster)(nil), (*v1beta1.DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(a.(*DockerCluster), b.(*v1beta1.DockerCluster), scope) + if err := s.AddGeneratedConversionFunc((*DockerCluster)(nil), (*v1beta2.DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(a.(*DockerCluster), b.(*v1beta2.DockerCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerCluster)(nil), (*DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(a.(*v1beta1.DockerCluster), b.(*DockerCluster), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerCluster)(nil), (*DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(a.(*v1beta2.DockerCluster), b.(*DockerCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterList)(nil), (*v1beta1.DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(a.(*DockerClusterList), b.(*v1beta1.DockerClusterList), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterList)(nil), (*v1beta2.DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList(a.(*DockerClusterList), b.(*v1beta2.DockerClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterList)(nil), (*DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(a.(*v1beta1.DockerClusterList), b.(*DockerClusterList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterList)(nil), (*DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList(a.(*v1beta2.DockerClusterList), b.(*DockerClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterSpec)(nil), (*v1beta1.DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(a.(*DockerClusterSpec), b.(*v1beta1.DockerClusterSpec), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterSpec)(nil), (*v1beta2.DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(a.(*DockerClusterSpec), b.(*v1beta2.DockerClusterSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterStatus)(nil), (*v1beta1.DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(a.(*DockerClusterStatus), b.(*v1beta1.DockerClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterStatus)(nil), (*v1beta2.DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(a.(*DockerClusterStatus), b.(*v1beta2.DockerClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterStatus)(nil), (*DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(a.(*v1beta1.DockerClusterStatus), b.(*DockerClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterStatus)(nil), (*DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(a.(*v1beta2.DockerClusterStatus), b.(*DockerClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachine)(nil), (*v1beta1.DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(a.(*DockerMachine), b.(*v1beta1.DockerMachine), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachine)(nil), (*v1beta2.DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(a.(*DockerMachine), b.(*v1beta2.DockerMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachine)(nil), (*DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(a.(*v1beta1.DockerMachine), b.(*DockerMachine), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachine)(nil), (*DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(a.(*v1beta2.DockerMachine), b.(*DockerMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineList)(nil), (*v1beta1.DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(a.(*DockerMachineList), b.(*v1beta1.DockerMachineList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineList)(nil), (*v1beta2.DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList(a.(*DockerMachineList), b.(*v1beta2.DockerMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineList)(nil), (*DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(a.(*v1beta1.DockerMachineList), b.(*DockerMachineList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineList)(nil), (*DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(a.(*v1beta2.DockerMachineList), b.(*DockerMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineSpec)(nil), (*v1beta1.DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(a.(*DockerMachineSpec), b.(*v1beta1.DockerMachineSpec), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineStatus)(nil), (*v1beta2.DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(a.(*DockerMachineStatus), b.(*v1beta2.DockerMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineSpec)(nil), (*DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(a.(*v1beta1.DockerMachineSpec), b.(*DockerMachineSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineStatus)(nil), (*DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(a.(*v1beta2.DockerMachineStatus), b.(*DockerMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineStatus)(nil), (*v1beta1.DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(a.(*DockerMachineStatus), b.(*v1beta1.DockerMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplate)(nil), (*v1beta2.DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(a.(*DockerMachineTemplate), b.(*v1beta2.DockerMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineStatus)(nil), (*DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(a.(*v1beta1.DockerMachineStatus), b.(*DockerMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplate)(nil), (*DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(a.(*v1beta2.DockerMachineTemplate), b.(*DockerMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplate)(nil), (*v1beta1.DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(a.(*DockerMachineTemplate), b.(*v1beta1.DockerMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateList)(nil), (*v1beta2.DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(a.(*DockerMachineTemplateList), b.(*v1beta2.DockerMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplate)(nil), (*DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(a.(*v1beta1.DockerMachineTemplate), b.(*DockerMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateList)(nil), (*DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(a.(*v1beta2.DockerMachineTemplateList), b.(*DockerMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateList)(nil), (*v1beta1.DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(a.(*DockerMachineTemplateList), b.(*v1beta1.DockerMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateResource)(nil), (*v1beta2.DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(a.(*DockerMachineTemplateResource), b.(*v1beta2.DockerMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplateList)(nil), (*DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(a.(*v1beta1.DockerMachineTemplateList), b.(*DockerMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateSpec)(nil), (*v1beta2.DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(a.(*DockerMachineTemplateSpec), b.(*v1beta2.DockerMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateResource)(nil), (*v1beta1.DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(a.(*DockerMachineTemplateResource), b.(*v1beta1.DockerMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateSpec)(nil), (*DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(a.(*v1beta2.DockerMachineTemplateSpec), b.(*DockerMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateSpec)(nil), (*v1beta1.DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(a.(*DockerMachineTemplateSpec), b.(*v1beta1.DockerMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*Mount)(nil), (*v1beta2.Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha3_Mount_To_v1beta2_Mount(a.(*Mount), b.(*v1beta2.Mount), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplateSpec)(nil), (*DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(a.(*v1beta1.DockerMachineTemplateSpec), b.(*DockerMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.Mount)(nil), (*Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_Mount_To_v1alpha3_Mount(a.(*v1beta2.Mount), b.(*Mount), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Mount)(nil), (*v1beta1.Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_Mount_To_v1beta1_Mount(a.(*Mount), b.(*v1beta1.Mount), scope) + if err := s.AddConversionFunc((*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 { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.Mount)(nil), (*Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Mount_To_v1alpha3_Mount(a.(*v1beta1.Mount), b.(*Mount), scope) + if err := s.AddConversionFunc((*v1beta2.DockerClusterSpec)(nil), (*DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(a.(*v1beta2.DockerClusterSpec), b.(*DockerClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1beta1.DockerClusterSpec)(nil), (*DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(a.(*v1beta1.DockerClusterSpec), b.(*DockerClusterSpec), scope) + 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 { return err } - if err := s.AddConversionFunc((*v1beta1.DockerMachineTemplateResource)(nil), (*DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(a.(*v1beta1.DockerMachineTemplateResource), b.(*DockerMachineTemplateResource), scope) + if err := s.AddConversionFunc((*v1beta2.DockerMachineTemplateResource)(nil), (*DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(a.(*v1beta2.DockerMachineTemplateResource), b.(*DockerMachineTemplateResource), scope) }); err != nil { return err } return nil } -func autoConvert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in *APIEndpoint, out *v1beta1.APIEndpoint, s conversion.Scope) error { +func autoConvert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port return nil } -// Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function. -func Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in *APIEndpoint, out *v1beta1.APIEndpoint, s conversion.Scope) error { - return autoConvert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s) +// Convert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint is an autogenerated conversion function. +func Convert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { + return autoConvert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint(in, out, s) } -func autoConvert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in *v1beta1.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { +func autoConvert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port return nil } -// Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint is an autogenerated conversion function. -func Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in *v1beta1.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { - return autoConvert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s) +// Convert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint is an autogenerated conversion function. +func Convert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { + return autoConvert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s) } -func autoConvert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(in *DockerCluster, out *v1beta1.DockerCluster, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster is an autogenerated conversion function. -func Convert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(in *DockerCluster, out *v1beta1.DockerCluster, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(in, out, s) +// Convert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster is an autogenerated conversion function. +func Convert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(in, out, s) } -func autoConvert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(in *v1beta1.DockerCluster, out *DockerCluster, s conversion.Scope) error { +func autoConvert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster is an autogenerated conversion function. -func Convert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(in *v1beta1.DockerCluster, out *DockerCluster, s conversion.Scope) error { - return autoConvert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(in, out, s) +// Convert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster is an autogenerated conversion function. +func Convert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { + return autoConvert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(in, out, s) } -func autoConvert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(in *DockerClusterList, out *v1beta1.DockerClusterList, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerCluster, len(*in)) + *out = make([]v1beta2.DockerCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha3_DockerCluster_To_v1beta1_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha3_DockerCluster_To_v1beta2_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -251,18 +251,18 @@ func autoConvert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(in *Doc return nil } -// Convert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList is an autogenerated conversion function. -func Convert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(in *DockerClusterList, out *v1beta1.DockerClusterList, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerClusterList_To_v1beta1_DockerClusterList(in, out, s) +// Convert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList is an autogenerated conversion function. +func Convert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerClusterList_To_v1beta2_DockerClusterList(in, out, s) } -func autoConvert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(in *v1beta1.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerCluster, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerCluster_To_v1alpha3_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerCluster_To_v1alpha3_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -272,20 +272,20 @@ func autoConvert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(in *v1b return nil } -// Convert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(in *v1beta1.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterList_To_v1alpha3_DockerClusterList(in, out, s) +// Convert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterList_To_v1alpha3_DockerClusterList(in, out, s) } -func autoConvert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *DockerClusterSpec, out *v1beta1.DockerClusterSpec, s conversion.Scope) error { - if err := Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { +func autoConvert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1alpha3_APIEndpoint_To_v1beta2_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) + *out = make(v1beta1.FailureDomains, len(*in)) for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) + newVal := new(v1beta1.FailureDomainSpec) if err := apiv1alpha3.Convert_v1alpha3_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { return err } @@ -297,13 +297,13 @@ func autoConvert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *Doc return nil } -// Convert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec is an autogenerated conversion function. -func Convert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *DockerClusterSpec, out *v1beta1.DockerClusterSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in, out, s) +// Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in, out, s) } -func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *v1beta1.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { - if err := Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { +func autoConvert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *v1beta2.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1beta2_APIEndpoint_To_v1alpha3_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } if in.FailureDomains != nil { @@ -323,13 +323,13 @@ func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha3_DockerClusterSpec(in *v1b return nil } -func autoConvert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) + *out = make(v1beta1.FailureDomains, len(*in)) for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) + newVal := new(v1beta1.FailureDomainSpec) if err := apiv1alpha3.Convert_v1alpha3_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { return err } @@ -340,7 +340,7 @@ func autoConvert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -352,12 +352,12 @@ func autoConvert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in return nil } -// Convert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in, out, s) +// Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in, out, s) } -func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains @@ -386,50 +386,50 @@ func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in return nil } -// Convert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in, out, s) +// Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in, out, s) } -func autoConvert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(in *DockerMachine, out *v1beta1.DockerMachine, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(in *DockerMachine, out *v1beta1.DockerMachine, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(in, out, s) +// Convert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(in, out, s) } -func autoConvert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(in *v1beta1.DockerMachine, out *DockerMachine, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine is an autogenerated conversion function. -func Convert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(in *v1beta1.DockerMachine, out *DockerMachine, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(in, out, s) +// Convert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine is an autogenerated conversion function. +func Convert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(in, out, s) } -func autoConvert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(in *DockerMachineList, out *v1beta1.DockerMachineList, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerMachine, len(*in)) + *out = make([]v1beta2.DockerMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha3_DockerMachine_To_v1beta1_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha3_DockerMachine_To_v1beta2_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -439,18 +439,18 @@ func autoConvert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(in *Doc return nil } -// Convert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(in *DockerMachineList, out *v1beta1.DockerMachineList, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineList_To_v1beta1_DockerMachineList(in, out, s) +// Convert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineList_To_v1beta2_DockerMachineList(in, out, s) } -func autoConvert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1beta1.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerMachine, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachine_To_v1alpha3_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachine_To_v1alpha3_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -460,45 +460,35 @@ func autoConvert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1b return nil } -// Convert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1beta1.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineList_To_v1alpha3_DockerMachineList(in, out, s) +// Convert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineList_To_v1alpha3_DockerMachineList(in, out, s) } -func autoConvert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *DockerMachineSpec, out *v1beta1.DockerMachineSpec, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.CustomImage = in.CustomImage + // WARNING: in.CustomImage requires manual conversion: does not exist in peer-type out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]v1beta1.Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) out.Bootstrapped = in.Bootstrapped return nil } -// Convert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *DockerMachineSpec, out *v1beta1.DockerMachineSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in, out, s) -} - -func autoConvert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in *v1beta1.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in *v1beta2.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.CustomImage = in.CustomImage + // WARNING: in.NewCustomImage requires manual conversion: does not exist in peer-type out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) out.Bootstrapped = in.Bootstrapped return nil } -// Convert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in *v1beta1.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(in, out, s) -} - -func autoConvert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) + *out = make([]v1beta1.MachineAddress, len(*in)) for i := range *in { if err := apiv1alpha3.Convert_v1alpha3_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -509,7 +499,7 @@ func autoConvert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -521,12 +511,12 @@ func autoConvert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in return nil } -// Convert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in, out, s) +// Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in, out, s) } -func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured if in.Addresses != nil { @@ -554,44 +544,44 @@ func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in return nil } -// Convert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in, out, s) +// Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in, out, s) } -func autoConvert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta1.DockerMachineTemplate, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta1.DockerMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in, out, s) +// Convert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *v1beta1.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *v1beta1.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in, out, s) +// Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in, out, s) } -func autoConvert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta1.DockerMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerMachineTemplate, len(*in)) + *out = make([]v1beta2.DockerMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha3_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha3_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -601,18 +591,18 @@ func autoConvert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemp return nil } -// Convert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta1.DockerMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in, out, s) +// Convert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in *v1beta1.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -622,75 +612,75 @@ func autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemp return nil } -// Convert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in *v1beta1.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in, out, s) +// Convert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateList_To_v1alpha3_DockerMachineTemplateList(in, out, s) } -func autoConvert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta1.DockerMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha3_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha3_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta1.DockerMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in, out, s) +// Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in *v1beta1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(in *v1beta2.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { // WARNING: in.ObjectMeta requires manual conversion: does not exist in peer-type - if err := Convert_v1beta1_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineSpec_To_v1alpha3_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func autoConvert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta1.DockerMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha3_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta1.DockerMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in, out, s) +// Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha3_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in *v1beta1.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha3_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in *v1beta1.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in, out, s) +// Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1alpha3_DockerMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha3_Mount_To_v1beta1_Mount(in *Mount, out *v1beta1.Mount, s conversion.Scope) error { +func autoConvert_v1alpha3_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { out.ContainerPath = in.ContainerPath out.HostPath = in.HostPath out.Readonly = in.Readonly return nil } -// Convert_v1alpha3_Mount_To_v1beta1_Mount is an autogenerated conversion function. -func Convert_v1alpha3_Mount_To_v1beta1_Mount(in *Mount, out *v1beta1.Mount, s conversion.Scope) error { - return autoConvert_v1alpha3_Mount_To_v1beta1_Mount(in, out, s) +// Convert_v1alpha3_Mount_To_v1beta2_Mount is an autogenerated conversion function. +func Convert_v1alpha3_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { + return autoConvert_v1alpha3_Mount_To_v1beta2_Mount(in, out, s) } -func autoConvert_v1beta1_Mount_To_v1alpha3_Mount(in *v1beta1.Mount, out *Mount, s conversion.Scope) error { +func autoConvert_v1beta2_Mount_To_v1alpha3_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { out.ContainerPath = in.ContainerPath out.HostPath = in.HostPath out.Readonly = in.Readonly return nil } -// Convert_v1beta1_Mount_To_v1alpha3_Mount is an autogenerated conversion function. -func Convert_v1beta1_Mount_To_v1alpha3_Mount(in *v1beta1.Mount, out *Mount, s conversion.Scope) error { - return autoConvert_v1beta1_Mount_To_v1alpha3_Mount(in, out, s) +// Convert_v1beta2_Mount_To_v1alpha3_Mount is an autogenerated conversion function. +func Convert_v1beta2_Mount_To_v1alpha3_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { + return autoConvert_v1beta2_Mount_To_v1alpha3_Mount(in, out, s) } diff --git a/test/infrastructure/docker/api/v1alpha4/conversion.go b/test/infrastructure/docker/api/v1alpha4/conversion.go index a1b42d8f4d53..c2f4531d1d3f 100644 --- a/test/infrastructure/docker/api/v1alpha4/conversion.go +++ b/test/infrastructure/docker/api/v1alpha4/conversion.go @@ -20,38 +20,38 @@ import ( apiconversion "k8s.io/apimachinery/pkg/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerCluster) - return Convert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(src, dst, nil) + return Convert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(src, dst, nil) } func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerCluster) - return Convert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(src, dst, nil) + return Convert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(src, dst, nil) } func (src *DockerClusterList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerClusterList) - return Convert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(src, dst, nil) + return Convert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList(src, dst, nil) } func (dst *DockerClusterList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerClusterList) - return Convert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(src, dst, nil) + return Convert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList(src, dst, nil) } func (src *DockerClusterTemplate) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerClusterTemplate) - if err := Convert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(src, dst, nil); err != nil { + if err := Convert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(src, dst, nil); err != nil { return err } @@ -69,7 +69,7 @@ func (src *DockerClusterTemplate) ConvertTo(dstRaw conversion.Hub) error { func (dst *DockerClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerClusterTemplate) - if err := Convert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(src, dst, nil); err != nil { + if err := Convert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(src, dst, nil); err != nil { return err } @@ -84,43 +84,43 @@ func (dst *DockerClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error { func (src *DockerClusterTemplateList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerClusterTemplateList) - return Convert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(src, dst, nil) + return Convert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(src, dst, nil) } func (dst *DockerClusterTemplateList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerClusterTemplateList) - return Convert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(src, dst, nil) + return Convert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(src, dst, nil) } func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachine) - return Convert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(src, dst, nil) + return Convert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(src, dst, nil) } func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachine) - return Convert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(src, dst, nil) + return Convert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(src, dst, nil) } func (src *DockerMachineList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineList) - return Convert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(src, dst, nil) + return Convert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList(src, dst, nil) } func (dst *DockerMachineList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineList) - return Convert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(src, dst, nil) + return Convert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(src, dst, nil) } func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineTemplate) - if err := Convert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(src, dst, nil); err != nil { + if err := Convert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(src, dst, nil); err != nil { return err } @@ -138,7 +138,7 @@ func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineTemplate) - if err := Convert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(src, dst, nil); err != nil { + if err := Convert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(src, dst, nil); err != nil { return err } @@ -153,21 +153,57 @@ func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error { func (src *DockerMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infrav1.DockerMachineTemplateList) - return Convert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(src, dst, nil) + return Convert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(src, dst, nil) } func (dst *DockerMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infrav1.DockerMachineTemplateList) - return Convert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(src, dst, nil) + return Convert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(src, dst, nil) } -func Convert_v1beta1_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in *infrav1.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s apiconversion.Scope) error { - // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta1. - return autoConvert_v1beta1_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in, out, s) +func Convert_v1beta2_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in *infrav1.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s apiconversion.Scope) error { + // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta2. + return autoConvert_v1beta2_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in, out, s) } -func Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in *infrav1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s apiconversion.Scope) error { - // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta1. - return autoConvert_v1beta1_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in, out, s) +func Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in *infrav1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s apiconversion.Scope) error { + // NOTE: custom conversion func is required because spec.template.metadata has been added in v1beta2. + return autoConvert_v1beta2_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in, out, s) +} + +// Convert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *infrav1.DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.NewCustomImage = in.CustomImage + return nil +} + +// Convert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in *infrav1.DockerMachineSpec, out *DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.CustomImage = in.NewCustomImage + return nil +} + +// Convert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta is an autogenerated conversion function. +func Convert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta(in *ImageMeta, out *infrav1.ImageMeta, s apiconversion.Scope) error { + if err := autoConvert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta(in, out, s); err != nil { + return err + } + out.NewImageRepository = in.ImageRepository + return nil +} + +// Convert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta is an autogenerated conversion function. +func Convert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta(in *infrav1.ImageMeta, out *ImageMeta, s apiconversion.Scope) error { + if err := autoConvert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta(in, out, s); err != nil { + return err + } + out.ImageRepository = in.NewImageRepository + return nil } diff --git a/test/infrastructure/docker/api/v1alpha4/conversion_test.go b/test/infrastructure/docker/api/v1alpha4/conversion_test.go index e48abaeedd51..0697a481a9bf 100644 --- a/test/infrastructure/docker/api/v1alpha4/conversion_test.go +++ b/test/infrastructure/docker/api/v1alpha4/conversion_test.go @@ -19,7 +19,7 @@ package v1alpha4 import ( "testing" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) diff --git a/test/infrastructure/docker/api/v1alpha4/doc.go b/test/infrastructure/docker/api/v1alpha4/doc.go index ac26282bb97d..68743f3925de 100644 --- a/test/infrastructure/docker/api/v1alpha4/doc.go +++ b/test/infrastructure/docker/api/v1alpha4/doc.go @@ -15,5 +15,5 @@ limitations under the License. */ // Package v1alpha4 contains the v1alpha4 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2 package v1alpha4 diff --git a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go index 9594641da789..849b3ccd4d06 100644 --- a/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go +++ b/test/infrastructure/docker/api/v1alpha4/zz_generated.conversion.go @@ -27,8 +27,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" apiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - v1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) func init() { @@ -38,270 +38,270 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*APIEndpoint)(nil), (*v1beta1.APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(a.(*APIEndpoint), b.(*v1beta1.APIEndpoint), scope) + if err := s.AddGeneratedConversionFunc((*APIEndpoint)(nil), (*v1beta2.APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint(a.(*APIEndpoint), b.(*v1beta2.APIEndpoint), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.APIEndpoint)(nil), (*APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(a.(*v1beta1.APIEndpoint), b.(*APIEndpoint), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.APIEndpoint)(nil), (*APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint(a.(*v1beta2.APIEndpoint), b.(*APIEndpoint), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerCluster)(nil), (*v1beta1.DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(a.(*DockerCluster), b.(*v1beta1.DockerCluster), scope) + if err := s.AddGeneratedConversionFunc((*DockerCluster)(nil), (*v1beta2.DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(a.(*DockerCluster), b.(*v1beta2.DockerCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerCluster)(nil), (*DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(a.(*v1beta1.DockerCluster), b.(*DockerCluster), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerCluster)(nil), (*DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(a.(*v1beta2.DockerCluster), b.(*DockerCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterList)(nil), (*v1beta1.DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(a.(*DockerClusterList), b.(*v1beta1.DockerClusterList), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterList)(nil), (*v1beta2.DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList(a.(*DockerClusterList), b.(*v1beta2.DockerClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterList)(nil), (*DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(a.(*v1beta1.DockerClusterList), b.(*DockerClusterList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterList)(nil), (*DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList(a.(*v1beta2.DockerClusterList), b.(*DockerClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterSpec)(nil), (*v1beta1.DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(a.(*DockerClusterSpec), b.(*v1beta1.DockerClusterSpec), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterSpec)(nil), (*v1beta2.DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(a.(*DockerClusterSpec), b.(*v1beta2.DockerClusterSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterSpec)(nil), (*DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(a.(*v1beta1.DockerClusterSpec), b.(*DockerClusterSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterSpec)(nil), (*DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(a.(*v1beta2.DockerClusterSpec), b.(*DockerClusterSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterStatus)(nil), (*v1beta1.DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(a.(*DockerClusterStatus), b.(*v1beta1.DockerClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterStatus)(nil), (*v1beta2.DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(a.(*DockerClusterStatus), b.(*v1beta2.DockerClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterStatus)(nil), (*DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(a.(*v1beta1.DockerClusterStatus), b.(*DockerClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterStatus)(nil), (*DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(a.(*v1beta2.DockerClusterStatus), b.(*DockerClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterTemplate)(nil), (*v1beta1.DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(a.(*DockerClusterTemplate), b.(*v1beta1.DockerClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplate)(nil), (*v1beta2.DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(a.(*DockerClusterTemplate), b.(*v1beta2.DockerClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterTemplate)(nil), (*DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(a.(*v1beta1.DockerClusterTemplate), b.(*DockerClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplate)(nil), (*DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(a.(*v1beta2.DockerClusterTemplate), b.(*DockerClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateList)(nil), (*v1beta1.DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(a.(*DockerClusterTemplateList), b.(*v1beta1.DockerClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateList)(nil), (*v1beta2.DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(a.(*DockerClusterTemplateList), b.(*v1beta2.DockerClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterTemplateList)(nil), (*DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(a.(*v1beta1.DockerClusterTemplateList), b.(*DockerClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplateList)(nil), (*DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(a.(*v1beta2.DockerClusterTemplateList), b.(*DockerClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateResource)(nil), (*v1beta1.DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(a.(*DockerClusterTemplateResource), b.(*v1beta1.DockerClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateResource)(nil), (*v1beta2.DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(a.(*DockerClusterTemplateResource), b.(*v1beta2.DockerClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateSpec)(nil), (*v1beta1.DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(a.(*DockerClusterTemplateSpec), b.(*v1beta1.DockerClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateSpec)(nil), (*v1beta2.DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(a.(*DockerClusterTemplateSpec), b.(*v1beta2.DockerClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerClusterTemplateSpec)(nil), (*DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(a.(*v1beta1.DockerClusterTemplateSpec), b.(*DockerClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplateSpec)(nil), (*DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(a.(*v1beta2.DockerClusterTemplateSpec), b.(*DockerClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerLoadBalancer)(nil), (*v1beta1.DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(a.(*DockerLoadBalancer), b.(*v1beta1.DockerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*DockerLoadBalancer)(nil), (*v1beta2.DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(a.(*DockerLoadBalancer), b.(*v1beta2.DockerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerLoadBalancer)(nil), (*DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(a.(*v1beta1.DockerLoadBalancer), b.(*DockerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerLoadBalancer)(nil), (*DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(a.(*v1beta2.DockerLoadBalancer), b.(*DockerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachine)(nil), (*v1beta1.DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(a.(*DockerMachine), b.(*v1beta1.DockerMachine), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachine)(nil), (*v1beta2.DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(a.(*DockerMachine), b.(*v1beta2.DockerMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachine)(nil), (*DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(a.(*v1beta1.DockerMachine), b.(*DockerMachine), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachine)(nil), (*DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(a.(*v1beta2.DockerMachine), b.(*DockerMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineList)(nil), (*v1beta1.DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(a.(*DockerMachineList), b.(*v1beta1.DockerMachineList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineList)(nil), (*v1beta2.DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList(a.(*DockerMachineList), b.(*v1beta2.DockerMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineList)(nil), (*DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(a.(*v1beta1.DockerMachineList), b.(*DockerMachineList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineList)(nil), (*DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(a.(*v1beta2.DockerMachineList), b.(*DockerMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineSpec)(nil), (*v1beta1.DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(a.(*DockerMachineSpec), b.(*v1beta1.DockerMachineSpec), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineStatus)(nil), (*v1beta2.DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(a.(*DockerMachineStatus), b.(*v1beta2.DockerMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineSpec)(nil), (*DockerMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(a.(*v1beta1.DockerMachineSpec), b.(*DockerMachineSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineStatus)(nil), (*DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(a.(*v1beta2.DockerMachineStatus), b.(*DockerMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineStatus)(nil), (*v1beta1.DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(a.(*DockerMachineStatus), b.(*v1beta1.DockerMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplate)(nil), (*v1beta2.DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(a.(*DockerMachineTemplate), b.(*v1beta2.DockerMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineStatus)(nil), (*DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(a.(*v1beta1.DockerMachineStatus), b.(*DockerMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplate)(nil), (*DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(a.(*v1beta2.DockerMachineTemplate), b.(*DockerMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplate)(nil), (*v1beta1.DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(a.(*DockerMachineTemplate), b.(*v1beta1.DockerMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateList)(nil), (*v1beta2.DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(a.(*DockerMachineTemplateList), b.(*v1beta2.DockerMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplate)(nil), (*DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(a.(*v1beta1.DockerMachineTemplate), b.(*DockerMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateList)(nil), (*DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(a.(*v1beta2.DockerMachineTemplateList), b.(*DockerMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateList)(nil), (*v1beta1.DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(a.(*DockerMachineTemplateList), b.(*v1beta1.DockerMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateResource)(nil), (*v1beta2.DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(a.(*DockerMachineTemplateResource), b.(*v1beta2.DockerMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplateList)(nil), (*DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(a.(*v1beta1.DockerMachineTemplateList), b.(*DockerMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateSpec)(nil), (*v1beta2.DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(a.(*DockerMachineTemplateSpec), b.(*v1beta2.DockerMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateResource)(nil), (*v1beta1.DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(a.(*DockerMachineTemplateResource), b.(*v1beta1.DockerMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateSpec)(nil), (*DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(a.(*v1beta2.DockerMachineTemplateSpec), b.(*DockerMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateSpec)(nil), (*v1beta1.DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(a.(*DockerMachineTemplateSpec), b.(*v1beta1.DockerMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*Mount)(nil), (*v1beta2.Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_Mount_To_v1beta2_Mount(a.(*Mount), b.(*v1beta2.Mount), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.DockerMachineTemplateSpec)(nil), (*DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(a.(*v1beta1.DockerMachineTemplateSpec), b.(*DockerMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta2.Mount)(nil), (*Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_Mount_To_v1alpha4_Mount(a.(*v1beta2.Mount), b.(*Mount), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ImageMeta)(nil), (*v1beta1.ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta(a.(*ImageMeta), b.(*v1beta1.ImageMeta), scope) + if err := s.AddConversionFunc((*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 { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.ImageMeta)(nil), (*ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta(a.(*v1beta1.ImageMeta), b.(*ImageMeta), scope) + if err := s.AddConversionFunc((*ImageMeta)(nil), (*v1beta2.ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta(a.(*ImageMeta), b.(*v1beta2.ImageMeta), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Mount)(nil), (*v1beta1.Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_Mount_To_v1beta1_Mount(a.(*Mount), b.(*v1beta1.Mount), scope) + if err := s.AddConversionFunc((*v1beta2.DockerClusterTemplateResource)(nil), (*DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(a.(*v1beta2.DockerClusterTemplateResource), b.(*DockerClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.Mount)(nil), (*Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Mount_To_v1alpha4_Mount(a.(*v1beta1.Mount), b.(*Mount), scope) + 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 { return err } - if err := s.AddConversionFunc((*v1beta1.DockerClusterTemplateResource)(nil), (*DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(a.(*v1beta1.DockerClusterTemplateResource), b.(*DockerClusterTemplateResource), scope) + if err := s.AddConversionFunc((*v1beta2.DockerMachineTemplateResource)(nil), (*DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(a.(*v1beta2.DockerMachineTemplateResource), b.(*DockerMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1beta1.DockerMachineTemplateResource)(nil), (*DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(a.(*v1beta1.DockerMachineTemplateResource), b.(*DockerMachineTemplateResource), scope) + if err := s.AddConversionFunc((*v1beta2.ImageMeta)(nil), (*ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta(a.(*v1beta2.ImageMeta), b.(*ImageMeta), scope) }); err != nil { return err } return nil } -func autoConvert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in *APIEndpoint, out *v1beta1.APIEndpoint, s conversion.Scope) error { +func autoConvert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port return nil } -// Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function. -func Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in *APIEndpoint, out *v1beta1.APIEndpoint, s conversion.Scope) error { - return autoConvert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s) +// Convert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint is an autogenerated conversion function. +func Convert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { + return autoConvert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint(in, out, s) } -func autoConvert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in *v1beta1.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { +func autoConvert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port return nil } -// Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint is an autogenerated conversion function. -func Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in *v1beta1.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { - return autoConvert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s) +// Convert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint is an autogenerated conversion function. +func Convert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { + return autoConvert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s) } -func autoConvert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(in *DockerCluster, out *v1beta1.DockerCluster, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster is an autogenerated conversion function. -func Convert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(in *DockerCluster, out *v1beta1.DockerCluster, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(in, out, s) +// Convert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster is an autogenerated conversion function. +func Convert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(in, out, s) } -func autoConvert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(in *v1beta1.DockerCluster, out *DockerCluster, s conversion.Scope) error { +func autoConvert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster is an autogenerated conversion function. -func Convert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(in *v1beta1.DockerCluster, out *DockerCluster, s conversion.Scope) error { - return autoConvert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(in, out, s) +// Convert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster is an autogenerated conversion function. +func Convert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { + return autoConvert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(in, out, s) } -func autoConvert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(in *DockerClusterList, out *v1beta1.DockerClusterList, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerCluster, len(*in)) + *out = make([]v1beta2.DockerCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerCluster_To_v1beta1_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerCluster_To_v1beta2_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -311,18 +311,18 @@ func autoConvert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(in *Doc return nil } -// Convert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(in *DockerClusterList, out *v1beta1.DockerClusterList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterList_To_v1beta1_DockerClusterList(in, out, s) +// Convert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterList_To_v1beta2_DockerClusterList(in, out, s) } -func autoConvert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(in *v1beta1.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerCluster, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerCluster_To_v1alpha4_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerCluster_To_v1alpha4_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -332,20 +332,20 @@ func autoConvert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(in *v1b return nil } -// Convert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(in *v1beta1.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterList_To_v1alpha4_DockerClusterList(in, out, s) +// Convert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterList_To_v1alpha4_DockerClusterList(in, out, s) } -func autoConvert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *DockerClusterSpec, out *v1beta1.DockerClusterSpec, s conversion.Scope) error { - if err := Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { +func autoConvert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1alpha4_APIEndpoint_To_v1beta2_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) + *out = make(v1beta1.FailureDomains, len(*in)) for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) + newVal := new(v1beta1.FailureDomainSpec) if err := apiv1alpha4.Convert_v1alpha4_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { return err } @@ -354,19 +354,19 @@ func autoConvert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *Doc } else { out.FailureDomains = nil } - if err := Convert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { + if err := Convert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *DockerClusterSpec, out *v1beta1.DockerClusterSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in, out, s) +// Convert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in, out, s) } -func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1beta1.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { - if err := Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { +func autoConvert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1beta2.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1beta2_APIEndpoint_To_v1alpha4_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { return err } if in.FailureDomains != nil { @@ -382,24 +382,24 @@ func autoConvert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1b } else { out.FailureDomains = nil } - if err := Convert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { + if err := Convert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1beta1.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in, out, s) +// Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in *v1beta2.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(in, out, s) } -func autoConvert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains - *out = make(apiv1beta1.FailureDomains, len(*in)) + *out = make(v1beta1.FailureDomains, len(*in)) for key, val := range *in { - newVal := new(apiv1beta1.FailureDomainSpec) + newVal := new(v1beta1.FailureDomainSpec) if err := apiv1alpha4.Convert_v1alpha4_FailureDomainSpec_To_v1beta1_FailureDomainSpec(&val, newVal, s); err != nil { return err } @@ -410,7 +410,7 @@ func autoConvert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -422,12 +422,12 @@ func autoConvert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in return nil } -// Convert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *DockerClusterStatus, out *v1beta1.DockerClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in, out, s) +// Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in, out, s) } -func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains @@ -456,44 +456,44 @@ func autoConvert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in return nil } -// Convert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *v1beta1.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in, out, s) +// Convert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in, out, s) } -func autoConvert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta1.DockerClusterTemplate, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta2.DockerClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta1.DockerClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in, out, s) +// Convert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta2.DockerClusterTemplate, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in, out, s) } -func autoConvert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in *v1beta1.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in *v1beta2.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in *v1beta1.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in, out, s) +// Convert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in *v1beta2.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(in, out, s) } -func autoConvert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta1.DockerClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta2.DockerClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerClusterTemplate, len(*in)) + *out = make([]v1beta2.DockerClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -503,18 +503,18 @@ func autoConvert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemp return nil } -// Convert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta1.DockerClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in, out, s) +// Convert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta2.DockerClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in, out, s) } -func autoConvert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in *v1beta1.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in *v1beta2.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerClusterTemplate_To_v1alpha4_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -524,118 +524,118 @@ func autoConvert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemp return nil } -// Convert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in *v1beta1.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in, out, s) +// Convert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in *v1beta2.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplateList_To_v1alpha4_DockerClusterTemplateList(in, out, s) } -func autoConvert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta1.DockerClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerClusterSpec_To_v1beta1_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta2.DockerClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha4_DockerClusterSpec_To_v1beta2_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta1.DockerClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in, out, s) +// Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta2.DockerClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in, out, s) } -func autoConvert_v1beta1_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in *v1beta1.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s conversion.Scope) error { +func autoConvert_v1beta2_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(in *v1beta2.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s conversion.Scope) error { // WARNING: in.ObjectMeta requires manual conversion: does not exist in peer-type - if err := Convert_v1beta1_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerClusterSpec_To_v1alpha4_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func autoConvert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta1.DockerClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta2.DockerClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha4_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta1.DockerClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in, out, s) +// Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta2.DockerClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in, out, s) } -func autoConvert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in *v1beta1.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in *v1beta2.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerClusterTemplateResource_To_v1alpha4_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in *v1beta1.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in, out, s) +// Convert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in *v1beta2.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplateSpec_To_v1alpha4_DockerClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta1.DockerLoadBalancer, s conversion.Scope) error { - if err := Convert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { +func autoConvert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta2.DockerLoadBalancer, s conversion.Scope) error { + if err := Convert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta1.DockerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in, out, s) +// Convert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer is an autogenerated conversion function. +func Convert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta2.DockerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in, out, s) } -func autoConvert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in *v1beta1.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { - if err := Convert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { +func autoConvert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in *v1beta2.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { + if err := Convert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer is an autogenerated conversion function. -func Convert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in *v1beta1.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1beta1_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in, out, s) +// Convert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer is an autogenerated conversion function. +func Convert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in *v1beta2.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta2_DockerLoadBalancer_To_v1alpha4_DockerLoadBalancer(in, out, s) } -func autoConvert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(in *DockerMachine, out *v1beta1.DockerMachine, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(in *DockerMachine, out *v1beta1.DockerMachine, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(in, out, s) +// Convert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(in, out, s) } -func autoConvert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(in *v1beta1.DockerMachine, out *DockerMachine, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine is an autogenerated conversion function. -func Convert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(in *v1beta1.DockerMachine, out *DockerMachine, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(in, out, s) +// Convert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine is an autogenerated conversion function. +func Convert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(in, out, s) } -func autoConvert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(in *DockerMachineList, out *v1beta1.DockerMachineList, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerMachine, len(*in)) + *out = make([]v1beta2.DockerMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerMachine_To_v1beta1_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerMachine_To_v1beta2_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -645,18 +645,18 @@ func autoConvert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(in *Doc return nil } -// Convert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(in *DockerMachineList, out *v1beta1.DockerMachineList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineList_To_v1beta1_DockerMachineList(in, out, s) +// Convert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineList_To_v1beta2_DockerMachineList(in, out, s) } -func autoConvert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1beta1.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerMachine, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachine_To_v1alpha4_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachine_To_v1alpha4_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -666,45 +666,35 @@ func autoConvert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1b return nil } -// Convert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1beta1.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineList_To_v1alpha4_DockerMachineList(in, out, s) +// Convert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineList_To_v1alpha4_DockerMachineList(in, out, s) } -func autoConvert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *DockerMachineSpec, out *v1beta1.DockerMachineSpec, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.CustomImage = in.CustomImage + // WARNING: in.CustomImage requires manual conversion: does not exist in peer-type out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) - out.ExtraMounts = *(*[]v1beta1.Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) out.Bootstrapped = in.Bootstrapped return nil } -// Convert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *DockerMachineSpec, out *v1beta1.DockerMachineSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in, out, s) -} - -func autoConvert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in *v1beta1.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in *v1beta2.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) - out.CustomImage = in.CustomImage + // WARNING: in.NewCustomImage requires manual conversion: does not exist in peer-type out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) out.Bootstrapped = in.Bootstrapped return nil } -// Convert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in *v1beta1.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(in, out, s) -} - -func autoConvert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) + *out = make([]v1beta1.MachineAddress, len(*in)) for i := range *in { if err := apiv1alpha4.Convert_v1alpha4_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -715,7 +705,7 @@ func autoConvert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -727,12 +717,12 @@ func autoConvert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in return nil } -// Convert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *DockerMachineStatus, out *v1beta1.DockerMachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in, out, s) +// Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in, out, s) } -func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.LoadBalancerConfigured = in.LoadBalancerConfigured if in.Addresses != nil { @@ -760,44 +750,44 @@ func autoConvert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in return nil } -// Convert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *v1beta1.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in, out, s) +// Convert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in, out, s) } -func autoConvert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta1.DockerMachineTemplate, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta1.DockerMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in, out, s) +// Convert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in *v1beta1.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in *v1beta1.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in, out, s) +// Convert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(in, out, s) } -func autoConvert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta1.DockerMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1beta1.DockerMachineTemplate, len(*in)) + *out = make([]v1beta2.DockerMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -807,18 +797,18 @@ func autoConvert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemp return nil } -// Convert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta1.DockerMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in, out, s) +// Convert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in *v1beta1.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]DockerMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachineTemplate_To_v1alpha4_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -828,97 +818,87 @@ func autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemp return nil } -// Convert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in *v1beta1.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in, out, s) +// Convert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateList_To_v1alpha4_DockerMachineTemplateList(in, out, s) } -func autoConvert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta1.DockerMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha4_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta1.DockerMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in, out, s) +// Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in *v1beta1.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(in *v1beta2.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { // WARNING: in.ObjectMeta requires manual conversion: does not exist in peer-type - if err := Convert_v1beta1_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachineSpec_To_v1alpha4_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func autoConvert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta1.DockerMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha4_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta1.DockerMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in, out, s) +// Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha4_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in, out, s) } -func autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in *v1beta1.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachineTemplateResource_To_v1alpha4_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in *v1beta1.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in, out, s) +// Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1alpha4_DockerMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta(in *ImageMeta, out *v1beta1.ImageMeta, s conversion.Scope) error { - out.ImageRepository = in.ImageRepository - out.ImageTag = in.ImageTag +func autoConvert_v1alpha4_ImageMeta_To_v1beta2_ImageMeta(in *ImageMeta, out *v1beta2.ImageMeta, s conversion.Scope) error { + // WARNING: in.ImageRepository requires manual conversion: does not exist in peer-type + // WARNING: in.ImageTag requires manual conversion: does not exist in peer-type return nil } -// Convert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta is an autogenerated conversion function. -func Convert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta(in *ImageMeta, out *v1beta1.ImageMeta, s conversion.Scope) error { - return autoConvert_v1alpha4_ImageMeta_To_v1beta1_ImageMeta(in, out, s) -} - -func autoConvert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta(in *v1beta1.ImageMeta, out *ImageMeta, s conversion.Scope) error { - out.ImageRepository = in.ImageRepository - out.ImageTag = in.ImageTag +func autoConvert_v1beta2_ImageMeta_To_v1alpha4_ImageMeta(in *v1beta2.ImageMeta, out *ImageMeta, s conversion.Scope) error { + // WARNING: in.NewImageRepository requires manual conversion: does not exist in peer-type + // WARNING: in.NewField requires manual conversion: does not exist in peer-type return nil } -// Convert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta is an autogenerated conversion function. -func Convert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta(in *v1beta1.ImageMeta, out *ImageMeta, s conversion.Scope) error { - return autoConvert_v1beta1_ImageMeta_To_v1alpha4_ImageMeta(in, out, s) -} - -func autoConvert_v1alpha4_Mount_To_v1beta1_Mount(in *Mount, out *v1beta1.Mount, s conversion.Scope) error { +func autoConvert_v1alpha4_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { out.ContainerPath = in.ContainerPath out.HostPath = in.HostPath out.Readonly = in.Readonly return nil } -// Convert_v1alpha4_Mount_To_v1beta1_Mount is an autogenerated conversion function. -func Convert_v1alpha4_Mount_To_v1beta1_Mount(in *Mount, out *v1beta1.Mount, s conversion.Scope) error { - return autoConvert_v1alpha4_Mount_To_v1beta1_Mount(in, out, s) +// Convert_v1alpha4_Mount_To_v1beta2_Mount is an autogenerated conversion function. +func Convert_v1alpha4_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { + return autoConvert_v1alpha4_Mount_To_v1beta2_Mount(in, out, s) } -func autoConvert_v1beta1_Mount_To_v1alpha4_Mount(in *v1beta1.Mount, out *Mount, s conversion.Scope) error { +func autoConvert_v1beta2_Mount_To_v1alpha4_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { out.ContainerPath = in.ContainerPath out.HostPath = in.HostPath out.Readonly = in.Readonly return nil } -// Convert_v1beta1_Mount_To_v1alpha4_Mount is an autogenerated conversion function. -func Convert_v1beta1_Mount_To_v1alpha4_Mount(in *v1beta1.Mount, out *Mount, s conversion.Scope) error { - return autoConvert_v1beta1_Mount_To_v1alpha4_Mount(in, out, s) +// Convert_v1beta2_Mount_To_v1alpha4_Mount is an autogenerated conversion function. +func Convert_v1beta2_Mount_To_v1alpha4_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { + return autoConvert_v1beta2_Mount_To_v1alpha4_Mount(in, out, s) } diff --git a/test/infrastructure/docker/api/v1beta1/conversion.go b/test/infrastructure/docker/api/v1beta1/conversion.go index ee6316e46656..4291dd9ed15d 100644 --- a/test/infrastructure/docker/api/v1beta1/conversion.go +++ b/test/infrastructure/docker/api/v1beta1/conversion.go @@ -16,11 +16,185 @@ limitations under the License. package v1beta1 -func (*DockerCluster) Hub() {} -func (*DockerClusterList) Hub() {} -func (*DockerClusterTemplate) Hub() {} -func (*DockerClusterTemplateList) Hub() {} -func (*DockerMachine) Hub() {} -func (*DockerMachineList) Hub() {} -func (*DockerMachineTemplate) Hub() {} -func (*DockerMachineTemplateList) Hub() {} +import ( + "fmt" + + apiconversion "k8s.io/apimachinery/pkg/conversion" + "sigs.k8s.io/controller-runtime/pkg/conversion" + + utilconversion "sigs.k8s.io/cluster-api/util/conversion" + + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" +) + +func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerCluster) + if err := Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(src, dst, nil); err != nil { + return err + } + + // Manually restore data. + restored := &infrav1.DockerCluster{} + if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { + return err + } + + dst.Spec.LoadBalancer.ImageMeta.NewField = restored.Spec.LoadBalancer.ImageMeta.NewField + + return nil +} + +func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerCluster) + if err := Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(src, dst, nil); err != nil { + return err + } + + // Preserve Hub data on down-conversion except for metadata + if err := utilconversion.MarshalData(src, dst); err != nil { + return err + } + + return nil +} + +func (src *DockerClusterList) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerClusterList) + + return Convert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList(src, dst, nil) +} + +func (dst *DockerClusterList) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerClusterList) + + return Convert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList(src, dst, nil) +} + +func (src *DockerClusterTemplate) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerClusterTemplate) + + return Convert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(src, dst, nil) +} + +func (dst *DockerClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerClusterTemplate) + + return Convert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(src, dst, nil) +} + +func (src *DockerClusterTemplateList) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerClusterTemplateList) + + return Convert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(src, dst, nil) +} + +func (dst *DockerClusterTemplateList) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerClusterTemplateList) + + return Convert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(src, dst, nil) +} + +func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachine) + + return Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(src, dst, nil) +} + +func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachine) + + return Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(src, dst, nil) +} + +func (src *DockerMachineList) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachineList) + + return Convert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList(src, dst, nil) +} + +func (dst *DockerMachineList) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachineList) + + return Convert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(src, dst, nil) +} + +func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachineTemplate) + fmt.Println("DEBUG: Convert DockerMachineTemplate v1beta1 => v1beta2") + if err := Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(src, dst, nil); err != nil { + return err + } + + // Manually restore data. + restored := &infrav1.DockerMachineTemplate{} + if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok { + return err + } + + // Just for testing, not actually restoring anything + + return nil +} + +func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachineTemplate) + fmt.Println("DEBUG: Convert DockerMachineTemplate v1beta2 => v1beta1") + if err := Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(src, dst, nil); err != nil { + return err + } + + // Preserve Hub data on down-conversion except for metadata + if err := utilconversion.MarshalData(src, dst); err != nil { + return err + } + + return nil +} + +func (src *DockerMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infrav1.DockerMachineTemplateList) + + return Convert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(src, dst, nil) +} + +func (dst *DockerMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infrav1.DockerMachineTemplateList) + + return Convert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(src, dst, nil) +} + +// Convert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *infrav1.DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.NewCustomImage = in.CustomImage + return nil +} + +// Convert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *infrav1.DockerMachineSpec, out *DockerMachineSpec, s apiconversion.Scope) error { + if err := autoConvert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in, out, s); err != nil { + return err + } + out.CustomImage = in.NewCustomImage + return nil +} + +// Convert_v1beta1_ImageMeta_To_v1beta2_ImageMeta is an autogenerated conversion function. +func Convert_v1beta1_ImageMeta_To_v1beta2_ImageMeta(in *ImageMeta, out *infrav1.ImageMeta, s apiconversion.Scope) error { + if err := autoConvert_v1beta1_ImageMeta_To_v1beta2_ImageMeta(in, out, s); err != nil { + return err + } + out.NewImageRepository = in.ImageRepository + return nil +} + +// Convert_v1beta2_ImageMeta_To_v1beta1_ImageMeta is an autogenerated conversion function. +func Convert_v1beta2_ImageMeta_To_v1beta1_ImageMeta(in *infrav1.ImageMeta, out *ImageMeta, s apiconversion.Scope) error { + if err := autoConvert_v1beta2_ImageMeta_To_v1beta1_ImageMeta(in, out, s); err != nil { + return err + } + out.ImageRepository = in.NewImageRepository + return nil +} diff --git a/test/infrastructure/docker/api/v1beta1/conversion_test.go b/test/infrastructure/docker/api/v1beta1/conversion_test.go new file mode 100644 index 000000000000..30c4d3d2f4cf --- /dev/null +++ b/test/infrastructure/docker/api/v1beta1/conversion_test.go @@ -0,0 +1,46 @@ +/* +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 ( + "testing" + + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" + utilconversion "sigs.k8s.io/cluster-api/util/conversion" +) + +func TestFuzzyConversion(t *testing.T) { + t.Run("for DockerCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerCluster{}, + Spoke: &DockerCluster{}, + })) + + t.Run("for DockerClusterTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerClusterTemplate{}, + Spoke: &DockerClusterTemplate{}, + })) + + t.Run("for DockerMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachine{}, + Spoke: &DockerMachine{}, + })) + + t.Run("for DockerMachineTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infrav1.DockerMachineTemplate{}, + Spoke: &DockerMachineTemplate{}, + })) +} diff --git a/test/infrastructure/docker/api/v1beta1/doc.go b/test/infrastructure/docker/api/v1beta1/doc.go index d55ab5609a7b..4b05d4018060 100644 --- a/test/infrastructure/docker/api/v1beta1/doc.go +++ b/test/infrastructure/docker/api/v1beta1/doc.go @@ -14,4 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ +// Package v1beta1 contains the v1alpha4 API implementation. +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2 package v1beta1 diff --git a/test/infrastructure/docker/api/v1beta1/dockercluster_types.go b/test/infrastructure/docker/api/v1beta1/dockercluster_types.go index ab2b7e83b55b..e17eb448eb6c 100644 --- a/test/infrastructure/docker/api/v1beta1/dockercluster_types.go +++ b/test/infrastructure/docker/api/v1beta1/dockercluster_types.go @@ -96,7 +96,6 @@ type APIEndpoint struct { // +kubebuilder:resource:path=dockerclusters,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status -// +kubebuilder:storageversion // +kubebuilder:object:root=true // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerCluster" diff --git a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go b/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go index 8ce477f0503d..6700e30fc7b8 100644 --- a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go +++ b/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go @@ -28,7 +28,6 @@ type DockerClusterTemplateSpec struct { } // +kubebuilder:object:root=true -// +kubebuilder:storageversion // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerClusterTemplate" // DockerClusterTemplate is the Schema for the dockerclustertemplates API. diff --git a/test/infrastructure/docker/api/v1beta1/dockermachine_types.go b/test/infrastructure/docker/api/v1beta1/dockermachine_types.go index 92f2e3c50ca7..8e604df71657 100644 --- a/test/infrastructure/docker/api/v1beta1/dockermachine_types.go +++ b/test/infrastructure/docker/api/v1beta1/dockermachine_types.go @@ -94,7 +94,6 @@ type DockerMachineStatus struct { // +kubebuilder:resource:path=dockermachines,scope=Namespaced,categories=cluster-api // +kubebuilder:object:root=true -// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster" // +kubebuilder:printcolumn:name="Machine",type="string",JSONPath=".metadata.ownerReferences[?(@.kind==\"Machine\")].name",description="Machine object which owns with this DockerMachine" diff --git a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go index 633913ca7d4b..30383478fbfc 100644 --- a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go +++ b/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go @@ -29,7 +29,6 @@ type DockerMachineTemplateSpec struct { // +kubebuilder:object:root=true // +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api -// +kubebuilder:storageversion // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachineTemplate" // DockerMachineTemplate is the Schema for the dockermachinetemplates API. diff --git a/test/infrastructure/docker/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/api/v1beta1/groupversion_info.go index 3715bbfa5beb..fbe4775052e1 100644 --- a/test/infrastructure/docker/api/v1beta1/groupversion_info.go +++ b/test/infrastructure/docker/api/v1beta1/groupversion_info.go @@ -33,4 +33,6 @@ var ( // AddToScheme adds the types in this group-version to the given scheme. AddToScheme = SchemeBuilder.AddToScheme + + localSchemeBuilder = SchemeBuilder.SchemeBuilder ) diff --git a/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go b/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go new file mode 100644 index 000000000000..41c53d9ddfc9 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go @@ -0,0 +1,807 @@ +//go:build !ignore_autogenerated_capd +// +build !ignore_autogenerated_capd + +/* +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" + + conversion "k8s.io/apimachinery/pkg/conversion" + runtime "k8s.io/apimachinery/pkg/runtime" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta2 "sigs.k8s.io/cluster-api/test/infrastructure/docker/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((*APIEndpoint)(nil), (*v1beta2.APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint(a.(*APIEndpoint), b.(*v1beta2.APIEndpoint), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.APIEndpoint)(nil), (*APIEndpoint)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint(a.(*v1beta2.APIEndpoint), b.(*APIEndpoint), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerCluster)(nil), (*v1beta2.DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(a.(*DockerCluster), b.(*v1beta2.DockerCluster), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerCluster)(nil), (*DockerCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(a.(*v1beta2.DockerCluster), b.(*DockerCluster), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterList)(nil), (*v1beta2.DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList(a.(*DockerClusterList), b.(*v1beta2.DockerClusterList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterList)(nil), (*DockerClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList(a.(*v1beta2.DockerClusterList), b.(*DockerClusterList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterSpec)(nil), (*v1beta2.DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(a.(*DockerClusterSpec), b.(*v1beta2.DockerClusterSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterSpec)(nil), (*DockerClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(a.(*v1beta2.DockerClusterSpec), b.(*DockerClusterSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterStatus)(nil), (*v1beta2.DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(a.(*DockerClusterStatus), b.(*v1beta2.DockerClusterStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterStatus)(nil), (*DockerClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(a.(*v1beta2.DockerClusterStatus), b.(*DockerClusterStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplate)(nil), (*v1beta2.DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(a.(*DockerClusterTemplate), b.(*v1beta2.DockerClusterTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplate)(nil), (*DockerClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(a.(*v1beta2.DockerClusterTemplate), b.(*DockerClusterTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateList)(nil), (*v1beta2.DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(a.(*DockerClusterTemplateList), b.(*v1beta2.DockerClusterTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplateList)(nil), (*DockerClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(a.(*v1beta2.DockerClusterTemplateList), b.(*DockerClusterTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateResource)(nil), (*v1beta2.DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(a.(*DockerClusterTemplateResource), b.(*v1beta2.DockerClusterTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplateResource)(nil), (*DockerClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(a.(*v1beta2.DockerClusterTemplateResource), b.(*DockerClusterTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerClusterTemplateSpec)(nil), (*v1beta2.DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(a.(*DockerClusterTemplateSpec), b.(*v1beta2.DockerClusterTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerClusterTemplateSpec)(nil), (*DockerClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(a.(*v1beta2.DockerClusterTemplateSpec), b.(*DockerClusterTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerLoadBalancer)(nil), (*v1beta2.DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(a.(*DockerLoadBalancer), b.(*v1beta2.DockerLoadBalancer), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerLoadBalancer)(nil), (*DockerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(a.(*v1beta2.DockerLoadBalancer), b.(*DockerLoadBalancer), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachine)(nil), (*v1beta2.DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(a.(*DockerMachine), b.(*v1beta2.DockerMachine), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachine)(nil), (*DockerMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(a.(*v1beta2.DockerMachine), b.(*DockerMachine), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineList)(nil), (*v1beta2.DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList(a.(*DockerMachineList), b.(*v1beta2.DockerMachineList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineList)(nil), (*DockerMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(a.(*v1beta2.DockerMachineList), b.(*DockerMachineList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineStatus)(nil), (*v1beta2.DockerMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(a.(*DockerMachineStatus), b.(*v1beta2.DockerMachineStatus), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*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 { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplate)(nil), (*v1beta2.DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(a.(*DockerMachineTemplate), b.(*v1beta2.DockerMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplate)(nil), (*DockerMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(a.(*v1beta2.DockerMachineTemplate), b.(*DockerMachineTemplate), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateList)(nil), (*v1beta2.DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(a.(*DockerMachineTemplateList), b.(*v1beta2.DockerMachineTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateList)(nil), (*DockerMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(a.(*v1beta2.DockerMachineTemplateList), b.(*DockerMachineTemplateList), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateResource)(nil), (*v1beta2.DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(a.(*DockerMachineTemplateResource), b.(*v1beta2.DockerMachineTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateResource)(nil), (*DockerMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(a.(*v1beta2.DockerMachineTemplateResource), b.(*DockerMachineTemplateResource), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*DockerMachineTemplateSpec)(nil), (*v1beta2.DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(a.(*DockerMachineTemplateSpec), b.(*v1beta2.DockerMachineTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.DockerMachineTemplateSpec)(nil), (*DockerMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(a.(*v1beta2.DockerMachineTemplateSpec), b.(*DockerMachineTemplateSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*Mount)(nil), (*v1beta2.Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Mount_To_v1beta2_Mount(a.(*Mount), b.(*v1beta2.Mount), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*v1beta2.Mount)(nil), (*Mount)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_Mount_To_v1beta1_Mount(a.(*v1beta2.Mount), b.(*Mount), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*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 { + return err + } + if err := s.AddConversionFunc((*ImageMeta)(nil), (*v1beta2.ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ImageMeta_To_v1beta2_ImageMeta(a.(*ImageMeta), b.(*v1beta2.ImageMeta), 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_v1beta1_DockerMachineSpec(a.(*v1beta2.DockerMachineSpec), b.(*DockerMachineSpec), scope) + }); err != nil { + return err + } + if err := s.AddConversionFunc((*v1beta2.ImageMeta)(nil), (*ImageMeta)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta2_ImageMeta_To_v1beta1_ImageMeta(a.(*v1beta2.ImageMeta), b.(*ImageMeta), scope) + }); err != nil { + return err + } + return nil +} + +func autoConvert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { + out.Host = in.Host + out.Port = in.Port + return nil +} + +// Convert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint is an autogenerated conversion function. +func Convert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint(in *APIEndpoint, out *v1beta2.APIEndpoint, s conversion.Scope) error { + return autoConvert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint(in, out, s) +} + +func autoConvert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { + out.Host = in.Host + out.Port = in.Port + return nil +} + +// Convert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function. +func Convert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint(in *v1beta2.APIEndpoint, out *APIEndpoint, s conversion.Scope) error { + return autoConvert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s) +} + +func autoConvert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster is an autogenerated conversion function. +func Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(in *DockerCluster, out *v1beta2.DockerCluster, s conversion.Scope) error { + return autoConvert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(in, out, s) +} + +func autoConvert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster is an autogenerated conversion function. +func Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(in *v1beta2.DockerCluster, out *DockerCluster, s conversion.Scope) error { + return autoConvert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerCluster, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList(in *DockerClusterList, out *v1beta2.DockerClusterList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterList_To_v1beta2_DockerClusterList(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerCluster, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList(in *v1beta2.DockerClusterList, out *DockerClusterList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterList_To_v1beta1_DockerClusterList(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1beta1_APIEndpoint_To_v1beta2_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { + return err + } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + if err := Convert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerClusterSpec, out *v1beta2.DockerClusterSpec, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *v1beta2.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { + if err := Convert_v1beta2_APIEndpoint_To_v1beta1_APIEndpoint(&in.ControlPlaneEndpoint, &out.ControlPlaneEndpoint, s); err != nil { + return err + } + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + if err := Convert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in *v1beta2.DockerClusterSpec, out *DockerClusterSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + return nil +} + +// Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *DockerClusterStatus, out *v1beta2.DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + return nil +} + +// Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *v1beta2.DockerClusterStatus, out *DockerClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta2.DockerClusterTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in *DockerClusterTemplate, out *v1beta2.DockerClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in *v1beta2.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in *v1beta2.DockerClusterTemplate, out *DockerClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta2.DockerClusterTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerClusterTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerClusterTemplate_To_v1beta2_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in *DockerClusterTemplateList, out *v1beta2.DockerClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterTemplateList_To_v1beta2_DockerClusterTemplateList(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in *v1beta2.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerClusterTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerClusterTemplate_To_v1beta1_DockerClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in *v1beta2.DockerClusterTemplateList, out *DockerClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplateList_To_v1beta1_DockerClusterTemplateList(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta2.DockerClusterTemplateResource, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerClusterSpec_To_v1beta2_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in *DockerClusterTemplateResource, out *v1beta2.DockerClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in *v1beta2.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerClusterSpec_To_v1beta1_DockerClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in *v1beta2.DockerClusterTemplateResource, out *DockerClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(in, out, s) +} + +func autoConvert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta2.DockerClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_DockerClusterTemplateResource_To_v1beta2_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in *DockerClusterTemplateSpec, out *v1beta2.DockerClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_DockerClusterTemplateSpec_To_v1beta2_DockerClusterTemplateSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in *v1beta2.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerClusterTemplateResource_To_v1beta1_DockerClusterTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in *v1beta2.DockerClusterTemplateSpec, out *DockerClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerClusterTemplateSpec_To_v1beta1_DockerClusterTemplateSpec(in, out, s) +} + +func autoConvert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta2.DockerLoadBalancer, s conversion.Scope) error { + if err := Convert_v1beta1_ImageMeta_To_v1beta2_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer is an autogenerated conversion function. +func Convert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in *DockerLoadBalancer, out *v1beta2.DockerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_DockerLoadBalancer_To_v1beta2_DockerLoadBalancer(in, out, s) +} + +func autoConvert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in *v1beta2.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { + if err := Convert_v1beta2_ImageMeta_To_v1beta1_ImageMeta(&in.ImageMeta, &out.ImageMeta, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer is an autogenerated conversion function. +func Convert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in *v1beta2.DockerLoadBalancer, out *DockerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta2_DockerLoadBalancer_To_v1beta1_DockerLoadBalancer(in, out, s) +} + +func autoConvert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine is an autogenerated conversion function. +func Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(in *DockerMachine, out *v1beta2.DockerMachine, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(in, out, s) +} + +func autoConvert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine is an autogenerated conversion function. +func Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(in *v1beta2.DockerMachine, out *DockerMachine, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachine, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList(in *DockerMachineList, out *v1beta2.DockerMachineList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineList_To_v1beta2_DockerMachineList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachine, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(in *v1beta2.DockerMachineList, out *DockerMachineList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineList_To_v1beta1_DockerMachineList(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(in *DockerMachineSpec, out *v1beta2.DockerMachineSpec, s conversion.Scope) error { + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + // WARNING: in.CustomImage requires manual conversion: does not exist in peer-type + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]v1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.Bootstrapped = in.Bootstrapped + return nil +} + +func autoConvert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec(in *v1beta2.DockerMachineSpec, out *DockerMachineSpec, s conversion.Scope) error { + out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) + // WARNING: in.NewCustomImage requires manual conversion: does not exist in peer-type + out.PreLoadImages = *(*[]string)(unsafe.Pointer(&in.PreLoadImages)) + out.ExtraMounts = *(*[]Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.Bootstrapped = in.Bootstrapped + return nil +} + +func autoConvert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.LoadBalancerConfigured = in.LoadBalancerConfigured + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + return nil +} + +// Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *DockerMachineStatus, out *v1beta2.DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { + out.Ready = in.Ready + out.LoadBalancerConfigured = in.LoadBalancerConfigured + out.Addresses = *(*[]apiv1beta1.MachineAddress)(unsafe.Pointer(&in.Addresses)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + return nil +} + +// Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *v1beta2.DockerMachineStatus, out *DockerMachineStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in *DockerMachineTemplate, out *v1beta2.DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *v1beta2.DockerMachineTemplate, out *DockerMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta2.DockerMachineTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in *DockerMachineTemplateList, out *v1beta2.DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineTemplateList_To_v1beta2_DockerMachineTemplateList(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachineTemplate, len(*in)) + for i := range *in { + if err := Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +// Convert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in *v1beta2.DockerMachineTemplateList, out *DockerMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateList_To_v1beta1_DockerMachineTemplateList(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_DockerMachineSpec_To_v1beta2_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in *DockerMachineTemplateResource, out *v1beta2.DockerMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *v1beta2.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta2_DockerMachineSpec_To_v1beta1_DockerMachineSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in *v1beta2.DockerMachineTemplateResource, out *DockerMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(in, out, s) +} + +func autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_DockerMachineTemplateResource_To_v1beta2_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in *DockerMachineTemplateSpec, out *v1beta2.DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_DockerMachineTemplateSpec_To_v1beta2_DockerMachineTemplateSpec(in, out, s) +} + +func autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta2_DockerMachineTemplateResource_To_v1beta1_DockerMachineTemplateResource(&in.Template, &out.Template, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in *v1beta2.DockerMachineTemplateSpec, out *DockerMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachineTemplateSpec_To_v1beta1_DockerMachineTemplateSpec(in, out, s) +} + +func autoConvert_v1beta1_ImageMeta_To_v1beta2_ImageMeta(in *ImageMeta, out *v1beta2.ImageMeta, s conversion.Scope) error { + // WARNING: in.ImageRepository requires manual conversion: does not exist in peer-type + // WARNING: in.ImageTag requires manual conversion: does not exist in peer-type + return nil +} + +func autoConvert_v1beta2_ImageMeta_To_v1beta1_ImageMeta(in *v1beta2.ImageMeta, out *ImageMeta, s conversion.Scope) error { + // WARNING: in.NewImageRepository requires manual conversion: does not exist in peer-type + // WARNING: in.NewField requires manual conversion: does not exist in peer-type + return nil +} + +func autoConvert_v1beta1_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { + out.ContainerPath = in.ContainerPath + out.HostPath = in.HostPath + out.Readonly = in.Readonly + return nil +} + +// Convert_v1beta1_Mount_To_v1beta2_Mount is an autogenerated conversion function. +func Convert_v1beta1_Mount_To_v1beta2_Mount(in *Mount, out *v1beta2.Mount, s conversion.Scope) error { + return autoConvert_v1beta1_Mount_To_v1beta2_Mount(in, out, s) +} + +func autoConvert_v1beta2_Mount_To_v1beta1_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { + out.ContainerPath = in.ContainerPath + out.HostPath = in.HostPath + out.Readonly = in.Readonly + return nil +} + +// Convert_v1beta2_Mount_To_v1beta1_Mount is an autogenerated conversion function. +func Convert_v1beta2_Mount_To_v1beta1_Mount(in *v1beta2.Mount, out *Mount, s conversion.Scope) error { + return autoConvert_v1beta2_Mount_To_v1beta1_Mount(in, out, s) +} diff --git a/test/infrastructure/docker/api/v1beta2/condition_consts.go b/test/infrastructure/docker/api/v1beta2/condition_consts.go new file mode 100644 index 000000000000..4b3a3c6002dd --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/condition_consts.go @@ -0,0 +1,85 @@ +/* +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 v1beta2 + +import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + +// Conditions and condition Reasons for the DockerMachine object. + +const ( + // ContainerProvisionedCondition documents the status of the provisioning of the container + // generated by a DockerMachine. + // + // NOTE: When the container provisioning starts the process completes almost immediately and within + // the same reconciliation, so the user will always see a transition from Wait to Provisioned without + // having evidence that the operation is started/is in progress. + ContainerProvisionedCondition clusterv1.ConditionType = "ContainerProvisioned" + + // WaitingForClusterInfrastructureReason (Severity=Info) documents a DockerMachine waiting for the cluster + // infrastructure to be ready before starting to create the container that provides the DockerMachine + // infrastructure. + WaitingForClusterInfrastructureReason = "WaitingForClusterInfrastructure" + + // WaitingForBootstrapDataReason (Severity=Info) documents a DockerMachine waiting for the bootstrap + // script to be ready before starting to create the container that provides the DockerMachine infrastructure. + WaitingForBootstrapDataReason = "WaitingForBootstrapData" + + // ContainerProvisioningFailedReason (Severity=Warning) documents a DockerMachine controller detecting + // an error while provisioning the container that provides the DockerMachine infrastructure; those kind of + // errors are usually transient and failed provisioning are automatically re-tried by the controller. + ContainerProvisioningFailedReason = "ContainerProvisioningFailed" + + // ContainerDeletedReason (Severity=Error) documents a DockerMachine controller detecting + // the underlying container has been deleted unexpectedly. + ContainerDeletedReason = "ContainerDeleted" +) + +const ( + // BootstrapExecSucceededCondition provides an observation of the DockerMachine bootstrap process. + // It is set based on successful execution of bootstrap commands and on the existence of + // the /run/cluster-api/bootstrap-success.complete file. + // The condition gets generated after ContainerProvisionedCondition is True. + // + // NOTE as a difference from other providers, container provisioning and bootstrap are directly managed + // by the DockerMachine controller (not by cloud-init). + BootstrapExecSucceededCondition clusterv1.ConditionType = "BootstrapExecSucceeded" + + // BootstrappingReason documents (Severity=Info) a DockerMachine currently executing the bootstrap + // script that creates the Kubernetes node on the newly provisioned machine infrastructure. + BootstrappingReason = "Bootstrapping" + + // BootstrapFailedReason documents (Severity=Warning) a DockerMachine controller detecting an error while + // bootstrapping the Kubernetes node on the machine just provisioned; those kind of errors are usually + // transient and failed bootstrap are automatically re-tried by the controller. + BootstrapFailedReason = "BootstrapFailed" +) + +// Conditions and condition Reasons for the DockerCluster object. + +const ( + // LoadBalancerAvailableCondition documents the availability of the container that implements the cluster load balancer. + // + // NOTE: When the load balancer provisioning starts the process completes almost immediately and within + // the same reconciliation, so the user will always see a transition from no condition to available without + // having evidence that the operation is started/is in progress. + LoadBalancerAvailableCondition clusterv1.ConditionType = "LoadBalancerAvailable" + + // LoadBalancerProvisioningFailedReason (Severity=Warning) documents a DockerCluster controller detecting + // an error while provisioning the container that provides the cluster load balancer.; those kind of + // errors are usually transient and failed provisioning are automatically re-tried by the controller. + LoadBalancerProvisioningFailedReason = "LoadBalancerProvisioningFailed" +) diff --git a/test/infrastructure/docker/api/v1beta2/conversion.go b/test/infrastructure/docker/api/v1beta2/conversion.go new file mode 100644 index 000000000000..98b13514ac16 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/conversion.go @@ -0,0 +1,26 @@ +/* +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 v1beta2 + +func (*DockerCluster) Hub() {} +func (*DockerClusterList) Hub() {} +func (*DockerClusterTemplate) Hub() {} +func (*DockerClusterTemplateList) Hub() {} +func (*DockerMachine) Hub() {} +func (*DockerMachineList) Hub() {} +func (*DockerMachineTemplate) Hub() {} +func (*DockerMachineTemplateList) Hub() {} diff --git a/test/infrastructure/docker/api/v1beta2/doc.go b/test/infrastructure/docker/api/v1beta2/doc.go new file mode 100644 index 000000000000..4ec87fdcd1ff --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/doc.go @@ -0,0 +1,17 @@ +/* +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 v1beta2 diff --git a/test/infrastructure/docker/api/v1beta2/dockercluster_types.go b/test/infrastructure/docker/api/v1beta2/dockercluster_types.go new file mode 100644 index 000000000000..cf7c9e211080 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/dockercluster_types.go @@ -0,0 +1,134 @@ +/* +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 v1beta2 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" +) + +const ( + // ClusterFinalizer allows DockerClusterReconciler to clean up resources associated with DockerCluster before + // removing it from the apiserver. + ClusterFinalizer = "dockercluster.infrastructure.cluster.x-k8s.io" +) + +// DockerClusterSpec defines the desired state of DockerCluster. +type DockerClusterSpec struct { + // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster + // Important: Run "make" to regenerate code after modifying this file + + // ControlPlaneEndpoint represents the endpoint used to communicate with the control plane. + // +optional + ControlPlaneEndpoint APIEndpoint `json:"controlPlaneEndpoint"` + + // FailureDomains are usually not defined in the spec. + // The docker provider is special since failure domains don't mean anything in a local docker environment. + // Instead, the docker cluster controller will simply copy these into the Status and allow the Cluster API + // controllers to do what they will with the defined failure domains. + // +optional + FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"` + + // LoadBalancer allows defining configurations for the cluster load balancer. + // +optional + LoadBalancer DockerLoadBalancer `json:"loadBalancer,omitempty"` +} + +// DockerLoadBalancer allows defining configurations for the cluster load balancer. +type DockerLoadBalancer struct { + // ImageMeta allows customizing the image used for the cluster load balancer. + ImageMeta `json:",inline"` +} + +// ImageMeta allows customizing the image used for components that are not +// originated from the Kubernetes/Kubernetes release process. +type ImageMeta struct { + // NewImageRepository sets the container registry to pull the haproxy image from. + // if not set, "kindest" will be used instead. + // +optional + NewImageRepository string `json:"newImageRepository,omitempty"` + + // NewField allows to specify a tag for the haproxy image. + // if not set, "v20210715-a6da3463" will be used instead. + // +optional + NewField string `json:"newField,omitempty"` +} + +// DockerClusterStatus defines the observed state of DockerCluster. +type DockerClusterStatus struct { + // Ready denotes that the docker cluster (infrastructure) is ready. + // +optional + Ready bool `json:"ready"` + + // FailureDomains don't mean much in CAPD since it's all local, but we can see how the rest of cluster API + // will use this if we populate it. + // +optional + FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"` + + // Conditions defines current service state of the DockerCluster. + // +optional + Conditions clusterv1.Conditions `json:"conditions,omitempty"` +} + +// APIEndpoint represents a reachable Kubernetes API endpoint. +type APIEndpoint struct { + // Host is the hostname on which the API server is serving. + Host string `json:"host"` + + // Port is the port on which the API server is serving. + Port int `json:"port"` +} + +// +kubebuilder:resource:path=dockerclusters,scope=Namespaced,categories=cluster-api +// +kubebuilder:subresource:status +// +kubebuilder:storageversion +// +kubebuilder:object:root=true +// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerCluster" + +// DockerCluster is the Schema for the dockerclusters API. +type DockerCluster struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DockerClusterSpec `json:"spec,omitempty"` + Status DockerClusterStatus `json:"status,omitempty"` +} + +// GetConditions returns the set of conditions for this object. +func (c *DockerCluster) GetConditions() clusterv1.Conditions { + return c.Status.Conditions +} + +// SetConditions sets the conditions on this object. +func (c *DockerCluster) SetConditions(conditions clusterv1.Conditions) { + c.Status.Conditions = conditions +} + +// +kubebuilder:object:root=true + +// DockerClusterList contains a list of DockerCluster. +type DockerClusterList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DockerCluster `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DockerCluster{}, &DockerClusterList{}) +} diff --git a/test/infrastructure/docker/api/v1beta1/dockercluster_webhook.go b/test/infrastructure/docker/api/v1beta2/dockercluster_webhook.go similarity index 86% rename from test/infrastructure/docker/api/v1beta1/dockercluster_webhook.go rename to test/infrastructure/docker/api/v1beta2/dockercluster_webhook.go index 95e801e10eb7..f89758e67885 100644 --- a/test/infrastructure/docker/api/v1beta1/dockercluster_webhook.go +++ b/test/infrastructure/docker/api/v1beta2/dockercluster_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1beta2 import ( apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -30,7 +30,7 @@ func (c *DockerCluster) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-dockercluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclusters,versions=v1beta1,name=default.dockercluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-dockercluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclusters,versions=v1beta2,name=default.dockercluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2 var _ webhook.Defaulter = &DockerCluster{} @@ -39,7 +39,7 @@ func (c *DockerCluster) Default() { defaultDockerClusterSpec(&c.Spec) } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-dockercluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclusters,versions=v1beta1,name=validation.dockercluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-dockercluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclusters,versions=v1beta2,name=validation.dockercluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2 var _ webhook.Validator = &DockerCluster{} diff --git a/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_types.go b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_types.go new file mode 100644 index 000000000000..5396cb5d9070 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_types.go @@ -0,0 +1,63 @@ +/* +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 v1beta2 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" +) + +// DockerClusterTemplateSpec defines the desired state of DockerClusterTemplate. +type DockerClusterTemplateSpec struct { + Template DockerClusterTemplateResource `json:"template"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:storageversion +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerClusterTemplate" + +// DockerClusterTemplate is the Schema for the dockerclustertemplates API. +type DockerClusterTemplate struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DockerClusterTemplateSpec `json:"spec,omitempty"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:resource:path=dockerclustertemplates,scope=Namespaced,categories=cluster-api + +// DockerClusterTemplateList contains a list of DockerClusterTemplate. +type DockerClusterTemplateList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DockerClusterTemplate `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DockerClusterTemplate{}, &DockerClusterTemplateList{}) +} + +// DockerClusterTemplateResource describes the data needed to create a DockerCluster from a template. +type DockerClusterTemplateResource struct { + // Standard object's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +optional + ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"` + Spec DockerClusterSpec `json:"spec"` +} diff --git a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook.go b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook.go similarity index 91% rename from test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook.go rename to test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook.go index 1ad6af6b9844..a054d2e6b2b6 100644 --- a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook.go +++ b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1beta2 import ( "fmt" @@ -37,7 +37,7 @@ func (r *DockerClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-dockerclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclustertemplates,versions=v1beta1,name=default.dockerclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-dockerclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclustertemplates,versions=v1beta2,name=default.dockerclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2 var _ webhook.Defaulter = &DockerClusterTemplate{} @@ -46,7 +46,7 @@ func (r *DockerClusterTemplate) Default() { defaultDockerClusterSpec(&r.Spec.Template.Spec) } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-dockerclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclustertemplates,versions=v1beta1,name=validation.dockerclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-dockerclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockerclustertemplates,versions=v1beta2,name=validation.dockerclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2 var _ webhook.Validator = &DockerClusterTemplate{} diff --git a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook_test.go b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook_test.go similarity index 99% rename from test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook_test.go rename to test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook_test.go index d32279166f4a..e49a804f9987 100644 --- a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_webhook_test.go +++ b/test/infrastructure/docker/api/v1beta2/dockerclustertemplate_webhook_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1beta2 import ( "testing" diff --git a/test/infrastructure/docker/api/v1beta2/dockermachine_types.go b/test/infrastructure/docker/api/v1beta2/dockermachine_types.go new file mode 100644 index 000000000000..7e70d708c719 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/dockermachine_types.go @@ -0,0 +1,131 @@ +/* +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 v1beta2 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" +) + +const ( + // MachineFinalizer allows ReconcileDockerMachine to clean up resources associated with AWSMachine before + // removing it from the apiserver. + MachineFinalizer = "dockermachine.infrastructure.cluster.x-k8s.io" +) + +// DockerMachineSpec defines the desired state of DockerMachine. +type DockerMachineSpec struct { + // ProviderID will be the container name in ProviderID format (docker:////) + // +optional + ProviderID *string `json:"providerID,omitempty"` + + // NewCustomImage allows customizing the container image that is used for + // running the machine + // +optional + NewCustomImage string `json:"newCustomImage,omitempty"` + + // PreLoadImages allows to pre-load images in a newly created machine. This can be used to + // speed up tests by avoiding e.g. to download CNI images on all the containers. + // +optional + PreLoadImages []string `json:"preLoadImages,omitempty"` + + // ExtraMounts describes additional mount points for the node container + // These may be used to bind a hostPath + // +optional + ExtraMounts []Mount `json:"extraMounts,omitempty"` + + // Bootstrapped is true when the kubeadm bootstrapping has been run + // against this machine + // +optional + Bootstrapped bool `json:"bootstrapped,omitempty"` +} + +// Mount specifies a host volume to mount into a container. +// This is a simplified version of kind v1alpha4.Mount types. +type Mount struct { + // Path of the mount within the container. + ContainerPath string `json:"containerPath,omitempty"` + + // Path of the mount on the host. If the hostPath doesn't exist, then runtimes + // should report error. If the hostpath is a symbolic link, runtimes should + // follow the symlink and mount the real destination to container. + HostPath string `json:"hostPath,omitempty"` + + // If set, the mount is read-only. + // +optional + Readonly bool `json:"readOnly,omitempty"` +} + +// DockerMachineStatus defines the observed state of DockerMachine. +type DockerMachineStatus struct { + // Ready denotes that the machine (docker container) is ready + // +optional + Ready bool `json:"ready"` + + // LoadBalancerConfigured denotes that the machine has been + // added to the load balancer + // +optional + LoadBalancerConfigured bool `json:"loadBalancerConfigured"` + + // Addresses contains the associated addresses for the docker machine. + // +optional + Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"` + + // Conditions defines current service state of the DockerMachine. + // +optional + Conditions clusterv1.Conditions `json:"conditions,omitempty"` +} + +// +kubebuilder:resource:path=dockermachines,scope=Namespaced,categories=cluster-api +// +kubebuilder:object:root=true +// +kubebuilder:storageversion +// +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster" +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachine" + +// DockerMachine is the Schema for the dockermachines API. +type DockerMachine struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DockerMachineSpec `json:"spec,omitempty"` + Status DockerMachineStatus `json:"status,omitempty"` +} + +// GetConditions returns the set of conditions for this object. +func (c *DockerMachine) GetConditions() clusterv1.Conditions { + return c.Status.Conditions +} + +// SetConditions sets the conditions on this object. +func (c *DockerMachine) SetConditions(conditions clusterv1.Conditions) { + c.Status.Conditions = conditions +} + +// +kubebuilder:object:root=true + +// DockerMachineList contains a list of DockerMachine. +type DockerMachineList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DockerMachine `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DockerMachine{}, &DockerMachineList{}) +} diff --git a/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_types.go new file mode 100644 index 000000000000..fee3f9fc71ba --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_types.go @@ -0,0 +1,64 @@ +/* +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 v1beta2 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" +) + +// DockerMachineTemplateSpec defines the desired state of DockerMachineTemplate. +type DockerMachineTemplateSpec struct { + Template DockerMachineTemplateResource `json:"template"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api +// +kubebuilder:storageversion +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachineTemplate" + +// DockerMachineTemplate is the Schema for the dockermachinetemplates API. +type DockerMachineTemplate struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DockerMachineTemplateSpec `json:"spec,omitempty"` +} + +// +kubebuilder:object:root=true + +// DockerMachineTemplateList contains a list of DockerMachineTemplate. +type DockerMachineTemplateList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DockerMachineTemplate `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DockerMachineTemplate{}, &DockerMachineTemplateList{}) +} + +// DockerMachineTemplateResource describes the data needed to create a DockerMachine from a template. +type DockerMachineTemplateResource struct { + // Standard object's metadata. + // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata + // +optional + ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"` + // Spec is the specification of the desired behavior of the machine. + Spec DockerMachineSpec `json:"spec"` +} diff --git a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook.go b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook.go similarity index 95% rename from test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook.go rename to test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook.go index 7a32da49f29b..f7aca3bedcb9 100644 --- a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook.go +++ b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1beta2 import ( "context" @@ -40,7 +40,7 @@ func (m *DockerMachineTemplateWebhook) SetupWebhookWithManager(mgr ctrl.Manager) Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-dockermachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockermachinetemplates,versions=v1beta1,name=validation.dockermachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-dockermachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=dockermachinetemplates,versions=v1beta2,name=validation.dockermachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2 // DockerMachineTemplateWebhook implements a custom validation webhook for DockerMachineTemplate. // +kubebuilder:object:generate=false diff --git a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook_test.go b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook_test.go similarity index 99% rename from test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook_test.go rename to test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook_test.go index 2d54f8c3a61b..0cdb53c224d6 100644 --- a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_webhook_test.go +++ b/test/infrastructure/docker/api/v1beta2/dockermachinetemplate_webhook_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package v1beta2 import ( "context" diff --git a/test/infrastructure/docker/api/v1beta2/groupversion_info.go b/test/infrastructure/docker/api/v1beta2/groupversion_info.go new file mode 100644 index 000000000000..31e13d11a5e3 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/groupversion_info.go @@ -0,0 +1,36 @@ +/* +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 v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group +// +kubebuilder:object:generate=true +// +groupName=infrastructure.cluster.x-k8s.io +package v1beta2 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" +) + +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 = &scheme.Builder{GroupVersion: GroupVersion} + + // AddToScheme adds the types in this group-version to the given scheme. + AddToScheme = SchemeBuilder.AddToScheme +) diff --git a/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go b/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go new file mode 100644 index 000000000000..3ebc99b9e7d0 --- /dev/null +++ b/test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go @@ -0,0 +1,498 @@ +//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 controller-gen. DO NOT EDIT. + +package v1beta2 + +import ( + "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/cluster-api/api/v1beta1" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIEndpoint) DeepCopyInto(out *APIEndpoint) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIEndpoint. +func (in *APIEndpoint) DeepCopy() *APIEndpoint { + if in == nil { + return nil + } + out := new(APIEndpoint) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerCluster) DeepCopyInto(out *DockerCluster) { + *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 DockerCluster. +func (in *DockerCluster) DeepCopy() *DockerCluster { + if in == nil { + return nil + } + out := new(DockerCluster) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerCluster) 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 *DockerClusterList) DeepCopyInto(out *DockerClusterList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerCluster, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterList. +func (in *DockerClusterList) DeepCopy() *DockerClusterList { + if in == nil { + return nil + } + out := new(DockerClusterList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerClusterList) 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 *DockerClusterSpec) DeepCopyInto(out *DockerClusterSpec) { + *out = *in + out.ControlPlaneEndpoint = in.ControlPlaneEndpoint + if in.FailureDomains != nil { + in, out := &in.FailureDomains, &out.FailureDomains + *out = make(v1beta1.FailureDomains, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + out.LoadBalancer = in.LoadBalancer +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterSpec. +func (in *DockerClusterSpec) DeepCopy() *DockerClusterSpec { + if in == nil { + return nil + } + out := new(DockerClusterSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerClusterStatus) DeepCopyInto(out *DockerClusterStatus) { + *out = *in + if in.FailureDomains != nil { + in, out := &in.FailureDomains, &out.FailureDomains + *out = make(v1beta1.FailureDomains, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(v1beta1.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterStatus. +func (in *DockerClusterStatus) DeepCopy() *DockerClusterStatus { + if in == nil { + return nil + } + out := new(DockerClusterStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerClusterTemplate) DeepCopyInto(out *DockerClusterTemplate) { + *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 DockerClusterTemplate. +func (in *DockerClusterTemplate) DeepCopy() *DockerClusterTemplate { + if in == nil { + return nil + } + out := new(DockerClusterTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerClusterTemplate) 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 *DockerClusterTemplateList) DeepCopyInto(out *DockerClusterTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerClusterTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterTemplateList. +func (in *DockerClusterTemplateList) DeepCopy() *DockerClusterTemplateList { + if in == nil { + return nil + } + out := new(DockerClusterTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerClusterTemplateList) 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 *DockerClusterTemplateResource) DeepCopyInto(out *DockerClusterTemplateResource) { + *out = *in + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterTemplateResource. +func (in *DockerClusterTemplateResource) DeepCopy() *DockerClusterTemplateResource { + if in == nil { + return nil + } + out := new(DockerClusterTemplateResource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerClusterTemplateSpec) DeepCopyInto(out *DockerClusterTemplateSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerClusterTemplateSpec. +func (in *DockerClusterTemplateSpec) DeepCopy() *DockerClusterTemplateSpec { + if in == nil { + return nil + } + out := new(DockerClusterTemplateSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerLoadBalancer) DeepCopyInto(out *DockerLoadBalancer) { + *out = *in + out.ImageMeta = in.ImageMeta +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerLoadBalancer. +func (in *DockerLoadBalancer) DeepCopy() *DockerLoadBalancer { + if in == nil { + return nil + } + out := new(DockerLoadBalancer) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachine) DeepCopyInto(out *DockerMachine) { + *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 DockerMachine. +func (in *DockerMachine) DeepCopy() *DockerMachine { + if in == nil { + return nil + } + out := new(DockerMachine) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachine) 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 *DockerMachineList) DeepCopyInto(out *DockerMachineList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachine, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachineList. +func (in *DockerMachineList) DeepCopy() *DockerMachineList { + if in == nil { + return nil + } + out := new(DockerMachineList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachineList) 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 *DockerMachineSpec) DeepCopyInto(out *DockerMachineSpec) { + *out = *in + if in.ProviderID != nil { + in, out := &in.ProviderID, &out.ProviderID + *out = new(string) + **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 DockerMachineSpec. +func (in *DockerMachineSpec) DeepCopy() *DockerMachineSpec { + if in == nil { + return nil + } + out := new(DockerMachineSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachineStatus) DeepCopyInto(out *DockerMachineStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]v1beta1.MachineAddress, len(*in)) + copy(*out, *in) + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make(v1beta1.Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachineStatus. +func (in *DockerMachineStatus) DeepCopy() *DockerMachineStatus { + if in == nil { + return nil + } + out := new(DockerMachineStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachineTemplate) DeepCopyInto(out *DockerMachineTemplate) { + *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 DockerMachineTemplate. +func (in *DockerMachineTemplate) DeepCopy() *DockerMachineTemplate { + if in == nil { + return nil + } + out := new(DockerMachineTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachineTemplate) 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 *DockerMachineTemplateList) DeepCopyInto(out *DockerMachineTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DockerMachineTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachineTemplateList. +func (in *DockerMachineTemplateList) DeepCopy() *DockerMachineTemplateList { + if in == nil { + return nil + } + out := new(DockerMachineTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DockerMachineTemplateList) 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 *DockerMachineTemplateResource) DeepCopyInto(out *DockerMachineTemplateResource) { + *out = *in + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachineTemplateResource. +func (in *DockerMachineTemplateResource) DeepCopy() *DockerMachineTemplateResource { + if in == nil { + return nil + } + out := new(DockerMachineTemplateResource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DockerMachineTemplateSpec) DeepCopyInto(out *DockerMachineTemplateSpec) { + *out = *in + in.Template.DeepCopyInto(&out.Template) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerMachineTemplateSpec. +func (in *DockerMachineTemplateSpec) DeepCopy() *DockerMachineTemplateSpec { + if in == nil { + return nil + } + out := new(DockerMachineTemplateSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ImageMeta) DeepCopyInto(out *ImageMeta) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ImageMeta. +func (in *ImageMeta) DeepCopy() *ImageMeta { + if in == nil { + return nil + } + out := new(ImageMeta) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Mount) DeepCopyInto(out *Mount) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Mount. +func (in *Mount) DeepCopy() *Mount { + if in == nil { + return nil + } + out := new(Mount) + in.DeepCopyInto(out) + return out +} diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml index 0720299203ee..6f69ef6012c2 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml @@ -467,6 +467,166 @@ spec: type: object type: object served: true + storage: false + subresources: + status: {} + - additionalPrinterColumns: + - description: Cluster + jsonPath: .metadata.labels['cluster\.x-k8s\.io/cluster-name'] + name: Cluster + type: string + - description: Time duration since creation of DockerCluster + jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: DockerCluster is the Schema for the dockerclusters API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: DockerClusterSpec defines the desired state of DockerCluster. + properties: + controlPlaneEndpoint: + description: ControlPlaneEndpoint represents the endpoint used to + communicate with the control plane. + properties: + host: + description: Host is the hostname on which the API server is serving. + type: string + port: + description: Port is the port on which the API server is serving. + type: integer + required: + - host + - port + type: object + failureDomains: + additionalProperties: + description: FailureDomainSpec is the Schema for Cluster API failure + domains. It allows controllers to understand how many failure + domains a cluster can optionally span across. + properties: + attributes: + additionalProperties: + type: string + description: Attributes is a free form map of attributes an + infrastructure provider might use or require. + type: object + controlPlane: + description: ControlPlane determines if this failure domain + is suitable for use by control plane machines. + type: boolean + type: object + description: FailureDomains are usually not defined in the spec. The + docker provider is special since failure domains don't mean anything + in a local docker environment. Instead, the docker cluster controller + will simply copy these into the Status and allow the Cluster API + controllers to do what they will with the defined failure domains. + type: object + loadBalancer: + description: LoadBalancer allows defining configurations for the cluster + load balancer. + properties: + newField: + description: NewField allows to specify a tag for the haproxy + image. if not set, "v20210715-a6da3463" will be used instead. + type: string + newImageRepository: + description: NewImageRepository sets the container registry to + pull the haproxy image from. if not set, "kindest" will be used + instead. + type: string + type: object + type: object + status: + description: DockerClusterStatus defines the observed state of DockerCluster. + properties: + conditions: + description: Conditions defines current service state of the DockerCluster. + items: + description: Condition defines an observation of a Cluster API resource + operational state. + properties: + lastTransitionTime: + description: Last time the condition transitioned from one status + to another. This should be when the underlying condition changed. + If that is not known, then using the time when the API field + changed is acceptable. + format: date-time + type: string + message: + description: A human readable message indicating details about + the transition. This field may be empty. + type: string + reason: + description: The reason for the condition's last transition + in CamelCase. The specific API may choose whether or not this + field is considered a guaranteed API. This field may not be + empty. + type: string + severity: + description: Severity provides an explicit classification of + Reason code, so the users or machines can immediately understand + the current situation and act accordingly. The Severity field + MUST be set only when Status=False. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. + type: string + required: + - lastTransitionTime + - status + - type + type: object + type: array + failureDomains: + additionalProperties: + description: FailureDomainSpec is the Schema for Cluster API failure + domains. It allows controllers to understand how many failure + domains a cluster can optionally span across. + properties: + attributes: + additionalProperties: + type: string + description: Attributes is a free form map of attributes an + infrastructure provider might use or require. + type: object + controlPlane: + description: ControlPlane determines if this failure domain + is suitable for use by control plane machines. + type: boolean + type: object + description: FailureDomains don't mean much in CAPD since it's all + local, but we can see how the rest of cluster API will use this + if we populate it. + type: object + ready: + description: Ready denotes that the docker cluster (infrastructure) + is ready. + type: boolean + type: object + type: object + served: true storage: true subresources: status: {} diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml index 03bd90f6c61b..60c68b228ce1 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml @@ -234,5 +234,126 @@ spec: type: object type: object served: true + storage: false + subresources: {} + - additionalPrinterColumns: + - description: Time duration since creation of DockerClusterTemplate + jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: DockerClusterTemplate is the Schema for the dockerclustertemplates + API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: DockerClusterTemplateSpec defines the desired state of DockerClusterTemplate. + properties: + template: + description: DockerClusterTemplateResource describes the data needed + to create a DockerCluster from a template. + properties: + metadata: + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' + properties: + annotations: + additionalProperties: + type: string + description: 'Annotations is an unstructured key value map + stored with a resource that may be set by external tools + to store and retrieve arbitrary metadata. They are not queryable + and should be preserved when modifying objects. More info: + http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string + description: 'Map of string keys and values that can be used + to organize and categorize (scope and select) objects. May + match selectors of replication controllers and services. + More info: http://kubernetes.io/docs/user-guide/labels' + type: object + type: object + spec: + description: DockerClusterSpec defines the desired state of DockerCluster. + properties: + controlPlaneEndpoint: + description: ControlPlaneEndpoint represents the endpoint + used to communicate with the control plane. + properties: + host: + description: Host is the hostname on which the API server + is serving. + type: string + port: + description: Port is the port on which the API server + is serving. + type: integer + required: + - host + - port + type: object + failureDomains: + additionalProperties: + description: FailureDomainSpec is the Schema for Cluster + API failure domains. It allows controllers to understand + how many failure domains a cluster can optionally span + across. + properties: + attributes: + additionalProperties: + type: string + description: Attributes is a free form map of attributes + an infrastructure provider might use or require. + type: object + controlPlane: + description: ControlPlane determines if this failure + domain is suitable for use by control plane machines. + type: boolean + type: object + description: FailureDomains are usually not defined in the + spec. The docker provider is special since failure domains + don't mean anything in a local docker environment. Instead, + the docker cluster controller will simply copy these into + the Status and allow the Cluster API controllers to do what + they will with the defined failure domains. + type: object + loadBalancer: + description: LoadBalancer allows defining configurations for + the cluster load balancer. + properties: + newField: + description: NewField allows to specify a tag for the + haproxy image. if not set, "v20210715-a6da3463" will + be used instead. + type: string + newImageRepository: + description: NewImageRepository sets the container registry + to pull the haproxy image from. if not set, "kindest" + will be used instead. + type: string + type: object + type: object + required: + - spec + type: object + required: + - template + type: object + type: object + served: true storage: true subresources: {} diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml index c357494d7a59..e9e87c730383 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml @@ -563,6 +563,191 @@ spec: type: object type: object served: true + storage: false + subresources: + status: {} + - additionalPrinterColumns: + - description: Time duration since creation of DockerMachinePool + jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: DockerMachinePool is the Schema for the dockermachinepools API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: DockerMachinePoolSpec defines the desired state of DockerMachinePool. + properties: + providerID: + description: ProviderID is the identification ID of the Machine Pool + type: string + providerIDList: + description: ProviderIDList is the list of identification IDs of machine + instances managed by this Machine Pool + items: + type: string + type: array + template: + description: Template contains the details used to build a replica + machine within the Machine Pool + properties: + customImage: + description: CustomImage allows customizing the container image + that is used for running the machine + type: string + extraMounts: + description: ExtraMounts describes additional mount points for + the node container These may be used to bind a hostPath + items: + description: Mount specifies a host volume to mount into a container. + This is a simplified version of kind v1alpha4.Mount types. + properties: + containerPath: + description: Path of the mount within the container. + type: string + hostPath: + description: Path of the mount on the host. If the hostPath + doesn't exist, then runtimes should report error. If the + hostpath is a symbolic link, runtimes should follow the + symlink and mount the real destination to container. + type: string + readOnly: + description: If set, the mount is read-only. + type: boolean + type: object + type: array + preLoadImages: + description: PreLoadImages allows to pre-load images in a newly + created machine. This can be used to speed up tests by avoiding + e.g. to download CNI images on all the containers. + items: + type: string + type: array + type: object + type: object + status: + description: DockerMachinePoolStatus defines the observed state of DockerMachinePool. + properties: + conditions: + description: Conditions defines current service state of the DockerMachinePool. + items: + description: Condition defines an observation of a Cluster API resource + operational state. + properties: + lastTransitionTime: + description: Last time the condition transitioned from one status + to another. This should be when the underlying condition changed. + If that is not known, then using the time when the API field + changed is acceptable. + format: date-time + type: string + message: + description: A human readable message indicating details about + the transition. This field may be empty. + type: string + reason: + description: The reason for the condition's last transition + in CamelCase. The specific API may choose whether or not this + field is considered a guaranteed API. This field may not be + empty. + type: string + severity: + description: Severity provides an explicit classification of + Reason code, so the users or machines can immediately understand + the current situation and act accordingly. The Severity field + MUST be set only when Status=False. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. + type: string + required: + - lastTransitionTime + - status + - type + type: object + type: array + instances: + description: Instances contains the status for each instance in the + pool + items: + description: DockerMachinePoolInstanceStatus contains status information + about a DockerMachinePool. + properties: + addresses: + description: Addresses contains the associated addresses for + the docker machine. + items: + description: MachineAddress contains information for the node's + address. + properties: + address: + description: The machine address. + type: string + type: + description: Machine address type, one of Hostname, ExternalIP + or InternalIP. + type: string + required: + - address + - type + type: object + type: array + bootstrapped: + description: Bootstrapped is true when the kubeadm bootstrapping + has been run against this machine + type: boolean + instanceName: + description: InstanceName is the identification of the Machine + Instance within the Machine Pool + type: string + providerID: + description: ProviderID is the provider identification of the + Machine Pool Instance + type: string + ready: + description: Ready denotes that the machine (docker container) + is ready + type: boolean + version: + description: Version defines the Kubernetes version for the + Machine Instance + type: string + type: object + type: array + observedGeneration: + description: The generation observed by the deployment controller. + format: int64 + type: integer + ready: + description: Ready denotes that the machine pool is ready + type: boolean + replicas: + description: Replicas is the most recently observed number of replicas. + format: int32 + type: integer + type: object + type: object + served: true storage: true subresources: status: {} diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml index d938063cd88b..cfb2703ce0f6 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml @@ -465,6 +465,157 @@ spec: type: object type: object served: true + storage: false + subresources: + status: {} + - additionalPrinterColumns: + - description: Cluster + jsonPath: .metadata.labels['cluster\.x-k8s\.io/cluster-name'] + name: Cluster + type: string + - description: Time duration since creation of DockerMachine + jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: DockerMachine is the Schema for the dockermachines API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: DockerMachineSpec defines the desired state of DockerMachine. + properties: + bootstrapped: + description: Bootstrapped is true when the kubeadm bootstrapping has + been run against this machine + type: boolean + extraMounts: + description: ExtraMounts describes additional mount points for the + node container These may be used to bind a hostPath + items: + description: Mount specifies a host volume to mount into a container. + This is a simplified version of kind v1alpha4.Mount types. + properties: + containerPath: + description: Path of the mount within the container. + type: string + hostPath: + description: Path of the mount on the host. If the hostPath + doesn't exist, then runtimes should report error. If the hostpath + is a symbolic link, runtimes should follow the symlink and + mount the real destination to container. + type: string + readOnly: + description: If set, the mount is read-only. + type: boolean + type: object + type: array + newCustomImage: + description: NewCustomImage allows customizing the container image + that is used for running the machine + type: string + preLoadImages: + description: PreLoadImages allows to pre-load images in a newly created + machine. This can be used to speed up tests by avoiding e.g. to + download CNI images on all the containers. + items: + type: string + type: array + providerID: + description: ProviderID will be the container name in ProviderID format + (docker:////) + type: string + type: object + status: + description: DockerMachineStatus defines the observed state of DockerMachine. + properties: + addresses: + description: Addresses contains the associated addresses for the docker + machine. + items: + description: MachineAddress contains information for the node's + address. + properties: + address: + description: The machine address. + type: string + type: + description: Machine address type, one of Hostname, ExternalIP + or InternalIP. + type: string + required: + - address + - type + type: object + type: array + conditions: + description: Conditions defines current service state of the DockerMachine. + items: + description: Condition defines an observation of a Cluster API resource + operational state. + properties: + lastTransitionTime: + description: Last time the condition transitioned from one status + to another. This should be when the underlying condition changed. + If that is not known, then using the time when the API field + changed is acceptable. + format: date-time + type: string + message: + description: A human readable message indicating details about + the transition. This field may be empty. + type: string + reason: + description: The reason for the condition's last transition + in CamelCase. The specific API may choose whether or not this + field is considered a guaranteed API. This field may not be + empty. + type: string + severity: + description: Severity provides an explicit classification of + Reason code, so the users or machines can immediately understand + the current situation and act accordingly. The Severity field + MUST be set only when Status=False. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. + type: string + required: + - lastTransitionTime + - status + - type + type: object + type: array + loadBalancerConfigured: + description: LoadBalancerConfigured denotes that the machine has been + added to the load balancer + type: boolean + ready: + description: Ready denotes that the machine (docker container) is + ready + type: boolean + type: object + type: object + served: true storage: true subresources: status: {} diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml index 131e439a8075..3fef5d35c645 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml @@ -292,5 +292,113 @@ spec: type: object type: object served: true + storage: false + subresources: {} + - additionalPrinterColumns: + - description: Time duration since creation of DockerMachineTemplate + jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: DockerMachineTemplate is the Schema for the dockermachinetemplates + API. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: DockerMachineTemplateSpec defines the desired state of DockerMachineTemplate. + properties: + template: + description: DockerMachineTemplateResource describes the data needed + to create a DockerMachine from a template. + properties: + metadata: + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' + properties: + annotations: + additionalProperties: + type: string + description: 'Annotations is an unstructured key value map + stored with a resource that may be set by external tools + to store and retrieve arbitrary metadata. They are not queryable + and should be preserved when modifying objects. More info: + http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string + description: 'Map of string keys and values that can be used + to organize and categorize (scope and select) objects. May + match selectors of replication controllers and services. + More info: http://kubernetes.io/docs/user-guide/labels' + type: object + type: object + spec: + description: Spec is the specification of the desired behavior + of the machine. + properties: + bootstrapped: + description: Bootstrapped is true when the kubeadm bootstrapping + has been run against this machine + type: boolean + extraMounts: + description: ExtraMounts describes additional mount points + for the node container These may be used to bind a hostPath + items: + description: Mount specifies a host volume to mount into + a container. This is a simplified version of kind v1alpha4.Mount + types. + properties: + containerPath: + description: Path of the mount within the container. + type: string + hostPath: + description: Path of the mount on the host. If the hostPath + doesn't exist, then runtimes should report error. + If the hostpath is a symbolic link, runtimes should + follow the symlink and mount the real destination + to container. + type: string + readOnly: + description: If set, the mount is read-only. + type: boolean + type: object + type: array + newCustomImage: + description: NewCustomImage allows customizing the container + image that is used for running the machine + type: string + preLoadImages: + description: PreLoadImages allows to pre-load images in a + newly created machine. This can be used to speed up tests + by avoiding e.g. to download CNI images on all the containers. + items: + type: string + type: array + providerID: + description: ProviderID will be the container name in ProviderID + format (docker:////) + type: string + type: object + required: + - spec + type: object + required: + - template + type: object + type: object + served: true storage: true subresources: {} diff --git a/test/infrastructure/docker/config/crd/kustomization.yaml b/test/infrastructure/docker/config/crd/kustomization.yaml index 427d52d4bed6..a7bda125ffea 100644 --- a/test/infrastructure/docker/config/crd/kustomization.yaml +++ b/test/infrastructure/docker/config/crd/kustomization.yaml @@ -1,7 +1,7 @@ commonLabels: cluster.x-k8s.io/v1alpha3: v1alpha3 cluster.x-k8s.io/v1alpha4: v1alpha4 - cluster.x-k8s.io/v1beta1: v1beta1 + cluster.x-k8s.io/v1beta1: v1beta1_v1beta2 # This kustomization.yaml is not intended to be run by itself, # since it depends on service name and namespace that are out of this kustomize package. diff --git a/test/infrastructure/docker/config/webhook/manifests.yaml b/test/infrastructure/docker/config/webhook/manifests.yaml index 2b0868d36253..7a98c8fa24a9 100644 --- a/test/infrastructure/docker/config/webhook/manifests.yaml +++ b/test/infrastructure/docker/config/webhook/manifests.yaml @@ -7,12 +7,12 @@ metadata: webhooks: - admissionReviewVersions: - v1 - - v1beta1 + - v1beta2 clientConfig: service: name: webhook-service namespace: system - path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-dockercluster + path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-dockercluster failurePolicy: Fail matchPolicy: Equivalent name: default.dockercluster.infrastructure.cluster.x-k8s.io @@ -20,7 +20,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1beta1 + - v1beta2 operations: - CREATE - UPDATE @@ -29,12 +29,12 @@ webhooks: sideEffects: None - admissionReviewVersions: - v1 - - v1beta1 + - v1beta2 clientConfig: service: name: webhook-service namespace: system - path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-dockerclustertemplate + path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-dockerclustertemplate failurePolicy: Fail matchPolicy: Equivalent name: default.dockerclustertemplate.infrastructure.cluster.x-k8s.io @@ -42,7 +42,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1beta1 + - v1beta2 operations: - CREATE - UPDATE @@ -58,12 +58,12 @@ metadata: webhooks: - admissionReviewVersions: - v1 - - v1beta1 + - v1beta2 clientConfig: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-dockercluster + path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-dockercluster failurePolicy: Fail matchPolicy: Equivalent name: validation.dockercluster.infrastructure.cluster.x-k8s.io @@ -71,7 +71,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1beta1 + - v1beta2 operations: - CREATE - UPDATE @@ -80,12 +80,12 @@ webhooks: sideEffects: None - admissionReviewVersions: - v1 - - v1beta1 + - v1beta2 clientConfig: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-dockerclustertemplate + path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-dockerclustertemplate failurePolicy: Fail matchPolicy: Equivalent name: validation.dockerclustertemplate.infrastructure.cluster.x-k8s.io @@ -93,7 +93,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1beta1 + - v1beta2 operations: - CREATE - UPDATE @@ -102,12 +102,12 @@ webhooks: sideEffects: None - admissionReviewVersions: - v1 - - v1beta1 + - v1beta2 clientConfig: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-dockermachinetemplate + path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-dockermachinetemplate failurePolicy: Fail matchPolicy: Equivalent name: validation.dockermachinetemplate.infrastructure.cluster.x-k8s.io @@ -115,7 +115,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1beta1 + - v1beta2 operations: - CREATE - UPDATE diff --git a/test/infrastructure/docker/exp/api/v1alpha3/conversion.go b/test/infrastructure/docker/exp/api/v1alpha3/conversion.go index 3eeb15387b8b..26a6207f0ace 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/conversion.go @@ -19,29 +19,29 @@ package v1alpha3 import ( "sigs.k8s.io/controller-runtime/pkg/conversion" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" ) func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infraexpv1.DockerMachinePool) - return Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil) + return Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil) } func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infraexpv1.DockerMachinePool) - return Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil) + return Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil) } func (src *DockerMachinePoolList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infraexpv1.DockerMachinePoolList) - return Convert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(src, dst, nil) + return Convert_v1alpha3_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(src, dst, nil) } func (dst *DockerMachinePoolList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infraexpv1.DockerMachinePoolList) - return Convert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(src, dst, nil) + return Convert_v1beta2_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(src, dst, nil) } diff --git a/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go b/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go index 9ece74966950..da50a462c944 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go @@ -19,7 +19,7 @@ package v1alpha3 import ( "testing" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) diff --git a/test/infrastructure/docker/exp/api/v1alpha3/doc.go b/test/infrastructure/docker/exp/api/v1alpha3/doc.go index 051e1a4b9af2..9ffb565ca1e2 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/doc.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/doc.go @@ -15,5 +15,5 @@ limitations under the License. */ // Package v1alpha3 contains the v1alpha3 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 package v1alpha3 diff --git a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go index 311ad6ada301..90e1f76d0cae 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go @@ -27,10 +27,10 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" apiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" dockerapiv1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" - dockerapiv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - v1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/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() { @@ -40,105 +40,105 @@ func init() { // 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), (*v1beta1.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta1.DockerMachinePool), scope) + 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((*v1beta1.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(a.(*v1beta1.DockerMachinePool), b.(*DockerMachinePool), scope) + 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), (*v1beta1.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta1.DockerMachinePoolInstanceStatus), scope) + 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((*v1beta1.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(a.(*v1beta1.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) + 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), (*v1beta1.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta1.DockerMachinePoolList), scope) + 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((*v1beta1.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(a.(*v1beta1.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) + 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), (*v1beta1.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta1.DockerMachinePoolMachineTemplate), scope) + 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((*v1beta1.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(a.(*v1beta1.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) + 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), (*v1beta1.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta1.DockerMachinePoolSpec), scope) + 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((*v1beta1.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(a.(*v1beta1.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) + 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), (*v1beta1.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta1.DockerMachinePoolStatus), scope) + 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((*v1beta1.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(a.(*v1beta1.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) + if err := s.AddGeneratedConversionFunc((*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_v1beta1_DockerMachinePool(in *DockerMachinePool, out *v1beta1.DockerMachinePool, s conversion.Scope) error { +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_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(in *DockerMachinePool, out *v1beta1.DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(in, out, s) +// 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_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta1.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(in *v1beta1.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(in, out, s) +// 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_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { +func autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) + *out = make([]v1beta1.MachineAddress, len(*in)) for i := range *in { if err := apiv1alpha3.Convert_v1alpha3_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -155,12 +155,12 @@ func autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachi return nil } -// Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses *out = make([]apiv1alpha3.MachineAddress, len(*in)) @@ -180,18 +180,18 @@ func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachi return nil } -// Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta1.DockerMachinePoolList, s conversion.Scope) error { +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([]v1beta1.DockerMachinePool, len(*in)) + *out = make([]v1beta2.DockerMachinePool, len(*in)) for i := range *in { - if err := Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -201,18 +201,18 @@ func autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList return nil } -// Convert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta1.DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in, out, s) +// 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_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta1.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { +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_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -222,37 +222,37 @@ func autoConvert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList return nil } -// Convert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in *v1beta1.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolList_To_v1alpha3_DockerMachinePoolList(in, out, s) +// 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_v1beta1_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta1.DockerMachinePoolMachineTemplate, s conversion.Scope) error { +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 = *(*[]dockerapiv1beta1.Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.ExtraMounts = *(*[]apiv1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) return nil } -// Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta1.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in, out, s) +// 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_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta1.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { +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 = *(*[]dockerapiv1alpha3.Mount)(unsafe.Pointer(&in.ExtraMounts)) return nil } -// Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in *v1beta1.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(in, out, s) +// 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_v1beta1_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta1.DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1alpha3_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { +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 @@ -260,13 +260,13 @@ func autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec return nil } -// Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta1.DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in, out, s) +// 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_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta1.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha3_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { +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 @@ -274,20 +274,20 @@ func autoConvert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec return nil } -// Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in *v1beta1.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolSpec_To_v1alpha3_DockerMachinePoolSpec(in, out, s) +// 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_v1beta1_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta1.DockerMachinePoolStatus, s conversion.Scope) error { +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 if in.Instances != nil { in, out := &in.Instances, &out.Instances - *out = make([]v1beta1.DockerMachinePoolInstanceStatus, len(*in)) + *out = make([]v1beta2.DockerMachinePoolInstanceStatus, len(*in)) for i := range *in { - if err := Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha3_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -296,7 +296,7 @@ func autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha3.Convert_v1alpha3_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -308,12 +308,12 @@ func autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt return nil } -// Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta1.DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1alpha3_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration @@ -321,7 +321,7 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolSt in, out := &in.Instances, &out.Instances *out = make([]DockerMachinePoolInstanceStatus, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha3_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -342,7 +342,7 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolSt return nil } -// Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s) +// Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s) } diff --git a/test/infrastructure/docker/exp/api/v1alpha4/conversion.go b/test/infrastructure/docker/exp/api/v1alpha4/conversion.go index acc200d9e51a..c1a36a8ea916 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/conversion.go @@ -19,29 +19,29 @@ package v1alpha4 import ( "sigs.k8s.io/controller-runtime/pkg/conversion" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" ) func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infraexpv1.DockerMachinePool) - return Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil) + return Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil) } func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infraexpv1.DockerMachinePool) - return Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil) + return Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil) } func (src *DockerMachinePoolList) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*infraexpv1.DockerMachinePoolList) - return Convert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(src, dst, nil) + return Convert_v1alpha4_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(src, dst, nil) } func (dst *DockerMachinePoolList) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*infraexpv1.DockerMachinePoolList) - return Convert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(src, dst, nil) + return Convert_v1beta2_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(src, dst, nil) } diff --git a/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go b/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go index 3df37e9fdbc6..94283b9710c3 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go @@ -19,7 +19,7 @@ package v1alpha4 import ( "testing" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" utilconversion "sigs.k8s.io/cluster-api/util/conversion" ) diff --git a/test/infrastructure/docker/exp/api/v1alpha4/doc.go b/test/infrastructure/docker/exp/api/v1alpha4/doc.go index 12ba7a30896a..50f98a7e369d 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/doc.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/doc.go @@ -15,5 +15,5 @@ limitations under the License. */ // Package v1alpha4 contains the v1alpha4 API implementation. -// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 package v1alpha4 diff --git a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go index 4f302088997d..4fd78513ae8d 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/zz_generated.conversion.go @@ -27,10 +27,10 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" apiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4" - apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" dockerapiv1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" - dockerapiv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - v1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/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() { @@ -40,105 +40,105 @@ func init() { // 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), (*v1beta1.DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(a.(*DockerMachinePool), b.(*v1beta1.DockerMachinePool), scope) + 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((*v1beta1.DockerMachinePool)(nil), (*DockerMachinePool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(a.(*v1beta1.DockerMachinePool), b.(*DockerMachinePool), scope) + 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), (*v1beta1.DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(a.(*DockerMachinePoolInstanceStatus), b.(*v1beta1.DockerMachinePoolInstanceStatus), scope) + 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((*v1beta1.DockerMachinePoolInstanceStatus)(nil), (*DockerMachinePoolInstanceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(a.(*v1beta1.DockerMachinePoolInstanceStatus), b.(*DockerMachinePoolInstanceStatus), scope) + 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), (*v1beta1.DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(a.(*DockerMachinePoolList), b.(*v1beta1.DockerMachinePoolList), scope) + 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((*v1beta1.DockerMachinePoolList)(nil), (*DockerMachinePoolList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(a.(*v1beta1.DockerMachinePoolList), b.(*DockerMachinePoolList), scope) + 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), (*v1beta1.DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(a.(*DockerMachinePoolMachineTemplate), b.(*v1beta1.DockerMachinePoolMachineTemplate), scope) + 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((*v1beta1.DockerMachinePoolMachineTemplate)(nil), (*DockerMachinePoolMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(a.(*v1beta1.DockerMachinePoolMachineTemplate), b.(*DockerMachinePoolMachineTemplate), scope) + 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), (*v1beta1.DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(a.(*DockerMachinePoolSpec), b.(*v1beta1.DockerMachinePoolSpec), scope) + 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((*v1beta1.DockerMachinePoolSpec)(nil), (*DockerMachinePoolSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(a.(*v1beta1.DockerMachinePoolSpec), b.(*DockerMachinePoolSpec), scope) + 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), (*v1beta1.DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(a.(*DockerMachinePoolStatus), b.(*v1beta1.DockerMachinePoolStatus), scope) + 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((*v1beta1.DockerMachinePoolStatus)(nil), (*DockerMachinePoolStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(a.(*v1beta1.DockerMachinePoolStatus), b.(*DockerMachinePoolStatus), scope) + if err := s.AddGeneratedConversionFunc((*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_v1beta1_DockerMachinePool(in *DockerMachinePool, out *v1beta1.DockerMachinePool, s conversion.Scope) error { +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_v1beta1_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta2_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta2_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(in *DockerMachinePool, out *v1beta1.DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(in, out, s) +// 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_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta1.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta2.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(in *v1beta1.DockerMachinePool, out *DockerMachinePool, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(in, out, s) +// 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_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { +func autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta2.DockerMachinePoolInstanceStatus, s conversion.Scope) error { if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses - *out = make([]apiv1beta1.MachineAddress, len(*in)) + *out = make([]v1beta1.MachineAddress, len(*in)) for i := range *in { if err := apiv1alpha4.Convert_v1alpha4_MachineAddress_To_v1beta1_MachineAddress(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -155,12 +155,12 @@ func autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachi return nil } -// Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in *DockerMachinePoolInstanceStatus, out *v1beta1.DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta2.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { if in.Addresses != nil { in, out := &in.Addresses, &out.Addresses *out = make([]apiv1alpha4.MachineAddress, len(*in)) @@ -180,18 +180,18 @@ func autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachi return nil } -// Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in *v1beta1.DockerMachinePoolInstanceStatus, out *DockerMachinePoolInstanceStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta1.DockerMachinePoolList, s conversion.Scope) error { +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([]v1beta1.DockerMachinePool, len(*in)) + *out = make([]v1beta2.DockerMachinePool, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -201,18 +201,18 @@ func autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList return nil } -// Convert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in *DockerMachinePoolList, out *v1beta1.DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(in, out, s) +// 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_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta1.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { +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_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -222,37 +222,37 @@ func autoConvert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList return nil } -// Convert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in *v1beta1.DockerMachinePoolList, out *DockerMachinePoolList, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolList_To_v1alpha4_DockerMachinePoolList(in, out, s) +// 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_v1beta1_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta1.DockerMachinePoolMachineTemplate, s conversion.Scope) error { +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 = *(*[]dockerapiv1beta1.Mount)(unsafe.Pointer(&in.ExtraMounts)) + out.ExtraMounts = *(*[]apiv1beta2.Mount)(unsafe.Pointer(&in.ExtraMounts)) return nil } -// Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in *DockerMachinePoolMachineTemplate, out *v1beta1.DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(in, out, s) +// 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_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta1.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { +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 = *(*[]dockerapiv1alpha4.Mount)(unsafe.Pointer(&in.ExtraMounts)) return nil } -// Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in *v1beta1.DockerMachinePoolMachineTemplate, out *DockerMachinePoolMachineTemplate, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(in, out, s) +// 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_v1beta1_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta1.DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1alpha4_DockerMachinePoolMachineTemplate_To_v1beta1_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { +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 @@ -260,13 +260,13 @@ func autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec return nil } -// Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in *DockerMachinePoolSpec, out *v1beta1.DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolSpec_To_v1beta1_DockerMachinePoolSpec(in, out, s) +// 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_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta1.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - if err := Convert_v1beta1_DockerMachinePoolMachineTemplate_To_v1alpha4_DockerMachinePoolMachineTemplate(&in.Template, &out.Template, s); err != nil { +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 @@ -274,20 +274,20 @@ func autoConvert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec return nil } -// Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in *v1beta1.DockerMachinePoolSpec, out *DockerMachinePoolSpec, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolSpec_To_v1alpha4_DockerMachinePoolSpec(in, out, s) +// 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_v1beta1_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta1.DockerMachinePoolStatus, s conversion.Scope) error { +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 if in.Instances != nil { in, out := &in.Instances, &out.Instances - *out = make([]v1beta1.DockerMachinePoolInstanceStatus, len(*in)) + *out = make([]v1beta2.DockerMachinePoolInstanceStatus, len(*in)) for i := range *in { - if err := Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta1_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha4_DockerMachinePoolInstanceStatus_To_v1beta2_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -296,7 +296,7 @@ func autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(apiv1beta1.Conditions, len(*in)) + *out = make(v1beta1.Conditions, len(*in)) for i := range *in { if err := apiv1alpha4.Convert_v1alpha4_Condition_To_v1beta1_Condition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -308,12 +308,12 @@ func autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolSt return nil } -// Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *DockerMachinePoolStatus, out *v1beta1.DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1alpha4_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in, out, s) +// 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_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { +func autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { out.Ready = in.Ready out.Replicas = in.Replicas out.ObservedGeneration = in.ObservedGeneration @@ -321,7 +321,7 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolSt in, out := &in.Instances, &out.Instances *out = make([]DockerMachinePoolInstanceStatus, len(*in)) for i := range *in { - if err := Convert_v1beta1_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta2_DockerMachinePoolInstanceStatus_To_v1alpha4_DockerMachinePoolInstanceStatus(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -342,7 +342,7 @@ func autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolSt return nil } -// Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus is an autogenerated conversion function. -func Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { - return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s) +// Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s) } diff --git a/test/infrastructure/docker/exp/api/v1beta1/conversion.go b/test/infrastructure/docker/exp/api/v1beta1/conversion.go index b196d30d7cbb..bb815fb030b0 100644 --- a/test/infrastructure/docker/exp/api/v1beta1/conversion.go +++ b/test/infrastructure/docker/exp/api/v1beta1/conversion.go @@ -16,5 +16,32 @@ limitations under the License. package v1beta1 -func (*DockerMachinePool) Hub() {} -func (*DockerMachinePoolList) Hub() {} +import ( + "sigs.k8s.io/controller-runtime/pkg/conversion" + + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" +) + +func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infraexpv1.DockerMachinePool) + + return Convert_v1beta1_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil) +} + +func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infraexpv1.DockerMachinePool) + + return Convert_v1beta2_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil) +} + +func (src *DockerMachinePoolList) ConvertTo(dstRaw conversion.Hub) error { + dst := dstRaw.(*infraexpv1.DockerMachinePoolList) + + return Convert_v1beta1_DockerMachinePoolList_To_v1beta2_DockerMachinePoolList(src, dst, nil) +} + +func (dst *DockerMachinePoolList) ConvertFrom(srcRaw conversion.Hub) error { + src := srcRaw.(*infraexpv1.DockerMachinePoolList) + + return Convert_v1beta2_DockerMachinePoolList_To_v1beta1_DockerMachinePoolList(src, dst, nil) +} diff --git a/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go b/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go new file mode 100644 index 000000000000..7ad800723707 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta1/conversion_test.go @@ -0,0 +1,31 @@ +/* +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 ( + "testing" + + infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2" + utilconversion "sigs.k8s.io/cluster-api/util/conversion" +) + +func TestFuzzyConversion(t *testing.T) { + t.Run("for DockerMachinePool", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{ + Hub: &infraexpv1.DockerMachinePool{}, + Spoke: &DockerMachinePool{}, + })) +} diff --git a/test/infrastructure/docker/exp/api/v1beta1/doc.go b/test/infrastructure/docker/exp/api/v1beta1/doc.go new file mode 100644 index 000000000000..e91ea79a9454 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta1/doc.go @@ -0,0 +1,19 @@ +/* +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 contains the v1alpha4 API implementation. +// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2 +package v1beta1 diff --git a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go index 734908cf51c3..9b11e5ada1e4 100644 --- a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go +++ b/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" ) const ( @@ -43,7 +43,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 []infrav1beta1.Mount `json:"extraMounts,omitempty"` } // DockerMachinePoolSpec defines the desired state of DockerMachinePool. @@ -113,7 +113,6 @@ type DockerMachinePoolInstanceStatus struct { } // +kubebuilder:resource:path=dockermachinepools,scope=Namespaced,categories=cluster-api -// +kubebuilder:storageversion // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachinePool" diff --git a/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go index 3715bbfa5beb..fbe4775052e1 100644 --- a/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go +++ b/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go @@ -33,4 +33,6 @@ var ( // AddToScheme adds the types in this group-version to the given scheme. AddToScheme = SchemeBuilder.AddToScheme + + localSchemeBuilder = SchemeBuilder.SchemeBuilder ) diff --git a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go new file mode 100644 index 000000000000..add248081a83 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.conversion.go @@ -0,0 +1,267 @@ +//go:build !ignore_autogenerated_capd +// +build !ignore_autogenerated_capd + +/* +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" + + conversion "k8s.io/apimachinery/pkg/conversion" + runtime "k8s.io/apimachinery/pkg/runtime" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + dockerapiv1beta1 "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((*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 = *(*[]apiv1beta1.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 = *(*[]apiv1beta1.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 + out.Items = *(*[]v1beta2.DockerMachinePool)(unsafe.Pointer(&in.Items)) + 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 + out.Items = *(*[]DockerMachinePool)(unsafe.Pointer(&in.Items)) + 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 = *(*[]dockerapiv1beta1.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)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + 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 { + out.Ready = in.Ready + out.Replicas = in.Replicas + out.ObservedGeneration = in.ObservedGeneration + out.Instances = *(*[]DockerMachinePoolInstanceStatus)(unsafe.Pointer(&in.Instances)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + return nil +} + +// Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus is an autogenerated conversion function. +func Convert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(in *v1beta2.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s conversion.Scope) error { + return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1beta1_DockerMachinePoolStatus(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 index cf1e613a00d1..461f0e84f061 100644 --- a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go +++ b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1beta1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" cluster_apiapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" apiv1beta1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" ) diff --git a/test/infrastructure/docker/exp/api/v1beta2/conversion.go b/test/infrastructure/docker/exp/api/v1beta2/conversion.go new file mode 100644 index 000000000000..507014992982 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta2/conversion.go @@ -0,0 +1,20 @@ +/* +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 v1beta2 + +func (*DockerMachinePool) Hub() {} +func (*DockerMachinePoolList) Hub() {} diff --git a/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go new file mode 100644 index 000000000000..00179ba2c110 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_types.go @@ -0,0 +1,150 @@ +/* +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 v1beta2 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" +) + +const ( + // MachinePoolFinalizer allows ReconcileDockerMachinePool to clean up resources. + MachinePoolFinalizer = "dockermachinepool.infrastructure.cluster.x-k8s.io" +) + +// DockerMachinePoolMachineTemplate defines the desired state of DockerMachine. +type DockerMachinePoolMachineTemplate struct { + // CustomImage allows customizing the container image that is used for + // running the machine + // +optional + CustomImage string `json:"customImage,omitempty"` + + // PreLoadImages allows to pre-load images in a newly created machine. This can be used to + // speed up tests by avoiding e.g. to download CNI images on all the containers. + // +optional + PreLoadImages []string `json:"preLoadImages,omitempty"` + + // ExtraMounts describes additional mount points for the node container + // These may be used to bind a hostPath + // +optional + ExtraMounts []infrav1.Mount `json:"extraMounts,omitempty"` +} + +// DockerMachinePoolSpec defines the desired state of DockerMachinePool. +type DockerMachinePoolSpec struct { + // Template contains the details used to build a replica machine within the Machine Pool + // +optional + Template DockerMachinePoolMachineTemplate `json:"template"` + + // ProviderID is the identification ID of the Machine Pool + // +optional + ProviderID string `json:"providerID,omitempty"` + + // ProviderIDList is the list of identification IDs of machine instances managed by this Machine Pool + //+optional + ProviderIDList []string `json:"providerIDList,omitempty"` +} + +// DockerMachinePoolStatus defines the observed state of DockerMachinePool. +type DockerMachinePoolStatus struct { + // Ready denotes that the machine pool is ready + // +optional + Ready bool `json:"ready"` + + // Replicas is the most recently observed number of replicas. + // +optional + Replicas int32 `json:"replicas"` + + // The generation observed by the deployment controller. + // +optional + ObservedGeneration int64 `json:"observedGeneration,omitempty"` + + // Instances contains the status for each instance in the pool + // +optional + Instances []DockerMachinePoolInstanceStatus `json:"instances,omitempty"` + + // Conditions defines current service state of the DockerMachinePool. + // +optional + Conditions clusterv1.Conditions `json:"conditions,omitempty"` +} + +// DockerMachinePoolInstanceStatus contains status information about a DockerMachinePool. +type DockerMachinePoolInstanceStatus struct { + // Addresses contains the associated addresses for the docker machine. + // +optional + Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"` + + // InstanceName is the identification of the Machine Instance within the Machine Pool + InstanceName string `json:"instanceName,omitempty"` + + // ProviderID is the provider identification of the Machine Pool Instance + // +optional + ProviderID *string `json:"providerID,omitempty"` + + // Version defines the Kubernetes version for the Machine Instance + // +optional + Version *string `json:"version,omitempty"` + + // Ready denotes that the machine (docker container) is ready + // +optional + Ready bool `json:"ready"` + + // Bootstrapped is true when the kubeadm bootstrapping has been run + // against this machine + // +optional + Bootstrapped bool `json:"bootstrapped,omitempty"` +} + +// +kubebuilder:resource:path=dockermachinepools,scope=Namespaced,categories=cluster-api +// +kubebuilder:storageversion +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachinePool" + +// DockerMachinePool is the Schema for the dockermachinepools API. +type DockerMachinePool struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DockerMachinePoolSpec `json:"spec,omitempty"` + Status DockerMachinePoolStatus `json:"status,omitempty"` +} + +// GetConditions returns the set of conditions for this object. +func (c *DockerMachinePool) GetConditions() clusterv1.Conditions { + return c.Status.Conditions +} + +// SetConditions sets the conditions on this object. +func (c *DockerMachinePool) SetConditions(conditions clusterv1.Conditions) { + c.Status.Conditions = conditions +} + +// +kubebuilder:object:root=true + +// DockerMachinePoolList contains a list of DockerMachinePool. +type DockerMachinePoolList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DockerMachinePool `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DockerMachinePool{}, &DockerMachinePoolList{}) +} diff --git a/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_webhook.go b/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_webhook.go new file mode 100644 index 000000000000..25659636cf59 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta2/dockermachinepool_webhook.go @@ -0,0 +1,27 @@ +/* +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 v1beta2 + +import ( + ctrl "sigs.k8s.io/controller-runtime" +) + +func (c *DockerMachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error { + return ctrl.NewWebhookManagedBy(mgr). + For(c). + Complete() +} diff --git a/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go b/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go new file mode 100644 index 000000000000..31e13d11a5e3 --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta2/groupversion_info.go @@ -0,0 +1,36 @@ +/* +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 v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group +// +kubebuilder:object:generate=true +// +groupName=infrastructure.cluster.x-k8s.io +package v1beta2 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" +) + +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 = &scheme.Builder{GroupVersion: GroupVersion} + + // AddToScheme adds the types in this group-version to the given scheme. + AddToScheme = SchemeBuilder.AddToScheme +) diff --git a/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go new file mode 100644 index 000000000000..8961be6e7e7f --- /dev/null +++ b/test/infrastructure/docker/exp/api/v1beta2/zz_generated.deepcopy.go @@ -0,0 +1,192 @@ +//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 controller-gen. DO NOT EDIT. + +package v1beta2 + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/cluster-api/api/v1beta1" + 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 *DockerMachinePoolInstanceStatus) DeepCopyInto(out *DockerMachinePoolInstanceStatus) { + *out = *in + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]v1beta1.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.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(v1beta1.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/internal/controllers/dockermachinepool_controller.go b/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go index 1992ce56a812..fd6a174e99d3 100644 --- a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go +++ b/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go @@ -39,7 +39,7 @@ import ( expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" utilexp "sigs.k8s.io/cluster-api/exp/util" "sigs.k8s.io/cluster-api/test/infrastructure/container" - infraexpv1 "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/docker/exp/internal/docker" "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/cluster-api/util/patch" diff --git a/test/infrastructure/docker/exp/internal/docker/nodepool.go b/test/infrastructure/docker/exp/internal/docker/nodepool.go index 896fe8749163..424352a66821 100644 --- a/test/infrastructure/docker/exp/internal/docker/nodepool.go +++ b/test/infrastructure/docker/exp/internal/docker/nodepool.go @@ -35,7 +35,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" - infraexpv1 "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/docker/internal/docker" "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/cluster-api/util/container" diff --git a/test/infrastructure/docker/internal/controllers/dockercluster_controller.go b/test/infrastructure/docker/internal/controllers/dockercluster_controller.go index f775d7d7aec2..367303e59d5f 100644 --- a/test/infrastructure/docker/internal/controllers/dockercluster_controller.go +++ b/test/infrastructure/docker/internal/controllers/dockercluster_controller.go @@ -32,7 +32,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/test/infrastructure/container" - infrav1 "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/internal/docker" "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/cluster-api/util/conditions" diff --git a/test/infrastructure/docker/internal/controllers/dockermachine_controller.go b/test/infrastructure/docker/internal/controllers/dockermachine_controller.go index c27e2ed3d98d..f7e456873713 100644 --- a/test/infrastructure/docker/internal/controllers/dockermachine_controller.go +++ b/test/infrastructure/docker/internal/controllers/dockermachine_controller.go @@ -38,7 +38,7 @@ import ( bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" "sigs.k8s.io/cluster-api/controllers/remote" "sigs.k8s.io/cluster-api/test/infrastructure/container" - infrav1 "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/internal/docker" "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/cluster-api/util/annotations" @@ -244,7 +244,7 @@ func (r *DockerMachineReconciler) reconcileNormal(ctx context.Context, cluster * if !externalMachine.Exists() { // NOTE: FailureDomains don't mean much in CAPD since it's all local, but we are setting a label on // each container, so we can check placement. - if err := externalMachine.Create(ctx, dockerMachine.Spec.CustomImage, role, machine.Spec.Version, docker.FailureDomainLabel(machine.Spec.FailureDomain), dockerMachine.Spec.ExtraMounts); err != nil { + if err := externalMachine.Create(ctx, dockerMachine.Spec.NewCustomImage, role, machine.Spec.Version, docker.FailureDomainLabel(machine.Spec.FailureDomain), dockerMachine.Spec.ExtraMounts); err != nil { return ctrl.Result{}, errors.Wrap(err, "failed to create worker DockerMachine") } } diff --git a/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go b/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go index 20e4572f6ba5..3bf5623cc0e8 100644 --- a/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go +++ b/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) var ( diff --git a/test/infrastructure/docker/internal/controllers/suite_test.go b/test/infrastructure/docker/internal/controllers/suite_test.go index 0596e0ac3651..5070c9aef11f 100644 --- a/test/infrastructure/docker/internal/controllers/suite_test.go +++ b/test/infrastructure/docker/internal/controllers/suite_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2" ) func init() { diff --git a/test/infrastructure/docker/internal/docker/loadbalancer.go b/test/infrastructure/docker/internal/docker/loadbalancer.go index e29e16310adc..ef5796db4c86 100644 --- a/test/infrastructure/docker/internal/docker/loadbalancer.go +++ b/test/infrastructure/docker/internal/docker/loadbalancer.go @@ -27,7 +27,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/test/infrastructure/container" - infrav1 "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/internal/docker/types" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/third_party/forked/loadbalancer" ) @@ -88,11 +88,11 @@ func getLoadBalancerImage(dockerCluster *infrav1.DockerCluster) string { imageTag := loadbalancer.DefaultImageTag if dockerCluster != nil { - if dockerCluster.Spec.LoadBalancer.ImageRepository != "" { - imageRepo = dockerCluster.Spec.LoadBalancer.ImageRepository + if dockerCluster.Spec.LoadBalancer.NewImageRepository != "" { + imageRepo = dockerCluster.Spec.LoadBalancer.NewImageRepository } - if dockerCluster.Spec.LoadBalancer.ImageTag != "" { - imageTag = dockerCluster.Spec.LoadBalancer.ImageTag + if dockerCluster.Spec.LoadBalancer.NewField != "" { + imageTag = dockerCluster.Spec.LoadBalancer.NewField } } diff --git a/test/infrastructure/docker/internal/docker/machine.go b/test/infrastructure/docker/internal/docker/machine.go index 3654ef6f94f7..edbe4eeceac6 100644 --- a/test/infrastructure/docker/internal/docker/machine.go +++ b/test/infrastructure/docker/internal/docker/machine.go @@ -39,7 +39,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" "sigs.k8s.io/cluster-api/test/infrastructure/container" - infrav1 "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/internal/docker/types" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning/cloudinit" diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go index c07d7be6ee67..cda36b9dc0b9 100644 --- a/test/infrastructure/docker/main.go +++ b/test/infrastructure/docker/main.go @@ -47,11 +47,13 @@ import ( "sigs.k8s.io/cluster-api/test/infrastructure/container" infrav1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" infrav1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" - infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" + 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" - infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1" + 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" ) @@ -75,9 +77,11 @@ func init() { _ = scheme.AddToScheme(myscheme) _ = infrav1alpha3.AddToScheme(myscheme) _ = infrav1alpha4.AddToScheme(myscheme) + _ = infrav1beta1.AddToScheme(myscheme) _ = infrav1.AddToScheme(myscheme) _ = infraexpv1alpha3.AddToScheme(myscheme) _ = infraexpv1alpha4.AddToScheme(myscheme) + _ = infraexpv1beta1.AddToScheme(myscheme) _ = infraexpv1.AddToScheme(myscheme) _ = clusterv1.AddToScheme(myscheme) _ = expv1.AddToScheme(myscheme)