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

Merge pull request #6220 from warjiang/fix/typo-error 

fix: typo error in karmadactl register
This commit is contained in:
karmada-bot 2025-03-21 11:46:40 +08:00 committed by GitHub
parent 6810e88643 8e4603af66
commit 56b72f1a80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/karmadactl/register/register.go
View File

@ -374,12 +374,12 @@ func (o *CommandRegisterOption) EnsureNecessaryResourcesExistInControlPlane(boot
return nil, err
}
kubelient, err := ToClientSet(rbacCfg)
kubeClient, err := ToClientSet(rbacCfg)
if err != nil {
return nil, err
}
defer func() {
err = kubelient.CertificatesV1().CertificateSigningRequests().Delete(context.Background(), csrName, metav1.DeleteOptions{})
err = kubeClient.CertificatesV1().CertificateSigningRequests().Delete(context.Background(), csrName, metav1.DeleteOptions{})
if err != nil {
klog.Warningf("Failed to delete CertificateSigningRequests %s: %v", csrName, err)
}
@ -388,22 +388,22 @@ func (o *CommandRegisterOption) EnsureNecessaryResourcesExistInControlPlane(boot
fmt.Println("[karmada-agent-start] Waiting to check cluster exists")
karmadaClient, err := ToKarmadaClient(rbacCfg)
if err != nil {
return kubelient, err
return kubeClient, err
}
_, exist, err := karmadautil.GetClusterWithKarmadaClient(karmadaClient, o.ClusterName)
if err != nil {
return kubelient, err
return kubeClient, err
} else if exist {
return kubelient, fmt.Errorf("failed to register as cluster with name %s already exists", o.ClusterName)
return kubeClient, fmt.Errorf("failed to register as cluster with name %s already exists", o.ClusterName)
}
fmt.Println("[karmada-agent-start] Assign the necessary RBAC permissions to the agent")
err = o.ensureAgentRBACResourcesExistInControlPlane(kubelient)
err = o.ensureAgentRBACResourcesExistInControlPlane(kubeClient)
if err != nil {
return kubelient, err
return kubeClient, err
}
return kubelient, nil
return kubeClient, nil
}
// EnsureNecessaryResourcesExistInMemberCluster ensures that all necessary resources are exist in the registering cluster.