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

tetragon: use latest cilium module (v1.13.1) #882

Merged
merged 6 commits into from
Apr 5, 2023
Merged

tetragon: use latest cilium module (v1.13.1) #882

merged 6 commits into from
Apr 5, 2023

Commits on Apr 4, 2023

  1. tetragon: use latest cilium module (v1.13.1) 

    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
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    53922b8 View commit details
    Browse the repository at this point in the history

  2. bpf_alignchecker: change structs to global variables 

    Blindly copying: cilium/cilium@142182c

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
    @kkourt
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    173b21a View commit details
    Browse the repository at this point in the history

  3. pkg/oldhubble: remove oldhubbleapi 

    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>
    @kkourt
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    bf814b4 View commit details
    Browse the repository at this point in the history

  4. tetragon: update dependencies 

    sync dependencies across modules. Also, remove "-compat 1.8" from all
go mod tidy commands.

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
    @kkourt
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    3ff3078 View commit details
    Browse the repository at this point in the history

  5. pkg/k8s: use github.com/blang/semver/v4 

    Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
    @kkourt
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0f35415 View commit details
    Browse the repository at this point in the history

  6. tests/e2e: use StreamWithContext instead of Stream 

    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
    kkourt committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    83e70d0 View commit details
    Browse the repository at this point in the history