Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Hang Yan <[email protected]>
  • Loading branch information
hangyan committed Nov 1, 2024
1 parent fe84f1d commit 484947d
Show file tree
Hide file tree
Showing 25 changed files with 442 additions and 510 deletions.
17 changes: 6 additions & 11 deletions build/charts/antrea/crds/packetcapture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -102,15 +100,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -139,6 +135,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -167,11 +164,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea-aks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2979,9 +2979,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -3002,15 +3000,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3039,6 +3035,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3067,11 +3064,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea-crds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2952,9 +2952,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -2975,15 +2973,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3012,6 +3008,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3040,11 +3037,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea-eks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2979,9 +2979,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -3002,15 +3000,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3039,6 +3035,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3067,11 +3064,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea-gke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2979,9 +2979,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -3002,15 +3000,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3039,6 +3035,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3067,11 +3064,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea-ipsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2979,9 +2979,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -3002,15 +3000,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3039,6 +3035,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3067,11 +3064,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
17 changes: 6 additions & 11 deletions build/yamls/antrea.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2979,9 +2979,7 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
destination:
type: object
oneOf:
Expand All @@ -3002,15 +3000,13 @@ spec:
type: string
ip:
type: string
oneOf:
- format: ipv4
- format: ipv6
format: ipv4
packet:
type: object
properties:
ipFamily:
type: string
enum: [IPv4, IPv6]
enum: [IPv4]
default: IPv4
protocol:
x-kubernetes-int-or-string: true
Expand Down Expand Up @@ -3039,6 +3035,7 @@ spec:
type: integer
minimum: 1
maximum: 65535

timeout:
type: integer
minimum: 1
Expand Down Expand Up @@ -3067,11 +3064,9 @@ spec:
status:
type: object
properties:
startTime:
type: string
numCapturedPackets:
numberCaptured:
type: integer
packetsFilePath:
filePath:
type: string
conditions:
type: array
Expand Down
3 changes: 1 addition & 2 deletions cmd/antrea-agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import (
"antrea.io/antrea/pkg/agent/controller/networkpolicy"
"antrea.io/antrea/pkg/agent/controller/networkpolicy/l7engine"
"antrea.io/antrea/pkg/agent/controller/noderoute"
"antrea.io/antrea/pkg/agent/controller/packetcapture"
"antrea.io/antrea/pkg/agent/controller/serviceexternalip"
"antrea.io/antrea/pkg/agent/controller/traceflow"
"antrea.io/antrea/pkg/agent/controller/trafficcontrol"
Expand All @@ -61,6 +60,7 @@ import (
"antrea.io/antrea/pkg/agent/nodeip"
npl "antrea.io/antrea/pkg/agent/nodeportlocal"
"antrea.io/antrea/pkg/agent/openflow"
"antrea.io/antrea/pkg/agent/packetcapture"
"antrea.io/antrea/pkg/agent/proxy"
proxytypes "antrea.io/antrea/pkg/agent/proxy/types"
"antrea.io/antrea/pkg/agent/querier"
Expand Down Expand Up @@ -659,7 +659,6 @@ func run(o *Options) error {
crdClient,
packetCaptureInformer,
ifaceStore,
nodeConfig,
)
}

Expand Down
4 changes: 4 additions & 0 deletions docs/feature-gates.md
Original file line number Diff line number Diff line change
Expand Up @@ -537,3 +537,7 @@ experienced by Pod traffic.

`PacketCapture` allows user to capture live traffic packets from specified flows for further analysis.
Refer to this [document](packetcapture-guide.md) for more information.

#### Requirements for this Feature

This feature is only supported on Linux for now.
Loading

0 comments on commit 484947d

Please sign in to comment.