From 850b07e94421c2bfb2ef25662d6f8b5d5c7bd7ac Mon Sep 17 00:00:00 2001 From: Cyrill Troxler Date: Sun, 19 Jan 2025 14:52:09 +0100 Subject: [PATCH] feat: upgrade to Go 1.23 --- .github/workflows/ci.yml | 10 +++++----- activator/bpf_bpfeb.o | Bin 7944 -> 7720 bytes activator/bpf_bpfel.o | Bin 7984 -> 7760 bytes cmd/installer/Dockerfile | 2 +- cmd/manager/Dockerfile | 2 +- go.mod | 14 ++++++-------- go.sum | 20 ++++++++++---------- socket/Dockerfile | 4 ++-- socket/bpf_bpfeb.o | Bin 30384 -> 30232 bytes socket/bpf_bpfel.o | Bin 30384 -> 30232 bytes 10 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13d752c..c40066a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,12 +11,12 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - uses: dominikh/staticcheck-action@v1.3.1 with: install-go: false - version: "2023.1.6" + version: "2024.1" test: runs-on: ubuntu-latest @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - name: test run: sudo --preserve-env make test @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - name: Install protoc-gen-go run: | @@ -78,7 +78,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" - name: e2e run: make test-e2e diff --git a/activator/bpf_bpfeb.o b/activator/bpf_bpfeb.o index 4c3304eda85d14c2b30efc74c0cf2eb761157b4a..9be16af1bef24b56996ab68208de0cc34c09eb1c 100644 GIT binary patch delta 416 zcmeCMTVXRnk4fsqMgtB;mQV%;_Q@`cI-EcTBLfhyZZ2djV`H?K{DR${(R{N8$8IJ@ zsm)KgWZCtL^OLg~k_yt|({l35!592xiJ*U|{N)Y#^k~s5Uu9 z=}oL2QmW)*i%3R5X1NdP&SNT!@wW}HV`H-1*m{ybBlO4li(I06XY(a6w{H(3Q{xJ zx%mZo1bF!--;psrv%%y7IdevZ$t&dS6)PZO3^#x@$Q~vrALJ(xkN^Ox5I-9L delta 615 zcmZ2s(_uG3k4gH(MgtB;M$yTcjB=Cx86_D-Hy1LNu`!xYe!*_fXt7y?V>c6{{N^WI zvh4b4Ir-)B*{PMq3`qrP@x}Sc*$l7eGco{y0*C+t83<1; z4j|tStO7_(mJu#ybeKFr_&zU?hY;VKBVx~(dj}}S3{lEh0inUAqx3n2Xfh&d5_MhP^&2awN&kY@tv7z+>s z0ecFN0LjDn1wb~)d>Frmfk6mtAWUEiP?C4^8?kOC!4*Iz$X!q=rX7%^*BOgUJh-JSS^Q%W&QY z84CnYCI?7wXM8c4L*^foxW!}+S$D>k$pNxvT;d%N1>Y0J6KY;Zxfc3Hf*$NOt;QR%yc8rph*^Nd2dSw+@P!ya22Mc;FmP;ME8ff`xCLqlNIl4&Ba4B{;rz?21qG6zwH@n#U7p~2*XOm33{ zq$N1nr6J}%nOrEnok>7^vX;z0rUW1*>&DnJxlq=ebAvcUMZn~ZvgS+-(vx4w+G!jR Tg$g1C5XdW_KmY*=2*m&Z>6t^s diff --git a/cmd/installer/Dockerfile b/cmd/installer/Dockerfile index 84ce07b..f9e1ac4 100644 --- a/cmd/installer/Dockerfile +++ b/cmd/installer/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22 as builder +FROM --platform=$BUILDPLATFORM golang:1.23 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/cmd/manager/Dockerfile b/cmd/manager/Dockerfile index 2c66da5..e4483fe 100644 --- a/cmd/manager/Dockerfile +++ b/cmd/manager/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22 as builder +FROM --platform=$BUILDPLATFORM golang:1.23 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/go.mod b/go.mod index 9fa13a1..3fed88b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/ctrox/zeropod -go 1.22.0 - -toolchain go1.22.7 +go 1.23.0 require ( github.com/cilium/ebpf v0.16.0 @@ -32,7 +30,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/vishvananda/netlink v1.3.0 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 - golang.org/x/sys v0.25.0 + golang.org/x/sys v0.28.0 google.golang.org/protobuf v1.34.2 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 @@ -123,11 +121,11 @@ require ( go.opentelemetry.io/otel/trace v1.30.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.29.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.6.0 // indirect google.golang.org/genproto v0.0.0-20240924160255-9d4c2d233b61 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect diff --git a/go.sum b/go.sum index d77e693..7061091 100644 --- a/go.sum +++ b/go.sum @@ -390,8 +390,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= @@ -401,8 +401,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -420,14 +420,14 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/socket/Dockerfile b/socket/Dockerfile index 76cc95b..cf90e8e 100644 --- a/socket/Dockerfile +++ b/socket/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 as gomod +FROM golang:1.23 as gomod WORKDIR /app ADD go.* /app @@ -7,7 +7,7 @@ ADD go.* /app RUN go mod download # we use fedora since it has a recent version of bpftool -FROM fedora:39 +FROM fedora:41 RUN dnf install -y llvm clang bpftool libbpf-devel golang RUN mkdir /headers diff --git a/socket/bpf_bpfeb.o b/socket/bpf_bpfeb.o index 6b76b6af0aea4d4a6550d19cca431a25469d45bb..eaefa0fc596336ab3f8735faa4942945b822ff19 100644 GIT binary patch delta 504 zcmdn+mT|@##tC{%MK?AYgbOpKZ|)FY&dgY_*+5*GnKy$02$(X64NS$w1|ECf6vfX3U$cp{zXF+Ja|uxbhN4#{A8HRP2Qrb2r;qOk$gS z%Z^tvjvb^2474(k*u|3#?3HbskVGaRv1cK%S0b^uAlPh7n?vjcbVZW$a|?1(OEUBG z7)py%i{kSVb5kehw*cBe-{KeG6UrqA+BYp0Mf|(8>oC+4Je-lqTbd4NV81tDSWLX17v|r zfyyxIpz&>Bd~RNz$(M`zCl?hvPEKItn7p}IhSM1+2?G6-ZxnB1DtIt?Ldkzdfyom} u-5Gr*-zYWbG=Rth#U#qi8674El-VnSBMvAIax=(gNE|URa6r^DNB{ulCt}tB delta 649 zcmbR7hH=AN#tC{%#RVG;!i5<#Hg^awXJ*XXY#^@8%$v>t1WX`;fiZJ)f|NQFW7gyj znPA4E&39xbv-0MHWT5helWUY#Pp($tnQW{q!C0`_M|nLXWA5fZD)z#Yy_I=3yIZug zO}=Hv6UHCJ4$=k&S{Vp78xw-9RffcFL1OnIvF9SOS4{q5r_8v0bBMiwE=OWYN>OTY zas1?p91F?P;?$z}yu{qp;)2BFREFgI+=86clFawG8 MNbY9ffQm~103O?L#sB~S diff --git a/socket/bpf_bpfel.o b/socket/bpf_bpfel.o index 6b400f07d0333a32bad624619c232efaf96b4d71..a8c8c0f9f4019e84d36fa657c4c1950c7e1eefdc 100644 GIT binary patch delta 541 zcmdn+mT|@##t9lsH;OiDMF}&eZEh82W@gNo+$px0v0$^VxIQyu;pSK=btcB5$*nTM zjG3En%1mbE&0=JL0j8YEl}f7_^Cqh*D^Iqt;Mp9ayo8Z4fAdcjdtt`h&6XDJY=%Mn zVAbp(GENJ@))PdqGmylKC+pfP+chDHOh97KLSnB(VsAlWGqG(BvKP`7NzTtL$Vn~9 z%+F&eElw?p&r8frot%?n!JC+pQj}U;9A8|Jn4G$KZ%#fF+Z~`|J}^u+%2#6KogA8P zJb6Zbz~mqK29qrcCQSZO5aP%TR8RqSF#`iA06_d3XnYM@hyV*z-T{fvGP$?#v9Sy^ z>_93&OdT}74H}=DmuK?jqW;N6#debu7&#_yD3;)KE`r$7Klx(ucBTgfleV3|3q14#Mgjm5%~6UsC+G72Da$X;Or3UNS$86==I08P1O AUjP6A delta 709 zcmbR7hH=AN#t9ls1;rb+qJ$YUHn$2hGc%@5?i5?hn73J1T%VaSb91beIum2o>x5u3&9TJN3b)H#F^L-;$=wUElBJ>B=%e+_KL|L?Ub3eYi$m)7t-ZOOi3w9 zEiR6qT#;iTSz4T06rY!vn_66un4HRxoS$2elUkCQpSO8$PCgSG571i*jFXM>l^6vk zhvpmeX#ic}1QhfIVxySJZTUgG1yG@OO$G-3$yf7@c@IEE9)m?#3nnX01Bx&(Ff*(G z(+Hv;%w%TxF}brK*^w25fyURcg$S@fTd=0Yfj$s3EsCx;i$WO68+{HgdKW5MK)CGLzhlPycl qIVTiC6gf<;EH!7mFnMFCy~YesPy+!h6hRIH`H}-92m}%kiU9y?Q+n_K