github/vm-import-controller
7
0
Fork 0
mirror of https://github.com/harvester/vm-import-controller.git synced 2025-06-03 01:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump go to v1.23.4

Browse Source 
Related to: https://github.com/harvester/harvester/issues/7336

Signed-off-by: Volker Theile <vtheile@suse.com>
This commit is contained in:
Volker Theile 2025-01-13 10:18:19 +01:00 committed by Kiefer Chang
parent 84b35390c8
commit d7f05cece9
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.dapper
View File

@ -1,4 +1,4 @@
FROM registry.suse.com/bci/golang:1.22.7 FROM registry.suse.com/bci/golang:1.23
ARG DAPPER_HOST_ARCH ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH
@ -14,7 +14,7 @@ RUN export K8S_VERSION=1.24.2 && \
mkdir /usr/local/kubebuilder && \ mkdir /usr/local/kubebuilder && \
tar -C /usr/local/kubebuilder --strip-components=1 -zvxf envtest-bins.tar.gz tar -C /usr/local/kubebuilder --strip-components=1 -zvxf envtest-bins.tar.gz
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/v1.57.1/install.sh | sh -s v1.57.1 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4
# The docker version in dapper is too old to have buildx. Install it manually. # The docker version in dapper is too old to have buildx. Install it manually.
RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} -o buildx-v0.13.1.linux-${ARCH} && \ RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} -o buildx-v0.13.1.linux-${ARCH} && \

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/harvester/vm-import-controller module github.com/harvester/vm-import-controller
go 1.22.7 go 1.23.4
require ( require (
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0

2
pkg/controllers/migration/virtualmachine.go
View File

@ -534,7 +534,7 @@ func (h *virtualMachineHandler) createVirtualMachine(vm *migration.VirtualMachin
diskOrder++ // Disk order cant be 0, so need to kick things off from 1 diskOrder++ // Disk order cant be 0, so need to kick things off from 1
disks = append(disks, kubevirt.Disk{ disks = append(disks, kubevirt.Disk{
Name: fmt.Sprintf("disk-%d", i), Name: fmt.Sprintf("disk-%d", i),
BootOrder: &[]uint{uint(diskOrder)}[0], BootOrder: &[]uint{uint(diskOrder)}[0], // nolint:gosec
DiskDevice: kubevirt.DiskDevice{ DiskDevice: kubevirt.DiskDevice{
Disk: &kubevirt.DiskTarget{ Disk: &kubevirt.DiskTarget{
Bus: v.BusType, Bus: v.BusType,

2
pkg/source/openstack/client.go
View File

@ -393,7 +393,7 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
Spec: kubevirt.VirtualMachineInstanceSpec{ Spec: kubevirt.VirtualMachineInstanceSpec{
Domain: kubevirt.DomainSpec{ Domain: kubevirt.DomainSpec{
CPU: &kubevirt.CPU{ CPU: &kubevirt.CPU{
Cores: uint32(flavorObj.VCPUs), Cores: uint32(flavorObj.VCPUs), // nolint:gosec
Sockets: uint32(1), Sockets: uint32(1),
Threads: 1, Threads: 1,
}, },

4
pkg/source/vmware/client.go
View File

@ -298,8 +298,8 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
Spec: kubevirt.VirtualMachineInstanceSpec{ Spec: kubevirt.VirtualMachineInstanceSpec{
Domain: kubevirt.DomainSpec{ Domain: kubevirt.DomainSpec{
CPU: &kubevirt.CPU{ CPU: &kubevirt.CPU{
Cores: uint32(o.Config.Hardware.NumCPU), Cores: uint32(o.Config.Hardware.NumCPU), // nolint:gosec
Sockets: uint32(o.Config.Hardware.NumCoresPerSocket), Sockets: uint32(o.Config.Hardware.NumCoresPerSocket), // nolint:gosec
Threads: 1, Threads: 1,
}, },
Memory: &kubevirt.Memory{ Memory: &kubevirt.Memory{