update

Signed-off-by: Hang Yan <[email protected]>

Author: hangyan

pkg/antctl/antctl.go

@@ -753,8 +753,8 @@ $ antctl get podmulticaststats pod -n namespace`,
 		},
 		{
 			cobraCommand:      packetcapture.Command,
-			supportAgent:      true,
-			supportController: true,
+			supportAgent:      false,
+			supportController: false,
 		},
 		{
 			cobraCommand:      proxy.Command,

pkg/antctl/raw/packetcapture/command.go

@@ -137,9 +137,20 @@ func getPodFile(cmd *cobra.Command) (PodFileCopy, error) {
 	}, nil
 }
 
+func getPCName(src, dest string) string {
+	replace := func(s string) string {
+		return strings.ReplaceAll(s, "/", "-")
+	}
+	prefix := fmt.Sprintf("%s-%s", replace(src), replace(dest))
+	if option.nowait {
+		return prefix
+	}
+	return fmt.Sprintf("%s-%s", prefix, rand.String(8))
+}
+
 func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	option.timeout, _ = cmd.Flags().GetDuration("timeout")
-	if option.timeout > time.Hour {
+	if option.timeout > 300*time.Second {
 		return errors.New("timeout cannot be longer than 1 hour")
 	}
 	if option.timeout == 0 {
@@ -157,7 +168,7 @@ func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("error when constructing a PacketCapture CR: %w", err)
 	}
-	createCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	createCtx, cancel := context.WithTimeout(cmd.Context(), 5*time.Second)
 	defer cancel()
 
 	if _, err := antreaClient.CrdV1alpha1().PacketCaptures().Create(createCtx, pc, metav1.CreateOptions{}); err != nil {
@@ -204,14 +215,16 @@ func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	splits := strings.Split(latestPC.Status.FilePath, ":")
 	fileName := filepath.Base(splits[1])
 	copier, _ := getCopier(cmd)
-	err = copier.CopyFromPod(context.TODO(), env.GetAntreaNamespace(), splits[0], "antrea-agent", splits[1], option.outputDir)
-	if err == nil {
-		fmt.Fprintf(cmd.OutOrStdout(), "Captured packets file: %s\n", filepath.Join(option.outputDir, fileName))
+	if err := copier.CopyFromPod(context.TODO(), env.GetAntreaNamespace(), splits[0], "antrea-agent", splits[1], option.outputDir); err == nil {
+		return err
 	}
-	return err
+	fmt.Fprintf(cmd.OutOrStdout(), "Captured packets file: %s\n", filepath.Join(option.outputDir, fileName))
+	return nil
 }
 
-func parseEndpoint(endpoint string) (pod *v1alpha1.PodReference, ip *string) {
+func parseEndpoint(endpoint string) (*v1alpha1.PodReference, *string) {
+	var pod *v1alpha1.PodReference
+	var ip *string
 	parsedIP := net.ParseIP(endpoint)
 	if parsedIP != nil && parsedIP.To4() != nil {
 		ip = ptr.To(parsedIP.String())
@@ -229,23 +242,12 @@ func parseEndpoint(endpoint string) (pod *v1alpha1.PodReference, ip *string) {
 			}
 		}
 	}
-	return
-}
-
-func getPCName(src, dest string) string {
-	replace := func(s string) string {
-		return strings.ReplaceAll(s, "/", "-")
-	}
-	prefix := fmt.Sprintf("%s-%s", replace(src), replace(dest))
-	if option.nowait {
-		return prefix
-	}
-	return fmt.Sprintf("%s-%s", prefix, rand.String(8))
+	return pod, ip
 }
 
 func parseFlow() (*v1alpha1.Packet, error) {
 	trimFlow := strings.ReplaceAll(option.flow, " ", "")
-	fields, err := getFlowFields(cleanFlow)
+	fields, err := getFlowFields(trimFlow)
 	if err != nil {
 		return nil, fmt.Errorf("error when parsing the flow: %w", err)
 	}