feat: upgrade [email protected]

.golangci.yml

@@ -3,7 +3,7 @@ run:
   timeout: 5m
   modules-download-mode: readonly
   allow-parallel-runners: true
-  go: '1.24'
+  go: '1.25'
 linters:
   default: none
   enable:
@@ -163,9 +163,12 @@ linters:
         - unusedwrite
         - waitgroup
     importas:
+      no-unaliased: true
       alias:
         - pkg: github.com/K0rdent/kcm/api/v1beta1
           alias: kcmv1
+        - pkg: github.com/K0rdent/kcm/internal/util/([\w]+)
+          alias: "${1}util"
         - pkg: k8s.io/api/apps/v1
           alias: appsv1
         - pkg: k8s.io/api/core/v1
@@ -188,8 +191,10 @@ linters:
           alias: fluxmeta
         - pkg: github.com/fluxcd/pkg/runtime/conditions
           alias: fluxconditions
-        - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+        - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
           alias: clusterapiv1
+        - pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta2
+          alias: ipamv1
         - pkg: kubevirt.io/api/core/(v[\w\d]+)
           alias: kubevirt$1
         - pkg: github.com/fluxcd/helm-controller/api/(v[\w\d]+)

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG LD_FLAGS

Makefile

@@ -670,15 +670,15 @@ SUPPORT_BUNDLE_CLI ?= $(LOCALBIN)/support-bundle-$(SUPPORT_BUNDLE_CLI_VERSION)
 ## Tool Versions
 CONTROLLER_TOOLS_VERSION ?= v0.17.2
 ENVTEST_VERSION ?= release-0.20
-GOLANGCI_LINT_VERSION ?= v2.1.6
+GOLANGCI_LINT_VERSION ?= v2.5.0
 GOLANGCI_LINT_TIMEOUT ?= 1m
 HELM_VERSION ?= v3.18.3
 KIND_VERSION ?= v0.29.0
 YQ_VERSION ?= v4.45.1
 CLOUDNUKE_VERSION = v0.38.2
 AZURENUKE_VERSION = v1.2.0
 CLUSTERAWSADM_VERSION ?= v2.7.1
-CLUSTERCTL_VERSION ?= v1.9.4
+CLUSTERCTL_VERSION ?= v1.11.2
 ADDLICENSE_VERSION ?= v1.1.1
 ENVSUBST_VERSION ?= v1.4.2
 AWSCLI_VERSION ?= 2.17.42

api/v1alpha1/go.mod

@@ -0,0 +1,94 @@
+module github.com/K0rdent/kcm/api/v1alpha1
+
+go 1.25.0
+
+require (
+	github.com/Masterminds/semver/v3 v3.4.0
+	github.com/fluxcd/helm-controller/api v1.3.0
+	github.com/fluxcd/source-controller/api v1.6.2
+	github.com/projectsveltos/addon-controller v0.57.2
+	github.com/projectsveltos/libsveltos v0.57.2
+	github.com/stretchr/testify v1.11.1
+	github.com/vmware-tanzu/velero v1.16.2
+	k8s.io/api v0.34.0
+	k8s.io/apiextensions-apiserver v0.34.0
+	k8s.io/apimachinery v0.34.0
+	sigs.k8s.io/controller-runtime v0.21.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
+	github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
+	github.com/fluxcd/pkg/apis/meta v1.21.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/onsi/ginkgo/v2 v2.25.1 // indirect
+	github.com/onsi/gomega v1.38.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/client-go v0.34.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
+	sigs.k8s.io/cluster-api v1.11.1 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
+)
+
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6
+
+replace github.com/projectsveltos/libsveltos => github.com/projectsveltos/libsveltos v0.57.2
+
+replace github.com/projectsveltos/addon-controller => github.com/projectsveltos/addon-controller v0.57.2
+
+replace github.com/vmware-tanzu/velero => github.com/vmware-tanzu/velero v1.16.2
+
+replace github.com/fluxcd/source-controller/api => github.com/fluxcd/source-controller/api v1.6.2
+
+replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0
+
+replace k8s.io/api => k8s.io/api v0.34.0
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.0