Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history 
Signed-off-by: Hang Yan <yhang@vmware.com>
  • Loading branch information
@hangyan
hangyan committed Nov 1, 2024
1 parent bc9ad37 commit d01bb70
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 224 deletions.
10 changes: 3 additions & 7 deletions build/charts/antrea/crds/packetcapture.yaml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea-aks.yml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea-crds.yml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea-eks.yml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea-gke.yml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea-ipsec.yml
View file
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
10 changes: 3 additions & 7 deletions build/yamls/antrea.yml
View file
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
14 changes: 6 additions & 8 deletions pkg/apis/crd/v1alpha1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ type UDPHeader struct {
DstPort *int32 `json:"dstPort,omitempty"`
}

// TCPHeader describes spec of a TCP header.
// TCPHeader describes the spec of a TCP header.
type TCPHeader struct {
// SrcPort is the source port.
SrcPort *int32 `json:"srcPort,omitempty"`
Expand Down Expand Up @@ -444,7 +444,7 @@ type CaptureConfig struct {
// PacketCaptureFileServer specifies the PacketCapture file server information.
type PacketCaptureFileServer struct {
// The URL of the file server. It is set with format: scheme://host[:port][/path],
// e.g, https://api.example.com:8443/v1/supportbundles/. If scheme is not set, https is used by default.
// e.g., https://api.example.com:8443/v1/packets/. Currently only `sftp` protocol is supported.
URL string `json:"url"`
}

Expand All @@ -466,15 +466,13 @@ type PacketCaptureSpec struct {
}

type PacketCaptureStatus struct {
// NumCapturedPackets records how many packets have been captured. If it reaches the target number, the capture
// NumberCaptured records how many packets have been captured. If it reaches the target number, the capture
// can be considered as finished.
NumCapturedPackets int32 `json:"numCapturedPackets,omitempty"`
// PacketsFilePath is the file path where the captured packets are stored. The format is: "<antrea-agent-pod-name>:<path>".
NumberCaptured int32 `json:"numberCaptured"`
// FilePath is the file path where the captured packets are stored. The format is: "<antrea-agent-pod-name>:<path>".
// If `.spec.FileServer` is present, this file will also be uploaded to the target location. This file
// will be removed after the PacketCapture CR is deleted.
PacketsFilePath string `json:"packetsFilePath"`
// StartTime is the time when this capture session started.
StartTime *metav1.Time `json:"startTime,omitempty"`
FilePath string `json:"filePath"`
// Condition represents the latest available observations of the PacketCapture's current state.
Conditions []PacketCaptureCondition `json:"conditions"`
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go
View file

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

36 changes: 21 additions & 15 deletions pkg/client/clientset/versioned/typed/crd/v1alpha1/fake/fake_packetcapture.go
View file

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

Loading

0 comments on commit d01bb70

Please sign in to comment.