Use the upstream Hubble packages

Hubble APIs have been very stable, so let's use the upstream version instead of maintaining our own copy. Signed-off-by: Michi Mutsuzaki <[email protected]>
cilium · Jun 6, 2024 · 0a1e20c · 0a1e20c
1 parent bc38bac
commit 0a1e20c
Show file tree

Hide file tree

Showing 75 changed files with 1,031 additions and 15,411 deletions.
diff --git a/cmd/tetra/getevents/io_reader_client.go b/cmd/tetra/getevents/io_reader_client.go
@@ -10,11 +10,11 @@ import (
 	"io"
 	"os"
 
+	hubbleV1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
 	"github.com/cilium/tetragon/pkg/fieldfilters"
 	"github.com/cilium/tetragon/pkg/filters"
-	hubbleV1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/encoding/protojson"
 )

diff --git a/go.mod b/go.mod
@@ -18,8 +18,6 @@ require (
 	github.com/deckarep/golang-set/v2 v2.6.0
 	github.com/fatih/color v1.17.0
 	github.com/go-openapi/strfmt v0.23.0
-	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.5.4
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gops v0.3.28
 	github.com/google/uuid v1.6.0
@@ -108,7 +106,9 @@ require (
 	github.com/go-openapi/validate v0.22.3 // indirect
 	github.com/gobuffalo/flect v1.0.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/cel-go v0.17.7 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect

diff --git a/pkg/filters/arguments_regex.go b/pkg/filters/arguments_regex.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"regexp"
 
+	hubbleV1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	hubbleV1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 func filterByArgumentsRegex(argumentsPatterns []string) (hubbleFilters.FilterFunc, error) {

diff --git a/pkg/filters/arguments_regex_test.go b/pkg/filters/arguments_regex_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/binary_regex.go b/pkg/filters/binary_regex.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"regexp"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 func filterByBinaryRegex(binaryPatterns []string) (hubbleFilters.FilterFunc, error) {

diff --git a/pkg/filters/binary_regex_test.go b/pkg/filters/binary_regex_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/caps.go b/pkg/filters/caps.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"strings"
 
+	hubbleV1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	hubbleV1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 	"github.com/cilium/tetragon/pkg/option"
 	mapset "github.com/deckarep/golang-set/v2"
 	"google.golang.org/protobuf/reflect/protoreflect"

diff --git a/pkg/filters/caps_test.go b/pkg/filters/caps_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/eventType.go b/pkg/filters/eventType.go
@@ -6,9 +6,9 @@ package filters
 import (
 	"context"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 

diff --git a/pkg/filters/filters.go b/pkg/filters/filters.go
@@ -10,10 +10,10 @@ import (
 	"io"
 	"strings"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
 	"github.com/cilium/tetragon/api/v1/tetragon/codegen/helpers"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 // ParseFilterList parses a list of process filters in JSON format into protobuf messages.

diff --git a/pkg/filters/filters_test.go b/pkg/filters/filters_test.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/cilium/tetragon/pkg/option"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"

diff --git a/pkg/filters/health_check.go b/pkg/filters/health_check.go
@@ -7,9 +7,9 @@ import (
 	"context"
 	"path"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 	shell "github.com/kballard/go-shellquote"
 )
 

diff --git a/pkg/filters/health_check_test.go b/pkg/filters/health_check_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )

diff --git a/pkg/filters/labels.go b/pkg/filters/labels.go
@@ -7,10 +7,10 @@ import (
 	"context"
 	"fmt"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	k8sLabels "github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/labels"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 // FilterByLabelSelectors returns a FilterFunc. The FilterFunc returns true if and only if any of the

diff --git a/pkg/filters/labels_test.go b/pkg/filters/labels_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/namespace.go b/pkg/filters/namespace.go
@@ -6,9 +6,9 @@ package filters
 import (
 	"context"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 func filterByNamespace(namespaces []string) hubbleFilters.FilterFunc {

diff --git a/pkg/filters/namespace_test.go b/pkg/filters/namespace_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/pid.go b/pkg/filters/pid.go
@@ -6,9 +6,9 @@ package filters
 import (
 	"context"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 func filterByPid(pids []uint32) hubbleFilters.FilterFunc {

diff --git a/pkg/filters/pidSet.go b/pkg/filters/pidSet.go
@@ -6,10 +6,10 @@ package filters
 import (
 	"context"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
 	"github.com/cilium/tetragon/pkg/logger"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 // We could use an LRU here but we really don't want to evict old entries and risk failing

diff --git a/pkg/filters/pod_regex.go b/pkg/filters/pod_regex.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"regexp"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 func filterByPodRegex(podPatterns []string) (hubbleFilters.FilterFunc, error) {

diff --git a/pkg/filters/pod_regex_test.go b/pkg/filters/pod_regex_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/filters/policies.go b/pkg/filters/policies.go
@@ -6,9 +6,9 @@ package filters
 import (
 	"context"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	hubbleFilters "github.com/cilium/cilium/pkg/hubble/filters"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
-	hubbleFilters "github.com/cilium/tetragon/pkg/oldhubble/filters"
 )
 
 // filterByPolicyName returns a FilterFunc. The FilterFunc returns true if and only if any of the

diff --git a/pkg/filters/policies_test.go b/pkg/filters/policies_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/metrics/eventmetrics/eventmetrics.go b/pkg/metrics/eventmetrics/eventmetrics.go
@@ -4,6 +4,7 @@
 package eventmetrics
 
 import (
+	v1 "github.com/cilium/cilium/pkg/hubble/api/v1"
 	"github.com/cilium/tetragon/api/v1/tetragon"
 	"github.com/cilium/tetragon/api/v1/tetragon/codegen/helpers"
 	"github.com/cilium/tetragon/pkg/api/processapi"
@@ -13,7 +14,6 @@ import (
 	"github.com/cilium/tetragon/pkg/metrics/consts"
 	"github.com/cilium/tetragon/pkg/metrics/errormetrics"
 	"github.com/cilium/tetragon/pkg/metrics/syscallmetrics"
-	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/cilium/tetragon/pkg/option"
 	"github.com/cilium/tetragon/pkg/reader/exec"
 	"github.com/cilium/tetragon/pkg/tracingpolicy"

diff --git a/pkg/oldhubble/api/v1/const.go b/pkg/oldhubble/api/v1/const.go
@@ -4,9 +4,6 @@
 package v1
 
 const (
-	// ObserverServiceName is the name of the observer service for the grpc health check
-	ObserverServiceName = "hubble.server.Observer"
-
 	// K8sNamespaceTag is the label tag which denotes the namespace.
 	K8sNamespaceTag = "k8s:io.kubernetes.pod.namespace"
 )
diff --git a/pkg/oldhubble/api/v1/flow.go b/pkg/oldhubble/api/v1/flow.go
diff --git a/pkg/oldhubble/api/v1/http.go b/pkg/oldhubble/api/v1/http.go