test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

change build bug

Browse Source
This commit is contained in:
barnettZQG 2021-07-02 11:08:48 +08:00
parent 2140137041
commit b50b23b71d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local_release.sh
View File

@ -1,5 +1,5 @@
#! /bin/bash #! /bin/bash
export VERSION=v5.3.0-release export VERSION=v5.3.1-release
export BUILD_IMAGE_BASE_NAME=registry.cn-hangzhou.aliyuncs.com/goodrain export BUILD_IMAGE_BASE_NAME=registry.cn-hangzhou.aliyuncs.com/goodrain
./release.sh all push ./release.sh all push

2
worker/appm/f/function.go
View File

@ -59,7 +59,7 @@ func ApplyOne(ctx context.Context, apply apply.Applicator, clientset kubernetes.
} }
} }
// for custom component // for custom component
if len(app.GetManifests()) > 0 { if len(app.GetManifests()) > 0 && apply != nil {
for _, manifest := range app.GetManifests() { for _, manifest := range app.GetManifests() {
if err := apply.Apply(ctx, manifest); err != nil { if err := apply.Apply(ctx, manifest); err != nil {
return fmt.Errorf("apply custom component manifest %s/%s failure %s", manifest.GetKind(), manifest.GetName(), err.Error()) return fmt.Errorf("apply custom component manifest %s/%s failure %s", manifest.GetKind(), manifest.GetName(), err.Error())

2
worker/appm/store/store.go
View File

@ -481,7 +481,7 @@ func (a *appRuntimeStore) InitOneThirdPartService(service *model.TenantServices)
return err return err
} }
a.RegistAppService(appService) a.RegistAppService(appService)
err = f.ApplyOne(a.clientset, appService) err = f.ApplyOne(context.Background(), nil, a.clientset, appService)
if err != nil { if err != nil {
logrus.Errorf("error applying rule: %v", err) logrus.Errorf("error applying rule: %v", err)
return err return err

6
worker/master/controller/thirdcomponent/controller.go
View File

@ -61,7 +61,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (res reconcile.Result, retErr e
defer cancel() defer cancel()
defer func() { defer func() {
if retErr == nil { if retErr == nil {
log.Infof("finished reconciling") log.Debugf("finished reconciling")
} else { } else {
log.Errorf("Failed to reconcile %v", retErr) log.Errorf("Failed to reconcile %v", retErr)
} }
@ -69,7 +69,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (res reconcile.Result, retErr e
if err := r.Client.Get(ctx, req.NamespacedName, component); err != nil { if err := r.Client.Get(ctx, req.NamespacedName, component); err != nil {
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
log.Infof("thirdcomponent %s does not exist", req) log.Warningf("thirdcomponent %s does not exist", req)
} }
return ctrl.Result{}, client.IgnoreNotFound(err) return ctrl.Result{}, client.IgnoreNotFound(err)
} }
@ -78,7 +78,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (res reconcile.Result, retErr e
r.discoverPool.RemoveDiscover(component) r.discoverPool.RemoveDiscover(component)
return ctrl.Result{}, nil return ctrl.Result{}, nil
} }
logrus.Infof("start to reconcile component %s/%s", component.Namespace, component.Name) logrus.Debugf("start to reconcile component %s/%s", component.Namespace, component.Name)
discover, err := NewDiscover(component, r.restConfig) discover, err := NewDiscover(component, r.restConfig)
if err != nil { if err != nil {
component.Status.Phase = v1alpha1.ComponentFailed component.Status.Phase = v1alpha1.ComponentFailed