Skip to content

Commit 75a6a96

Browse files
ycyaoxduycyaoxdu
authored
error while run command against wrong context (#283)
Signed-off-by: ycyaoxdu <[email protected]> Signed-off-by: ycyaoxdu <[email protected]>
1 parent 4a4add3 commit 75a6a96

File tree

32 files changed

+262
-75
lines changed

32 files changed

+262
-75
lines changed

‎pkg/cmd/accept/exec.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ import (
77
"strings"
88
"time"
99

10+
"github.com/spf13/cobra"
11+
certificatesv1 "k8s.io/api/certificates/v1"
1012
corev1 "k8s.io/api/core/v1"
1113
"k8s.io/apimachinery/pkg/api/errors"
1214
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1315
"k8s.io/apimachinery/pkg/types"
16+
utilerrors "k8s.io/apimachinery/pkg/util/errors"
1417
"k8s.io/apimachinery/pkg/util/sets"
1518
"k8s.io/apimachinery/pkg/util/wait"
1619
"k8s.io/client-go/kubernetes"
1720
"k8s.io/klog/v2"
18-
"open-cluster-management.io/clusteradm/pkg/helpers"
19-
20-
"github.com/spf13/cobra"
21-
certificatesv1 "k8s.io/api/certificates/v1"
22-
utilerrors "k8s.io/apimachinery/pkg/util/errors"
2321
clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned"
22+
"open-cluster-management.io/clusteradm/pkg/helpers"
2423
)
2524

2625
const (
@@ -52,6 +51,11 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
5251
}
5352

5453
func (o *Options) Validate() error {
54+
err := o.ClusteradmFlags.ValidateHub()
55+
if err != nil {
56+
return err
57+
}
58+
5559
return nil
5660
}
5761

‎pkg/cmd/addon/disable/exec.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import (
55
"context"
66
"fmt"
77

8-
"k8s.io/apimachinery/pkg/api/errors"
9-
108
"github.com/spf13/cobra"
119
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
10+
"k8s.io/apimachinery/pkg/api/errors"
1211
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1312
"k8s.io/apimachinery/pkg/util/sets"
1413
"k8s.io/client-go/dynamic"
@@ -26,6 +25,11 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
2625
}
2726

2827
func (o *Options) Validate() (err error) {
28+
err = o.ClusteradmFlags.ValidateHub()
29+
if err != nil {
30+
return err
31+
}
32+
2933
if len(o.Names) == 0 {
3034
return fmt.Errorf("names is missing")
3135
}
@@ -37,6 +41,7 @@ func (o *Options) Validate() (err error) {
3741
if o.Allclusters && len(o.Clusters) != 0 {
3842
return fmt.Errorf("flag --all-clusters and --clusters can not be set together")
3943
}
44+
4045
return nil
4146
}
4247

‎pkg/cmd/addon/enable/exec.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
"strings"
88

99
"github.com/spf13/cobra"
10-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
"k8s.io/klog/v2"
12-
1310
"github.com/stolostron/applier/pkg/apply"
1411
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
12+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1513
"k8s.io/apimachinery/pkg/util/sets"
1614
"k8s.io/client-go/dynamic"
1715
"k8s.io/client-go/kubernetes"
16+
"k8s.io/klog/v2"
1817
clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned"
1918
"open-cluster-management.io/clusteradm/pkg/cmd/addon/enable/scenario"
2019
"open-cluster-management.io/clusteradm/pkg/helpers"
@@ -52,7 +51,12 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
5251
return nil
5352
}
5453

55-
func (o *Options) Validate() error {
54+
func (o *Options) Validate() (err error) {
55+
err = o.ClusteradmFlags.ValidateHub()
56+
if err != nil {
57+
return err
58+
}
59+
5660
if len(o.Names) == 0 {
5761
return fmt.Errorf("names is missing")
5862
}

‎pkg/cmd/clean/exec.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ import (
88
"log"
99
"time"
1010

11-
clustermanagerclient "open-cluster-management.io/api/client/operator/clientset/versioned"
12-
"open-cluster-management.io/clusteradm/pkg/helpers"
13-
1411
"github.com/spf13/cobra"
15-
1612
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
1713
"k8s.io/apimachinery/pkg/api/errors"
1814
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,6 +17,8 @@ import (
2117
"k8s.io/client-go/kubernetes"
2218
"k8s.io/client-go/util/retry"
2319
"k8s.io/klog/v2"
20+
clustermanagerclient "open-cluster-management.io/api/client/operator/clientset/versioned"
21+
"open-cluster-management.io/clusteradm/pkg/helpers"
2422
)
2523

2624
func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {

‎pkg/cmd/clusterset/bind/exec.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,15 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
2727
}
2828

2929
func (o *Options) Validate() (err error) {
30+
err = o.ClusteradmFlags.ValidateHub()
31+
if err != nil {
32+
return err
33+
}
34+
3035
if len(o.Namespace) == 0 {
3136
return fmt.Errorf("namespace name must be specified in --namespace")
3237
}
38+
3339
return nil
3440
}
3541

‎pkg/cmd/clusterset/set/exec.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
2525
}
2626

2727
func (o *Options) Validate() (err error) {
28+
err = o.ClusteradmFlags.ValidateHub()
29+
if err != nil {
30+
return err
31+
}
32+
2833
if len(o.Clusters) == 0 {
2934
return fmt.Errorf("cluster name must be specified in --clusters")
3035
}
36+
3137
return nil
3238
}
3339

‎pkg/cmd/clusterset/unbind/exec.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
2626
}
2727

2828
func (o *Options) Validate() (err error) {
29+
err = o.ClusteradmFlags.ValidateHub()
30+
if err != nil {
31+
return err
32+
}
33+
2934
if len(o.Namespace) == 0 {
3035
return fmt.Errorf("namespace name must be specified in --namespace")
3136
}
37+
3238
return nil
3339
}
3440

‎pkg/cmd/create/clusterset/exec.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,24 @@ import (
1212
)
1313

1414
func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
15-
1615
o.Clustersets = args
1716

1817
return nil
1918
}
2019

2120
func (o *Options) Validate() (err error) {
21+
err = o.ClusteradmFlags.ValidateHub()
22+
if err != nil {
23+
return err
24+
}
25+
2226
if len(o.Clustersets) == 0 {
2327
return fmt.Errorf("the name of the clusterset must be specified")
2428
}
2529
if len(o.Clustersets) > 1 {
2630
return fmt.Errorf("only one clusterset can be created")
2731
}
32+
2833
return nil
2934
}
3035

‎pkg/cmd/create/sampleapp/exec.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
4545
}
4646

4747
func (o *Options) Validate() (err error) {
48+
err = o.ClusteradmFlags.ValidateHub()
49+
if err != nil {
50+
return err
51+
}
4852

4953
return nil
5054
}

‎pkg/cmd/create/work/exec.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
3434
}
3535

3636
func (o *Options) validate() (err error) {
37+
err = o.ClusteradmFlags.ValidateHub()
38+
if err != nil {
39+
return err
40+
}
41+
3742
if len(o.Cluster) == 0 && len(o.Placement) == 0 {
3843
return fmt.Errorf("--clusters or --placement must be specified")
3944
}
@@ -46,6 +51,7 @@ func (o *Options) validate() (err error) {
4651
if len(*o.FileNameFlags.Filenames) == 0 {
4752
return fmt.Errorf("manifest files must be specified")
4853
}
54+
4955
return nil
5056
}
5157

0 commit comments

Comments
 (0)