Skip to content

Commit b8ae542

Browse files
authored
Merge pull request #337 from gianlucam76/main
Merge release-0.48 to main
2 parents 2218293 + d6e89b7 commit b8ae542

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
5959
CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
6060

6161
GOLANGCI_LINT_VERSION := "v1.62.2"
62-
CLUSTERCTL_VERSION := "v1.9.4"
62+
CLUSTERCTL_VERSION := "v1.9.5"
6363

6464
KUSTOMIZE_VER := v5.3.0
6565
KUSTOMIZE_BIN := kustomize

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/onsi/ginkgo/v2 v2.22.2
1010
github.com/onsi/gomega v1.36.2
1111
github.com/pkg/errors v0.9.1
12-
github.com/projectsveltos/libsveltos v0.48.0
12+
github.com/projectsveltos/libsveltos v0.48.1
1313
github.com/prometheus/client_golang v1.20.5
1414
github.com/spf13/pflag v1.0.6
1515
golang.org/x/text v0.22.0
@@ -20,7 +20,7 @@ require (
2020
k8s.io/component-base v0.32.2
2121
k8s.io/klog/v2 v2.130.1
2222
k8s.io/utils v0.0.0-20241210054802-24370beab758
23-
sigs.k8s.io/cluster-api v1.9.4
23+
sigs.k8s.io/cluster-api v1.9.5
2424
sigs.k8s.io/controller-runtime v0.20.2
2525
)
2626

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
136136
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
137137
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
138138
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
139-
github.com/projectsveltos/libsveltos v0.48.0 h1:GuWb6Rj4JnZ0STrsQLuvIQBCSogpMqM0K7hPboda2dY=
140-
github.com/projectsveltos/libsveltos v0.48.0/go.mod h1:RnzmXcTkeKygRcV2/6GuYrv3kdUYVyH7Aw4EAeSaENE=
139+
github.com/projectsveltos/libsveltos v0.48.1 h1:SWtACXeVNehWNxh/jEeFB/Z1QqMd4HeSh5Z60czwJbQ=
140+
github.com/projectsveltos/libsveltos v0.48.1/go.mod h1:9z2AUhSE2qzi+m5tqeQUMm+c4whMtbKH6oYOYY+0tbw=
141141
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
142142
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
143143
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
@@ -291,8 +291,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
291291
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
292292
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
293293
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
294-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
295-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
294+
sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
295+
sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
296296
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
297297
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
298298
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

pkg/agent/sveltos-agent-in-mgmt-cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- --run-mode=do-not-send-reports
4848
command:
4949
- /manager
50-
image: docker.io/projectsveltos/sveltos-agent@sha256:186836a3c2f1f30a4f97690eb53322c9c9c8dd778a5e31fc1ab70b5adb84ee2c
50+
image: docker.io/projectsveltos/sveltos-agent@sha256:2f8a05a2357d857ae58d2b7c0817120bf8d33113f0aaf509ca6777d1c6fcd2af
5151
livenessProbe:
5252
failureThreshold: 3
5353
httpGet:

pkg/agent/sveltos-agent-in-mgmt-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --run-mode=do-not-send-reports
3030
command:
3131
- /manager
32-
image: docker.io/projectsveltos/sveltos-agent@sha256:186836a3c2f1f30a4f97690eb53322c9c9c8dd778a5e31fc1ab70b5adb84ee2c
32+
image: docker.io/projectsveltos/sveltos-agent@sha256:2f8a05a2357d857ae58d2b7c0817120bf8d33113f0aaf509ca6777d1c6fcd2af
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

pkg/agent/sveltos-agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ spec:
198198
- --run-mode=do-not-send-reports
199199
command:
200200
- /manager
201-
image: docker.io/projectsveltos/sveltos-agent@sha256:186836a3c2f1f30a4f97690eb53322c9c9c8dd778a5e31fc1ab70b5adb84ee2c
201+
image: docker.io/projectsveltos/sveltos-agent@sha256:2f8a05a2357d857ae58d2b7c0817120bf8d33113f0aaf509ca6777d1c6fcd2af
202202
livenessProbe:
203203
failureThreshold: 3
204204
httpGet:

pkg/agent/sveltos-agent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ spec:
180180
- --run-mode=do-not-send-reports
181181
command:
182182
- /manager
183-
image: docker.io/projectsveltos/sveltos-agent@sha256:186836a3c2f1f30a4f97690eb53322c9c9c8dd778a5e31fc1ab70b5adb84ee2c
183+
image: docker.io/projectsveltos/sveltos-agent@sha256:2f8a05a2357d857ae58d2b7c0817120bf8d33113f0aaf509ca6777d1c6fcd2af
184184
livenessProbe:
185185
failureThreshold: 3
186186
httpGet:

0 commit comments

Comments
 (0)