sync upstream 2025-09-29

Author: nunnatsa

.github/workflows/create_release.yaml

@@ -46,7 +46,7 @@ jobs:
         run: |
           make create-infrastructure-components
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           generate_release_notes: true
           fail_on_unmatched_files: true

.github/workflows/test.yaml

@@ -46,16 +46,16 @@ jobs:
     if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Install Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
-      with:
-        args: --timeout=5m -v
-        version: v1.63.4
+      - uses: actions/checkout@v4
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v7
+        with:
+          args: --timeout=5m -v
+          version: v2.4.0
 
   check-gen:
     if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'

.golangci.yml

@@ -1,19 +1,20 @@
-linters-settings:
-  ginkgolinter:
-    forbid-focus-container: true
-
+version: "2"
+run:
+  timeout: 10m
+  go: "1.24"
+  build-tags:
+    - tools
+    - e2e
+  allow-parallel-runners: true
 linters:
   enable:
     - errcheck
     - ginkgolinter
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - typecheck
     - unused
+  settings:
+    ginkgolinter:
+      forbid-focus-container: true
   disable: []
-
-issues:
-  exclude:
-    - SA1019 # todo remove the exclude parameter when issue #85 is resolved

Dockerfile

@@ -16,7 +16,7 @@
 
 # Build the manager binary
 # Run this with docker build --build-arg builder_image=<golang:x.y.z>
-ARG builder_image=docker.io/golang:1.23
+ARG builder_image=docker.io/golang:1.24
 FROM ${builder_image} as builder
 WORKDIR /workspace
 

Makefile

@@ -182,7 +182,7 @@ generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate tar
 		paths=./api/...
 	(IFS=','; for i in "./api/v1alpha1"; do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)
 	$(CONVERSION_GEN) \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=hack/boilerplate.generatego.txt \
 		sigs.k8s.io/cluster-api-provider-kubevirt/api/v1alpha1
@@ -340,7 +340,7 @@ goimports:
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
 golangci-lint: ## Download golangci-lint locally if necessary.
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4)
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0)
 
 .PHONY: linter
 linter: golangci-lint

README.md

@@ -33,7 +33,7 @@ We also encourage ALL active community participants to act as if they are mainta
 
 ### Other ways to communicate with the maintainers
 
-Please check in with us in the [#cluster-api-kubevirt](https://sigs.k8s.io/cluster-api-provider-kubevirt). You can also join our [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-dev)
+Please check in with us in the [#cluster-api-kubevirt](https://kubernetes.slack.com/archives/C02EBC8984E). You can also join our [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-dev)
 
 ## Github Issues
 

api/v1alpha1/condition_consts.go

@@ -16,14 +16,12 @@ limitations under the License.
 
 package v1alpha1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-
 // Conditions and condition Reasons for the KubevirtMachine object
 
 const (
 	// VMProvisionedCondition documents the status of the provisioning of the VM
 	// generated by a KubevirtMachine.
-	VMProvisionedCondition clusterv1.ConditionType = "VMProvisioned"
+	VMProvisionedCondition = "VMProvisioned"
 
 	// WaitingForClusterInfrastructureReason (Severity=Info) documents a KubevirtMachine waiting for the cluster
 	// infrastructure to be ready before starting to create the container that provides the KubevirtMachine
@@ -39,15 +37,15 @@ const (
 	VMCreateFailedReason = "VMCreateFailed"
 
 	// VMLiveMigratableCondition documents whether the VM is live-migratable or not
-	VMLiveMigratableCondition clusterv1.ConditionType = "VMLiveMigratable"
+	VMLiveMigratableCondition = "VMLiveMigratable"
 )
 
 const (
 	// BootstrapExecSucceededCondition provides an observation of the KubevirtMachine 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 VMProvisionedCondition is True.
-	BootstrapExecSucceededCondition clusterv1.ConditionType = "BootstrapExecSucceeded"
+	BootstrapExecSucceededCondition = "BootstrapExecSucceeded"
 
 	// BootstrappingReason documents (Severity=Info) a KubevirtMachine currently executing the bootstrap
 	// script that creates the Kubernetes node on the newly provisioned machine infrastructure.
@@ -63,7 +61,7 @@ const (
 
 const (
 	// LoadBalancerAvailableCondition documents the availability of the service that implements the cluster load balancer.
-	LoadBalancerAvailableCondition clusterv1.ConditionType = "LoadBalancerAvailable"
+	LoadBalancerAvailableCondition = "LoadBalancerAvailable"
 
 	// LoadBalancerProvisioningFailedReason (Severity=Warning) documents a KubevirtCluster controller detecting
 	// an error while provisioning the service that provides the cluster load balancer; those kind of

api/v1alpha1/kubevirtcluster_types.go

@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -28,7 +28,7 @@ const (
 	ClusterFinalizer = "kubevirtcluster.infrastructure.cluster.x-k8s.io"
 )
 
-const ( //labels
+const ( // labels
 	KubevirtMachineNameLabel      = "capk.cluster.x-k8s.io/kubevirt-machine-name"
 	KubevirtMachineNamespaceLabel = "capk.cluster.x-k8s.io/kubevirt-machine-namespace"
 
@@ -74,11 +74,11 @@ type KubevirtClusterStatus struct {
 
 	// 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.
-	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
+	FailureDomains []clusterv1.FailureDomain `json:"failureDomains,omitempty"`
 
 	// Conditions defines current service state of the KubevirtCluster.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // APIEndpoint represents a reachable Kubernetes API endpoint.
@@ -140,11 +140,11 @@ type KubevirtCluster struct {
 	Status KubevirtClusterStatus `json:"status,omitempty"`
 }
 
-func (c *KubevirtCluster) GetConditions() clusterv1.Conditions {
+func (c *KubevirtCluster) GetConditions() []metav1.Condition {
 	return c.Status.Conditions
 }
 
-func (c *KubevirtCluster) SetConditions(conditions clusterv1.Conditions) {
+func (c *KubevirtCluster) SetConditions(conditions []metav1.Condition) {
 	c.Status.Conditions = conditions
 }
 

api/v1alpha1/kubevirtclustertemplate_types.go

@@ -18,7 +18,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // KubevirtClusterTemplateResource describes the data needed to create a KubevirtCluster from a template.

api/v1alpha1/kubevirtmachine_types.go

@@ -20,8 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubevirtv1 "kubevirt.io/api/core/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -85,7 +84,7 @@ type KubevirtMachineStatus struct {
 
 	// Conditions defines current service state of the KubevirtMachine.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// NodeUpdated denotes that the ProviderID is updated on Node of this KubevirtMachine
 	// +optional
@@ -108,7 +107,7 @@ type KubevirtMachineStatus struct {
 	// can be added as events to the Machine object and/or logged in the
 	// controller's output.
 	// +optional
-	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
+	FailureReason string `json:"failureReason,omitempty"`
 
 	// FailureMessage will be set in the event that there is a terminal problem
 	// reconciling the Machine and will contain a more verbose string suitable
@@ -146,11 +145,11 @@ type KubevirtMachine struct {
 	Status KubevirtMachineStatus `json:"status,omitempty"`
 }
 
-func (c *KubevirtMachine) GetConditions() clusterv1.Conditions {
+func (c *KubevirtMachine) GetConditions() []metav1.Condition {
 	return c.Status.Conditions
 }
 
-func (c *KubevirtMachine) SetConditions(conditions clusterv1.Conditions) {
+func (c *KubevirtMachine) SetConditions(conditions []metav1.Condition) {
 	c.Status.Conditions = conditions
 }