feat(tke-installer): add retry for register apiservices

k8ssphere · Apr 22, 2020 · dc54a05 · dc54a05
1 parent 2a8c08d
commit dc54a05
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/cmd/tke-installer/app/installer/installer.go b/cmd/tke-installer/app/installer/installer.go
@@ -1739,17 +1739,23 @@ func (t *TKE) registerAPI() error {
  },
  }
 
- _, err := client.ApiregistrationV1().APIServices().Get(apiService.Name, metav1.GetOptions{})
- if err == nil {
- err := client.ApiregistrationV1().APIServices().Delete(apiService.Name, &metav1.DeleteOptions{})
- if err != nil {
- return err
+ err = wait.PollImmediate(5*time.Second, 10*time.Minute, func() (bool, error) {
+ _, err := client.ApiregistrationV1().APIServices().Get(apiService.Name, metav1.GetOptions{})
+ if err == nil {
+ err := client.ApiregistrationV1().APIServices().Delete(apiService.Name, &metav1.DeleteOptions{})
+ if err != nil {
+ return false, nil
+ }
  }
- }
- if _, err := client.ApiregistrationV1().APIServices().Create(apiService); err != nil {
- if !errors.IsAlreadyExists(err) {
- return err
+  if _, err := client.ApiregistrationV1().APIServices().Create(apiService); err != nil {
+  if !errors.IsAlreadyExists(err) {
+  return false, nil
+ }
  }
+ return true, nil
+ })
+ if err != nil {
+ return pkgerrors.Wrapf(err, "register apiservice %v error", one)
  }
 
  err = wait.PollImmediate(5*time.Second, 10*time.Minute, func() (bool, error) {