Fix for default value

Signed-off-by: Dominique Vernier <[email protected]>

Author: itdove

pkg/cmd/accept/cmd.go

@@ -44,6 +44,6 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	}
 
 	cmd.Flags().StringVar(&o.clusters, "clusters", "", "Names of the cluster to accept (comma separated)")
-	cmd.Flags().IntVar(&o.timeout, "time-out", 1, "the number of second to wait for the managedcluster and CSR")
+	cmd.Flags().IntVar(&o.wait, "wait", 0, "the number of second to wait for the managedcluster and CSR")
 	return cmd
 }

pkg/cmd/accept/exec.go

@@ -64,29 +64,38 @@ func (o *Options) run() error {
 	return o.runWithClient(kubeClient, clusterClient)
 }
 
-func (o *Options) runWithClient(kubeClient *kubernetes.Clientset, clusterClient *clusterclientset.Clientset) error {
+func (o *Options) runWithClient(kubeClient *kubernetes.Clientset, clusterClient *clusterclientset.Clientset) (err error) {
 	for _, clusterName := range o.values.clusters {
-		err := wait.PollImmediate(1*time.Second, time.Duration(o.timeout)*time.Second, func() (bool, error) {
-			csrApproved, err := o.approveCSR(kubeClient, clusterName)
-			if err != nil {
-				return false, err
-			}
-			mcUpdated, err := o.updateManagedCluster(clusterClient, clusterName)
-			if err != nil {
-				return false, err
-			}
-			if csrApproved && mcUpdated {
-				return true, nil
-			}
-			return false, nil
-		})
+		if o.wait == 0 {
+			_, err = o.accept(kubeClient, clusterClient, clusterName)
+		} else {
+			err = wait.PollImmediate(1*time.Second, time.Duration(o.wait)*time.Second, func() (bool, error) {
+				return o.accept(kubeClient, clusterClient, clusterName)
+			})
+		}
 		if err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
+func (o *Options) accept(kubeClient *kubernetes.Clientset, clusterClient *clusterclientset.Clientset, clusterName string) (bool, error) {
+	csrApproved, err := o.approveCSR(kubeClient, clusterName)
+	if err != nil {
+		return false, err
+	}
+	mcUpdated, err := o.updateManagedCluster(clusterClient, clusterName)
+	if err != nil {
+		return false, err
+	}
+	if csrApproved && mcUpdated {
+		return true, nil
+	}
+	return false, nil
+
+}
+
 func (o *Options) approveCSR(kubeClient *kubernetes.Clientset, clusterName string) (bool, error) {
 	csrs, err := kubeClient.CertificatesV1().CertificateSigningRequests().List(context.TODO(),
 		metav1.ListOptions{

pkg/cmd/accept/options.go

@@ -12,8 +12,8 @@ type Options struct {
 	//A list of comma separated cluster names
 	clusters string
 	//Timeout to wait in second for managedcluster and CSR
-	timeout int
-	values  Values
+	wait   int
+	values Values
 }
 
 //Values: The values used in the template