mirror of
https://gitee.com/rainbond/Rainbond.git
synced 2024-12-03 20:27:46 +08:00
[FIX] second attempt create service while create failure first
This commit is contained in:
parent
8523e77712
commit
4c46532436
50
worker/appm/controller/kube-controller.go
Normal file
50
worker/appm/controller/kube-controller.go
Normal file
@ -0,0 +1,50 @@
|
||||
// RAINBOND, Application Management Platform
|
||||
// Copyright (C) 2014-2019 Goodrain Co., Ltd.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version. For any non-GPL usage of Rainbond,
|
||||
// one or multiple Commercial Licenses authorized by Goodrain Co., Ltd.
|
||||
// must be obtained first.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package controller
|
||||
|
||||
import (
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
)
|
||||
|
||||
//CreateKubeService create kube service
|
||||
func CreateKubeService(client *kubernetes.Clientset, namespace string, services ...*corev1.Service) error {
|
||||
var retryService []*corev1.Service
|
||||
for i, service := range services {
|
||||
_, err := client.CoreV1().Services(namespace).Create(service)
|
||||
if err != nil {
|
||||
if errors.IsAlreadyExists(err) {
|
||||
continue
|
||||
}
|
||||
retryService = append(retryService, services[i])
|
||||
}
|
||||
}
|
||||
//second attempt
|
||||
for _, service := range retryService {
|
||||
_, err := client.CoreV1().Services(namespace).Create(service)
|
||||
if err != nil {
|
||||
if errors.IsAlreadyExists(err) {
|
||||
continue
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
@ -26,8 +26,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
v1 "github.com/goodrain/rainbond/worker/appm/types/v1"
|
||||
|
||||
"github.com/goodrain/rainbond/worker/appm/types/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
@ -122,11 +122,8 @@ func (s *startController) startOne(app v1.AppService) error {
|
||||
}
|
||||
//step 3: create services
|
||||
if services := app.GetServices(); services != nil {
|
||||
for _, service := range services {
|
||||
_, err := s.manager.client.CoreV1().Services(app.TenantID).Create(service)
|
||||
if err != nil && !errors.IsAlreadyExists(err) {
|
||||
return fmt.Errorf("create service failure:%s", err.Error())
|
||||
}
|
||||
if err := CreateKubeService(s.manager.client, app.TenantID, services...); err != nil {
|
||||
return fmt.Errorf("Create service failure %s", err.Error())
|
||||
}
|
||||
}
|
||||
//step 4: create secrets
|
||||
|
Loading…
Reference in New Issue
Block a user