From d7f05cece9b5950976bb96bcb0313be3c675c5b2 Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Mon, 13 Jan 2025 10:18:19 +0100
Subject: [PATCH] Bump go to v1.23.4

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

Signed-off-by: Volker Theile <vtheile@suse.com>
---
 Dockerfile.dapper                           | 4 ++--
 go.mod                                      | 2 +-
 pkg/controllers/migration/virtualmachine.go | 2 +-
 pkg/source/openstack/client.go              | 2 +-
 pkg/source/vmware/client.go                 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 3a5e4b5..3e53f85 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -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
 ENV ARCH $DAPPER_HOST_ARCH
@@ -14,7 +14,7 @@ RUN export K8S_VERSION=1.24.2 && \
     mkdir /usr/local/kubebuilder && \
     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.
 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} && \
diff --git a/go.mod b/go.mod
index 35fb954..ecc115a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/harvester/vm-import-controller
 
-go 1.22.7
+go 1.23.4
 
 require (
 	github.com/google/uuid v1.6.0
diff --git a/pkg/controllers/migration/virtualmachine.go b/pkg/controllers/migration/virtualmachine.go
index 5fa48b5..c2919ba 100644
--- a/pkg/controllers/migration/virtualmachine.go
+++ b/pkg/controllers/migration/virtualmachine.go
@@ -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
 		disks = append(disks, kubevirt.Disk{
 			Name:      fmt.Sprintf("disk-%d", i),
-			BootOrder: &[]uint{uint(diskOrder)}[0],
+			BootOrder: &[]uint{uint(diskOrder)}[0], // nolint:gosec
 			DiskDevice: kubevirt.DiskDevice{
 				Disk: &kubevirt.DiskTarget{
 					Bus: v.BusType,
diff --git a/pkg/source/openstack/client.go b/pkg/source/openstack/client.go
index 3bbbb7a..3deaff3 100644
--- a/pkg/source/openstack/client.go
+++ b/pkg/source/openstack/client.go
@@ -393,7 +393,7 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 			Spec: kubevirt.VirtualMachineInstanceSpec{
 				Domain: kubevirt.DomainSpec{
 					CPU: &kubevirt.CPU{
-						Cores:   uint32(flavorObj.VCPUs),
+						Cores:   uint32(flavorObj.VCPUs), // nolint:gosec
 						Sockets: uint32(1),
 						Threads: 1,
 					},
diff --git a/pkg/source/vmware/client.go b/pkg/source/vmware/client.go
index 2d28f21..0e6c478 100644
--- a/pkg/source/vmware/client.go
+++ b/pkg/source/vmware/client.go
@@ -298,8 +298,8 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 			Spec: kubevirt.VirtualMachineInstanceSpec{
 				Domain: kubevirt.DomainSpec{
 					CPU: &kubevirt.CPU{
-						Cores:   uint32(o.Config.Hardware.NumCPU),
-						Sockets: uint32(o.Config.Hardware.NumCoresPerSocket),
+						Cores:   uint32(o.Config.Hardware.NumCPU),            // nolint:gosec
+						Sockets: uint32(o.Config.Hardware.NumCoresPerSocket), // nolint:gosec
 						Threads: 1,
 					},
 					Memory: &kubevirt.Memory{