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 #2801 from cleverhu/optimize-deploy-cmd 

optimize initAPIService
This commit is contained in:
karmada-bot 2022-11-17 16:45:27 +08:00 committed by GitHub
parent 9a4a6684c0 47117a27c1
commit a5b41fa268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/karmadactl/cmdinit/karmada/deploy.go
View File

@ -29,6 +29,7 @@ import (
"github.com/karmada-io/karmada/pkg/karmadactl/cmdinit/options"
"github.com/karmada-io/karmada/pkg/karmadactl/cmdinit/utils"
"github.com/karmada-io/karmada/pkg/karmadactl/util"
cmdutil "github.com/karmada-io/karmada/pkg/karmadactl/util"
"github.com/karmada-io/karmada/pkg/karmadactl/util/apiclient"
tokenutil "github.com/karmada-io/karmada/pkg/karmadactl/util/bootstraptoken"
)
@ -265,7 +266,7 @@ func initAPIService(clientSet *kubernetes.Clientset, restConfig *rest.Config, sy
ExternalName: fmt.Sprintf("%s.%s.svc", aggregatedApiserverServiceName, systemNamespace),
},
}
if err := util.CreateOrUpdateService(clientSet, aaService); err != nil {
if err := cmdutil.CreateOrUpdateService(clientSet, aaService); err != nil {
return err
}
@ -298,27 +299,11 @@ func initAPIService(clientSet *kubernetes.Clientset, restConfig *rest.Config, sy
},
}
allAPIService, err := apiRegistrationClient.ApiregistrationV1().APIServices().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return err
}
// Update if it exists.
for _, v := range allAPIService.Items {
if v.Name == aaAPIServiceObjName {
klog.Infof("Update APIService '%s'", aaAPIServiceObjName)
aaAPIService.ObjectMeta.ResourceVersion = v.ResourceVersion
if _, err := apiRegistrationClient.ApiregistrationV1().APIServices().Update(context.TODO(), aaAPIService, metav1.UpdateOptions{}); err != nil {
return err
}
return nil
}
}
klog.Infof("Create APIService '%s'", aaAPIServiceObjName)
if _, err := apiRegistrationClient.ApiregistrationV1().APIServices().Create(context.TODO(), aaAPIService, metav1.CreateOptions{}); err != nil {
if err = cmdutil.CreateOrUpdateAPIService(apiRegistrationClient, aaAPIService); err != nil {
return err
}
if err := WaitAPIServiceReady(apiRegistrationClient, aaAPIServiceObjName, 120*time.Second); err != nil {
return err
}

2
pkg/karmadactl/util/idempotency.go
View File

@ -88,6 +88,8 @@ func CreateOrUpdateAPIService(apiRegistrationClient *aggregator.Clientset, apise
return fmt.Errorf("unable to update APIService: %v", err)
}
}
klog.V(2).Infof("APIService %s has been created or updated.", apiservice.Name)
return nil
}