Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cilium/cilium to v1.13.4 #1211

Merged
merged 2 commits into from
Jul 11, 2023
Merged

Update cilium/cilium to v1.13.4 #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ec931c
Update cilium/cilium to v1.13.4
tpapagian Jul 11, 2023
d63c481
Update to Go 1.19 in actions
tpapagian Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/gotests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with:
go-version: '1.18.3'
go-version: '1.19.6'

- name: Install dependencies
run: |
Expand All @@ -51,6 +51,7 @@ jobs:
GOPATH: ${{ env.GITHUB_WORKSPACE }}/go
SUDO: sudo -E
run: |
go clean -cache -modcache -testcache -fuzzcache
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting an error in gotests without that:

[...]
gcc -Wall exit-code.c -o exit-code -lpthread
gcc -Wall -fPIC uprobe-lib.c -o libuprobe.so -shared
gcc -Wall uprobe-test.c -o uprobe-test-1 /home/runner/work/tetragon/tetragon/go/src/github.com/cilium/tetragon/contrib/tester-progs/libuprobe.so
cp uprobe-test-1 uprobe-test-2
go build -o lseek-pipe ./go/lseek-pipe
open /home/runner/.cache/go-build/ca/ca1e2fb1ac5d864e241cc2379993cf70727712c40e99cc34bfe4fa90ae232d57-d: permission denied
make[1]: *** [Makefile:56: lseek-pipe] Error 1
make[1]: Leaving directory '/home/runner/work/tetragon/tetragon/go/src/github.com/cilium/tetragon/contrib/tester-progs'
make: *** [Makefile:355: tester-progs] Error 2
Error: Process completed with exit code 2.
[...]

cd go/src/github.com/cilium/tetragon/
make check-copyright
sudo -E echo "run go tests: " `uname -a`
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with:
go-version: '1.18.3'
go-version: '1.19.6'

- name: Set Up Job Variables
id: vars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with:
go-version: '1.18.3'
go-version: '1.19.6'
- name: Run static checks
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3.6.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vmtests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with:
go-version: '1.18.3'
go-version: '1.19.6'

- name: Checkout code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down
2 changes: 1 addition & 1 deletion api/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# github.com/cilium/tetragon v0.0.0-00010101000000-000000000000 => ../../tetragon
## explicit; go 1.18
## explicit; go 1.19
github.com/cilium/tetragon/pkg/matchers/bytesmatcher
github.com/cilium/tetragon/pkg/matchers/listmatcher
github.com/cilium/tetragon/pkg/matchers/stringmatcher
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/cilium/tetragon

go 1.18
go 1.19

require (
github.com/cilium/cilium v1.13.1
github.com/cilium/cilium v1.13.4
github.com/cilium/ebpf v0.11.0
github.com/cilium/little-vm-helper v0.0.7
github.com/cilium/lumberjack/v2 v2.3.0
Expand Down
6 changes: 3 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ github.com/chancez/lumberjack v0.0.0-20220314160755-2b78c6a5f7bc/go.mod h1:MTkMt
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/cilium/cilium v1.13.1 h1:6JzlYiZw1HqToqZJd5Hb6Xk1QasptOEUS1UUO4LneBQ=
github.com/cilium/cilium v1.13.1/go.mod h1:xHiUYiRvIsJTqkkTq7xNWXBDZZ5UqyrYJktYZJYuYjI=
github.com/cilium/cilium v1.13.4 h1:rvbcA6q7YMWtDfEtx9y4olL46wBFoZfM2BazUoJlaRI=
github.com/cilium/cilium v1.13.4/go.mod h1:bppTjxboubrsI835+yp3vZ2S79wRQbZCbUiHxrAIOQY=
github.com/cilium/controller-tools v0.6.2 h1:oIkqAzqncKsm+lQFJVP6n+bqHOVs9nUZ06hgZ4PxlMM=
github.com/cilium/controller-tools v0.6.2/go.mod h1:oaeGpjXn6+ZSEIQkUe/+3I40PNiDYp9aeawbt3xTgJ8=
github.com/cilium/dns v1.1.50 h1:GI0YxPPOANR68M7py43EckDho0Idf5i0M7Tce7bYDNk=
Expand All @@ -111,7 +111,7 @@ github.com/cilium/little-vm-helper v0.0.7 h1:v/ZhUSUbVOs6usDMBYNAPt1IHnoTKZGsPdi
github.com/cilium/little-vm-helper v0.0.7/go.mod h1:cxTPqcalrh3TIPkdteb7SYq3hiXT7qYaRMASV7tdL0k=
github.com/cilium/lumberjack/v2 v2.3.0 h1:IhVJMvPpqDYmQzC0KDhAoy7KlaRsyOsZnT97Nsa3u0o=
github.com/cilium/lumberjack/v2 v2.3.0/go.mod h1:yfbtPGmg4i//5oEqzaMxDqSWqgfZFmMoV70Mc2k6v0A=
github.com/cilium/proxy v0.0.0-20230219184343-04413917ff99 h1:5NGvGz6Rdh1SmDuLl3CSBBv8IC+935Zn5bMS1X7koMk=
github.com/cilium/proxy v0.0.0-20230605062201-ca87bee70e40 h1:+c52Z2Fy2QcL/4Ri4OMCSeMLrTDdhPsXqzi6IIZ26kk=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/cilium/tetragon/pkg/k8s

go 1.18
go 1.19

require (
github.com/blang/semver/v4 v4.0.0
github.com/cilium/cilium v1.13.1
github.com/cilium/cilium v1.13.4
github.com/sirupsen/logrus v1.9.3
golang.org/x/sync v0.3.0
k8s.io/apiextensions-apiserver v0.26.6
Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
github.com/chancez/lumberjack v0.0.0-20220314160755-2b78c6a5f7bc/go.mod h1:MTkMtVFAjFChVkoycc9XjGGH6jiuI6qO71iEdcyNq7I=
github.com/christarazi/controller-tools v0.3.1-0.20200911184030-7e668c1fb4c2 h1:e8rUgm4lkgItm5/qX43VmvtRkxaOhLIPP6gWjP9Eib4=
github.com/christarazi/controller-tools v0.3.1-0.20200911184030-7e668c1fb4c2/go.mod h1:hJyC9ybFldjAq/sR0x8jwbV9g0uPxjl8fqBa+mVa3DE=
github.com/cilium/cilium v1.13.1 h1:6JzlYiZw1HqToqZJd5Hb6Xk1QasptOEUS1UUO4LneBQ=
github.com/cilium/cilium v1.13.1/go.mod h1:xHiUYiRvIsJTqkkTq7xNWXBDZZ5UqyrYJktYZJYuYjI=
github.com/cilium/cilium v1.13.4 h1:rvbcA6q7YMWtDfEtx9y4olL46wBFoZfM2BazUoJlaRI=
github.com/cilium/cilium v1.13.4/go.mod h1:bppTjxboubrsI835+yp3vZ2S79wRQbZCbUiHxrAIOQY=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
Expand Down
25 changes: 23 additions & 2 deletions pkg/k8s/vendor/github.com/cilium/cilium/AUTHORS
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/k8s/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/k8s/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# github.com/blang/semver/v4 v4.0.0
## explicit; go 1.14
github.com/blang/semver/v4
# github.com/cilium/cilium v1.13.1
# github.com/cilium/cilium v1.13.4
## explicit; go 1.19
github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/labels
github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/meta/v1
Expand Down
Loading