Skip to content

Commit 57ceb8b

Browse files
authored
fix: cap konnectivity image to 0.34.0 (#128)
chore: bump cilium for CVE chore: adjust taskfile to ignore worktrees during scanning
1 parent 02fcff8 commit 57ceb8b

4 files changed

Lines changed: 17 additions & 15 deletions

File tree

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/blang/semver/v4 v4.0.0
1212
github.com/caarlos0/env/v6 v6.10.1
1313
github.com/cert-manager/cert-manager v1.19.3
14-
github.com/cilium/cilium v1.19.2
14+
github.com/cilium/cilium v1.19.3
1515
github.com/coredns/corefile-migration v1.0.30
1616
github.com/go-logr/logr v1.4.3
1717
github.com/onsi/gomega v1.39.1
@@ -30,17 +30,17 @@ require (
3030
go4.org v0.0.0-20260112195520-a5071408f32f
3131
golang.org/x/text v0.33.0
3232
google.golang.org/grpc v1.80.0
33-
k8s.io/api v0.35.2
34-
k8s.io/apiextensions-apiserver v0.35.2
35-
k8s.io/apimachinery v0.35.2
36-
k8s.io/apiserver v0.35.2
37-
k8s.io/client-go v0.35.2
33+
k8s.io/api v0.35.3
34+
k8s.io/apiextensions-apiserver v0.35.3
35+
k8s.io/apimachinery v0.35.3
36+
k8s.io/apiserver v0.35.3
37+
k8s.io/client-go v0.35.3
3838
k8s.io/cluster-bootstrap v0.35.0
39-
k8s.io/component-base v0.35.2
39+
k8s.io/component-base v0.35.3
4040
k8s.io/kube-proxy v0.35.0
4141
k8s.io/kubelet v0.35.0
4242
k8s.io/kubernetes v1.35.1
43-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
43+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
4444
sigs.k8s.io/cluster-api v1.12.2
4545
sigs.k8s.io/controller-runtime v0.23.3
4646
sigs.k8s.io/gateway-api v1.4.1
@@ -186,7 +186,7 @@ require (
186186
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
187187
gopkg.in/inf.v0 v0.9.1 // indirect
188188
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
189-
k8s.io/cli-runtime v0.35.2 // indirect
189+
k8s.io/cli-runtime v0.35.3 // indirect
190190
k8s.io/cloud-provider v0.35.0 // indirect
191191
k8s.io/component-helpers v0.35.0 // indirect
192192
k8s.io/controller-manager v0.35.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ github.com/cert-manager/cert-manager v1.19.3 h1:3d0Nk/HO3BOmAdBJNaBh+6YgaO3Ciey3
7878
github.com/cert-manager/cert-manager v1.19.3/go.mod h1:e9NzLtOKxTw7y99qLyWGmPo6mrC1Nh0EKKcMkRfK+GE=
7979
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
8080
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
81-
github.com/cilium/cilium v1.19.2 h1:891hXerzal4vBVjjlCsyV47DQDI77+f9mzf1ulWF54E=
82-
github.com/cilium/cilium v1.19.2/go.mod h1:BRn4WvJVo/V9clDdwE12uNCq4tdWSGm9hYjCL44LC5g=
81+
github.com/cilium/cilium v1.19.3 h1:foJrHPk45HwshOd8Qf/kptf9JxPfNySkIDKsetZa9+Y=
82+
github.com/cilium/cilium v1.19.3/go.mod h1:cd4P5LHAg4hyyZexrM4D055t5JwyudeAcZ/Jub9VxJY=
8383
github.com/cilium/ebpf v0.20.1-0.20260218191617-ee67e7f43dd9 h1:hQW7n5ePt/HDgeZLcyT3pFENyfa6vmaGU7M+tq2pa64=
8484
github.com/cilium/ebpf v0.20.1-0.20260218191617-ee67e7f43dd9/go.mod h1:EGj6HpG/oejvbTAsMWwlA4UbMU7WBAgILd+9OSvcDTc=
8585
github.com/cilium/hive v0.0.1 h1:NrHJ1DD74B77ib4UhujEQ0j4nCQmyKOic9qtwrreJRs=
@@ -532,8 +532,8 @@ k8s.io/kubelet v0.35.0 h1:8cgJHCBCKLYuuQ7/Pxb/qWbJfX1LXIw7790ce9xHq7c=
532532
k8s.io/kubelet v0.35.0/go.mod h1:ciRzAXn7C4z5iB7FhG1L2CGPPXLTVCABDlbXt/Zz8YA=
533533
k8s.io/kubernetes v1.35.1 h1:qmjXSCDPnOuXPuJb5pv+eLzpXhhlD09Jid1pG/OvFU8=
534534
k8s.io/kubernetes v1.35.1/go.mod h1:AaPpCpiS8oAqRbEwpY5r3RitLpwpVp5lVXKFkJril58=
535-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
536-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
535+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
536+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
537537
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec=
538538
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
539539
sigs.k8s.io/cluster-api v1.12.2 h1:+b+M2IygfvFZJq7bsaloNakimMEVNf81zkGR1IiuxXs=

pkg/operator/util/images.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ func ResolveKonnectivityImage(imageSpec *v1alpha1.ImageSpec, component string, m
3939
imageSpec,
4040
"registry.k8s.io",
4141
fmt.Sprintf("kas-network-proxy/%s", component),
42-
fmt.Sprintf("v0.%d.0", minorVersion),
42+
// there is no image for 35 and above
43+
// TODO: update when new image is available
44+
fmt.Sprintf("v0.%d.0", min(minorVersion, 34)),
4345
)
4446
}
4547

taskfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ tasks:
106106
sources:
107107
- go.mod
108108
- go.sum
109-
cmd: "{{ .grypeCmd }} --name cacpphcp dir:. --exclude ./build --only-fixed --by-cve --fail-on negligible"
109+
cmd: "{{ .grypeCmd }} --name cacpphcp dir:. --exclude ./build --exclude ./*/worktree*/* --only-fixed --by-cve --fail-on negligible"
110110
lint:
111111
vars:
112112
fix: '{{ .fix | default "false" }}'

0 commit comments

Comments
 (0)