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.
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
tetragon: use latest cilium module (v1.13.1) #882
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
You have successfully added a new CodeQL configuration |
After 21c49af ("pkg/cilium: move old hubble code in tetragon repo"), we can now the cilium package we use to 1.13.1. There was still one change needed due to cilium/cilium@97f3b48. ``` diff --git a/pkg/oldhubble/cilium/endpoint.go b/pkg/oldhubble/cilium/endpoint.go index 13b07e38c..443b16cca 100644 --- a/pkg/oldhubble/cilium/endpoint.go +++ b/pkg/oldhubble/cilium/endpoint.go @@ -97,7 +97,7 @@ func (s *State) consumeEndpointEvents() { // sets the time when the endpoint was deleted. If not found, stores // a new endpoint in the cache, as well with the time when the // endpoint was deleted. - edn := monitorAPI.EndpointDeleteNotification{} + edn := monitorAPI.EndpointNotification{} err := json.Unmarshal([]byte(an.Text), &edn) if err != nil { s.log.WithField("EndpointDeleteNotification", an.Text).Error("Unable to unmarshal EndpointDeleteNotification") diff --git a/pkg/oldhubble/parser/endpoint/endpoint.go b/pkg/oldhubble/parser/endpoint/endpoint.go index 1fe6d7ed7..c74f539be 100644 --- a/pkg/oldhubble/parser/endpoint/endpoint.go +++ b/pkg/oldhubble/parser/endpoint/endpoint.go @@ -70,7 +70,7 @@ func ParseEndpointFromModel(modelEP *models.Endpoint) *v1.Endpoint { // ParseEndpointFromEndpointDeleteNotification returns an endpoint parsed from // the EndpointDeleteNotification. -func ParseEndpointFromEndpointDeleteNotification(edn monitorAPI.EndpointDeleteNotification) *v1.Endpoint { +func ParseEndpointFromEndpointDeleteNotification(edn monitorAPI.EndpointNotification) *v1.Endpoint { return &v1.Endpoint{ ID: edn.ID, PodName: edn.PodName, ``` Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
kkourt
force-pushed
the
pr/kkourt/update-cilium-1.13.1
branch
4 times, most recently
from
April 4, 2023 16:06
620f9ae
to
c9cdf33
Compare
Blindly copying: cilium/cilium@142182c Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
Replace "github.com/cilium/tetragon/pkg/oldhubbleapi/v1/flow" with "github.com/cilium/cilium/api/v1/flow", and deal with the breakage. Also, remove pkg/oldhubbleapi which is not needed. Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
sync dependencies across modules. Also, remove "-compat 1.8" from all go mod tidy commands. Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
golangci reported: tests/e2e/helpers/exec.go:49:9 staticcheck SA1019: exec.Stream is deprecated: use StreamWithContext instead to avoid possible resource leaks. See kubernetes/kubernetes#103177 for details. Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
kkourt
force-pushed
the
pr/kkourt/update-cilium-1.13.1
branch
from
April 4, 2023 16:14
c9cdf33
to
83e70d0
Compare
michi-covalent
approved these changes
Apr 4, 2023
willfindlay
approved these changes
Apr 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The original intention was just to upgrade the cilium version we use.
First, align_checker broke so I updated our bpf code based on cilium/cilium@142182c. Next, there was an issue of having the
Flow
registered twice in the grpc handlers: from cilium and from the oldhubbleapi, so I removed the second. Next I synced the modules so we would usegithub.com/cilium/controller-tools@v0.6.2
andgithub.com/cilium/ebpf@v0.9.4-0.20221026141156-bcf6c12e189d
everywhere. See pathces for the rest.After 21c49af ("pkg/cilium: move old hubble code in tetragon repo"), we can now update the cilium package we use to 1.13.1.
There was still one change needed due to cilium/cilium@97f3b48.
Fixes: #571