karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove cluster namespace (#352) 

Signed-off-by: pigletfly <wangbing.adam@gmail.com>
This commit is contained in:
Wang Bing 2021-05-18 23:42:07 +08:00 committed by GitHub
parent 831dfe27bc
commit 7a0d6c9b8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/karmadactl/join.go
View File

@ -407,39 +407,38 @@ func ensureClusterRoleBindingExist(client kubeclient.Interface, clusterRoleBindi
// CreateClusterObject create cluster object in karmada control plane // CreateClusterObject create cluster object in karmada control plane
func CreateClusterObject(controlPlaneClient *karmadaclientset.Clientset, clusterObj *clusterv1alpha1.Cluster, errorOnExisting bool) (*clusterv1alpha1.Cluster, error) { func CreateClusterObject(controlPlaneClient *karmadaclientset.Clientset, clusterObj *clusterv1alpha1.Cluster, errorOnExisting bool) (*clusterv1alpha1.Cluster, error) {
cluster, exist, err := GetCluster(controlPlaneClient, clusterObj.Namespace, clusterObj.Name) cluster, exist, err := GetCluster(controlPlaneClient, clusterObj.Name)
if err != nil { if err != nil {
klog.Errorf("failed to create cluster object. cluster: %s/%s, error: %v", clusterObj.Namespace, clusterObj.Name, err) klog.Errorf("failed to create cluster(%s), error: %v", clusterObj.Name, err)
return nil, err return nil, err
} }
if exist { if exist {
if errorOnExisting { if errorOnExisting {
klog.Errorf("failed to create cluster object. cluster: %s/%s, error: %v", clusterObj.Namespace, clusterObj.Name, err) klog.Errorf("failed to create cluster(%s) as it's already exist.", clusterObj.Name)
return cluster, err return cluster, fmt.Errorf("cluster already exist")
} }
klog.V(1).Infof("create cluster(%s) succeed as already exist.", clusterObj.Name)
klog.V(1).Infof("create cluster succeed as already exist. cluster: %s/%s", clusterObj.Namespace, clusterObj.Name)
return cluster, nil return cluster, nil
} }
if cluster, err = CreateCluster(controlPlaneClient, clusterObj); err != nil { if cluster, err = CreateCluster(controlPlaneClient, clusterObj); err != nil {
klog.Warningf("failed to create cluster. cluster: %s/%s, error: %v", clusterObj.Namespace, clusterObj.Name, err) klog.Warningf("failed to create cluster(%s). error: %v", clusterObj.Name, err)
return nil, err return nil, err
} }
return cluster, nil return cluster, nil
} }
// GetCluster tells if a cluster (namespace/name) already joined to control plane. // GetCluster tells if a cluster already joined to control plane.
func GetCluster(client karmadaclientset.Interface, namespace string, name string) (*clusterv1alpha1.Cluster, bool, error) { func GetCluster(client karmadaclientset.Interface, name string) (*clusterv1alpha1.Cluster, bool, error) {
cluster, err := client.ClusterV1alpha1().Clusters().Get(context.TODO(), name, metav1.GetOptions{}) cluster, err := client.ClusterV1alpha1().Clusters().Get(context.TODO(), name, metav1.GetOptions{})
if err != nil { if err != nil {
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
return nil, false, nil return nil, false, nil
} }
klog.Warningf("failed to retrieve cluster. cluster: %s/%s, error: %v", namespace, name, err) klog.Warningf("failed to retrieve cluster(%s). error: %v", cluster.Name, err)
return nil, false, err return nil, false, err
} }
@ -450,7 +449,7 @@ func GetCluster(client karmadaclientset.Interface, namespace string, name string
func CreateCluster(controlPlaneClient karmadaclientset.Interface, cluster *clusterv1alpha1.Cluster) (*clusterv1alpha1.Cluster, error) { func CreateCluster(controlPlaneClient karmadaclientset.Interface, cluster *clusterv1alpha1.Cluster) (*clusterv1alpha1.Cluster, error) {
cluster, err := controlPlaneClient.ClusterV1alpha1().Clusters().Create(context.TODO(), cluster, metav1.CreateOptions{}) cluster, err := controlPlaneClient.ClusterV1alpha1().Clusters().Create(context.TODO(), cluster, metav1.CreateOptions{})
if err != nil { if err != nil {
klog.Warningf("failed to create cluster. cluster: %s/%s, error: %v", cluster.Namespace, cluster.Name, err) klog.Warningf("failed to create cluster(%s). error: %v", cluster.Name, err)
return cluster, err return cluster, err
} }