Skip to content

Commit 7bf2329

Browse files
gianlucam76gianlucam76
committed
(chore) advance to k8s v1.35.0
This PR also advances: - the kubernetes version of the clusters used for fv to v1.35.0 (both control cluster and managed cluster) - golanglint-ci to v2.7.2 - clusterapi to v1.2.1
1 parent 0b65756 commit 7bf2329

File tree

7 files changed

+198
-242
lines changed

7 files changed

+198
-242
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.34.0
5+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.35.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -67,10 +67,10 @@ CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
6767
KIND := $(TOOLS_BIN_DIR)/kind
6868
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
6969

70-
GOLANGCI_LINT_VERSION := "v2.5.0"
71-
CLUSTERCTL_VERSION := v1.12.0
70+
GOLANGCI_LINT_VERSION := "v2.7.2"
71+
CLUSTERCTL_VERSION := v1.12.1
7272

73-
KUSTOMIZE_VER := v5.7.0
73+
KUSTOMIZE_VER := v5.8.0
7474
KUSTOMIZE_BIN := kustomize
7575
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
7676
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
@@ -163,7 +163,7 @@ endif
163163
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
164164
# this default value is used
165165
ifndef K8S_VERSION
166-
K8S_VERSION := v1.34.0
166+
K8S_VERSION := v1.35.0
167167
endif
168168

169169
KIND_CONFIG ?= kind-cluster.yaml

‎go.mod‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ require (
77
github.com/fluxcd/source-controller/api v1.7.4
88
github.com/gin-gonic/gin v1.11.0
99
github.com/go-logr/logr v1.4.3
10-
github.com/modelcontextprotocol/go-sdk v1.1.0
10+
github.com/modelcontextprotocol/go-sdk v1.2.0
1111
github.com/onsi/ginkgo/v2 v2.27.3
1212
github.com/onsi/gomega v1.38.3
1313
github.com/pkg/errors v0.9.1
14-
github.com/projectsveltos/addon-controller v1.3.1
15-
github.com/projectsveltos/event-manager v1.3.1
16-
github.com/projectsveltos/libsveltos v1.3.1
14+
github.com/projectsveltos/addon-controller v1.3.1-0.20260103154745-aaa98e292937
15+
github.com/projectsveltos/event-manager v1.3.1-0.20260103162850-6b18e6119fbe
16+
github.com/projectsveltos/libsveltos v1.3.2-0.20260103131048-3e231674542f
1717
github.com/spf13/pflag v1.0.10
18-
k8s.io/api v0.34.3
19-
k8s.io/apiextensions-apiserver v0.34.3
20-
k8s.io/apimachinery v0.34.3
21-
k8s.io/client-go v0.34.3
22-
k8s.io/component-base v0.34.3
18+
k8s.io/api v0.35.0
19+
k8s.io/apiextensions-apiserver v0.35.0
20+
k8s.io/apimachinery v0.35.0
21+
k8s.io/client-go v0.35.0
22+
k8s.io/component-base v0.35.0
2323
k8s.io/klog/v2 v2.130.1
24-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
25-
sigs.k8s.io/cluster-api v1.12.0
24+
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
25+
sigs.k8s.io/cluster-api v1.12.1
2626
sigs.k8s.io/controller-runtime v0.22.4
2727
)
2828

@@ -61,7 +61,6 @@ require (
6161
github.com/gobuffalo/flect v1.0.3 // indirect
6262
github.com/goccy/go-json v0.10.3 // indirect
6363
github.com/goccy/go-yaml v1.18.0 // indirect
64-
github.com/gogo/protobuf v1.3.2 // indirect
6564
github.com/google/btree v1.1.3 // indirect
6665
github.com/google/cel-go v0.26.1 // indirect
6766
github.com/google/gnostic-models v0.7.0 // indirect
@@ -105,13 +104,13 @@ require (
105104
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
106105
github.com/yuin/gopher-lua v1.1.1 // indirect
107106
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
108-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
109-
go.opentelemetry.io/otel v1.35.0 // indirect
107+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
108+
go.opentelemetry.io/otel v1.36.0 // indirect
110109
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
111110
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
112-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
113-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
114-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
111+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
112+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
115114
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
116115
go.yaml.in/yaml/v2 v2.4.3 // indirect
117116
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -129,17 +128,17 @@ require (
129128
golang.org/x/tools v0.39.0 // indirect
130129
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
131130
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
132-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
131+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
133132
google.golang.org/grpc v1.72.3 // indirect
134133
google.golang.org/protobuf v1.36.10 // indirect
135-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
134+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
136135
gopkg.in/inf.v0 v0.9.1 // indirect
137136
gopkg.in/yaml.v3 v3.0.1 // indirect
138-
k8s.io/apiserver v0.34.3 // indirect
137+
k8s.io/apiserver v0.35.0 // indirect
139138
k8s.io/cluster-bootstrap v0.34.2 // indirect
140-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
139+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
141140
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
142-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
141+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
143142
sigs.k8s.io/randfill v1.0.0 // indirect
144143
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
145144
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)