Skip to content

Commit 943e59f

Browse files
authored
feat: upgrade [email protected] (#2032)
* feat: upgrade [email protected] Updates the CAPI module to v1.11.1. Updates all of the required deps: - sveltos to v1.1.1 - controller-runtime v0.22.1 - kube modules v0.34.1 Updates minimal required go version to 1.25.1. Adds a dedicated module for the depricated v1alpha1 API to ensure the old dependencies. * chore(bumps): more deps bumps Bumps: - flux runtime @v0.86.0 - flux source-controller @v1.7.0 - flux helm-controller @v1.4.0 - golang x/crypto @v0.42.0 - golang x/time @v0.13.0 Fixes integration tests after all of the bumps. * chore(bumps): provider templates Bumps kcm's flux chart dependency to 2.16.4. Bumps the following providers to support capi v1.11.x: - in-cluster-ipam to 1.1.0-rc.1 - capi to 1.11.1 - docker to 1.11.1 - vsphere to 1.14.0 - projectsveltos to 1.1.1 * chore(bump): extra charts bumps Bumps capi-operator chart to v0.24.0. Bumps the following modules: - github.com/vmware-tanzu/[email protected] - github.com/onsi/ginkgo/[email protected] - github.com/fluxcd/source-controller/[email protected] - github.com/fluxcd/helm-controller/[email protected] - sigs.k8s.io/[email protected] * chore(ctpl): upgrade ct vsphere and docker * chore(bumps): more deps and charts Bumps the following charts: - cert-manager to 1.19.0 Bumps the following providers: - k0smotron to 1.8.0 - cluster-api to 1.11.2 - CAPD to 1.11.2 Bumps the following go modules: - github.com/cert-manager/[email protected] - github.com/fluxcd/pkg/apis/[email protected] - github.com/fluxcd/pkg/[email protected] - github.com/fluxcd/source-controller/[email protected] - golang.org/x/[email protected] - golang.org/x/[email protected] - sigs.k8s.io/[email protected] - sigs.k8s.io/[email protected] * test(e2e): amend according to new conditions * chore(bumps): more bumps Bumps: - github.com/fluxcd/helm-controller/[email protected] - github.com/fluxcd/pkg/[email protected] Removes stale image tag from projectsveltos provider template. * chore: remove accidental change to dev cfg
1 parent 6422512 commit 943e59f

File tree

154 files changed

+1406
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1406
-969
lines changed

.golangci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run:
33
timeout: 5m
44
modules-download-mode: readonly
55
allow-parallel-runners: true
6-
go: '1.24'
6+
go: '1.25'
77
linters:
88
default: none
99
enable:
@@ -163,9 +163,12 @@ linters:
163163
- unusedwrite
164164
- waitgroup
165165
importas:
166+
no-unaliased: true
166167
alias:
167168
- pkg: github.com/K0rdent/kcm/api/v1beta1
168169
alias: kcmv1
170+
- pkg: github.com/K0rdent/kcm/internal/util/([\w]+)
171+
alias: "${1}util"
169172
- pkg: k8s.io/api/apps/v1
170173
alias: appsv1
171174
- pkg: k8s.io/api/core/v1
@@ -188,8 +191,10 @@ linters:
188191
alias: fluxmeta
189192
- pkg: github.com/fluxcd/pkg/runtime/conditions
190193
alias: fluxconditions
191-
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
194+
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
192195
alias: clusterapiv1
196+
- pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta2
197+
alias: ipamv1
193198
- pkg: kubevirt.io/api/core/(v[\w\d]+)
194199
alias: kubevirt$1
195200
- pkg: github.com/fluxcd/helm-controller/api/(v[\w\d]+)

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.24 AS builder
16+
FROM golang:1.25 AS builder
1717
ARG TARGETOS
1818
ARG TARGETARCH
1919
ARG LD_FLAGS

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,15 +670,15 @@ SUPPORT_BUNDLE_CLI ?= $(LOCALBIN)/support-bundle-$(SUPPORT_BUNDLE_CLI_VERSION)
670670
## Tool Versions
671671
CONTROLLER_TOOLS_VERSION ?= v0.17.2
672672
ENVTEST_VERSION ?= release-0.20
673-
GOLANGCI_LINT_VERSION ?= v2.1.6
673+
GOLANGCI_LINT_VERSION ?= v2.5.0
674674
GOLANGCI_LINT_TIMEOUT ?= 1m
675675
HELM_VERSION ?= v3.18.3
676676
KIND_VERSION ?= v0.29.0
677677
YQ_VERSION ?= v4.45.1
678678
CLOUDNUKE_VERSION = v0.38.2
679679
AZURENUKE_VERSION = v1.2.0
680680
CLUSTERAWSADM_VERSION ?= v2.7.1
681-
CLUSTERCTL_VERSION ?= v1.9.4
681+
CLUSTERCTL_VERSION ?= v1.11.2
682682
ADDLICENSE_VERSION ?= v1.1.1
683683
ENVSUBST_VERSION ?= v1.4.2
684684
AWSCLI_VERSION ?= 2.17.42

api/v1alpha1/go.mod

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
module github.com/K0rdent/kcm/api/v1alpha1
2+
3+
go 1.25.0
4+
5+
require (
6+
github.com/Masterminds/semver/v3 v3.4.0
7+
github.com/fluxcd/helm-controller/api v1.3.0
8+
github.com/fluxcd/source-controller/api v1.6.2
9+
github.com/projectsveltos/addon-controller v0.57.2
10+
github.com/projectsveltos/libsveltos v0.57.2
11+
github.com/stretchr/testify v1.11.1
12+
github.com/vmware-tanzu/velero v1.16.2
13+
k8s.io/api v0.34.0
14+
k8s.io/apiextensions-apiserver v0.34.0
15+
k8s.io/apimachinery v0.34.0
16+
sigs.k8s.io/controller-runtime v0.21.0
17+
)
18+
19+
require (
20+
github.com/beorn7/perks v1.0.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
24+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
25+
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
26+
github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
27+
github.com/fluxcd/pkg/apis/meta v1.21.0 // indirect
28+
github.com/fsnotify/fsnotify v1.9.0 // indirect
29+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
30+
github.com/go-logr/logr v1.4.3 // indirect
31+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
32+
github.com/go-openapi/jsonreference v0.21.0 // indirect
33+
github.com/go-openapi/swag v0.23.0 // indirect
34+
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/google/btree v1.1.3 // indirect
36+
github.com/google/gnostic-models v0.7.0 // indirect
37+
github.com/google/go-cmp v0.7.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
39+
github.com/josharian/intern v1.0.0 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
41+
github.com/mailru/easyjson v0.7.7 // indirect
42+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
43+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
44+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
45+
github.com/onsi/ginkgo/v2 v2.25.1 // indirect
46+
github.com/onsi/gomega v1.38.2 // indirect
47+
github.com/pkg/errors v0.9.1 // indirect
48+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
49+
github.com/prometheus/client_golang v1.23.2 // indirect
50+
github.com/prometheus/client_model v0.6.2 // indirect
51+
github.com/prometheus/common v0.66.1 // indirect
52+
github.com/prometheus/procfs v0.16.1 // indirect
53+
github.com/spf13/pflag v1.0.10 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
55+
go.yaml.in/yaml/v2 v2.4.2 // indirect
56+
go.yaml.in/yaml/v3 v3.0.4 // indirect
57+
golang.org/x/net v0.43.0 // indirect
58+
golang.org/x/oauth2 v0.30.0 // indirect
59+
golang.org/x/sync v0.17.0 // indirect
60+
golang.org/x/sys v0.35.0 // indirect
61+
golang.org/x/term v0.34.0 // indirect
62+
golang.org/x/text v0.29.0 // indirect
63+
golang.org/x/time v0.12.0 // indirect
64+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
65+
google.golang.org/protobuf v1.36.8 // indirect
66+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
67+
gopkg.in/inf.v0 v0.9.1 // indirect
68+
gopkg.in/yaml.v3 v3.0.1 // indirect
69+
k8s.io/client-go v0.34.0 // indirect
70+
k8s.io/klog/v2 v2.130.1 // indirect
71+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
72+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
73+
sigs.k8s.io/cluster-api v1.11.1 // indirect
74+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
75+
sigs.k8s.io/randfill v1.0.0 // indirect
76+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
77+
sigs.k8s.io/yaml v1.6.0 // indirect
78+
)
79+
80+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6
81+
82+
replace github.com/projectsveltos/libsveltos => github.com/projectsveltos/libsveltos v0.57.2
83+
84+
replace github.com/projectsveltos/addon-controller => github.com/projectsveltos/addon-controller v0.57.2
85+
86+
replace github.com/vmware-tanzu/velero => github.com/vmware-tanzu/velero v1.16.2
87+
88+
replace github.com/fluxcd/source-controller/api => github.com/fluxcd/source-controller/api v1.6.2
89+
90+
replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0
91+
92+
replace k8s.io/api => k8s.io/api v0.34.0
93+
94+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.0

0 commit comments

Comments
 (0)