Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rainbond2
Commits
b50b23b7
Commit
b50b23b7
authored
3 years ago
by
barnettZQG
Browse files
Options
Download
Email Patches
Plain Diff
change build bug
parent
21401370
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
local_release.sh
+1
-1
local_release.sh
worker/appm/f/function.go
+1
-1
worker/appm/f/function.go
worker/appm/store/store.go
+1
-1
worker/appm/store/store.go
worker/master/controller/thirdcomponent/controller.go
+3
-3
worker/master/controller/thirdcomponent/controller.go
with
6 additions
and
6 deletions
+6
-6
local_release.sh
+
1
-
1
View file @
b50b23b7
#! /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
./release.sh all push
This diff is collapsed.
Click to expand it.
worker/appm/f/function.go
+
1
-
1
View file @
b50b23b7
...
...
@@ -59,7 +59,7 @@ func ApplyOne(ctx context.Context, apply apply.Applicator, clientset kubernetes.
}
}
// for custom component
if
len
(
app
.
GetManifests
())
>
0
{
if
len
(
app
.
GetManifests
())
>
0
&&
apply
!=
nil
{
for
_
,
manifest
:=
range
app
.
GetManifests
()
{
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
())
...
...
This diff is collapsed.
Click to expand it.
worker/appm/store/store.go
+
1
-
1
View file @
b50b23b7
...
...
@@ -481,7 +481,7 @@ func (a *appRuntimeStore) InitOneThirdPartService(service *model.TenantServices)
return
err
}
a
.
RegistAppService
(
appService
)
err
=
f
.
ApplyOne
(
a
.
clientset
,
appService
)
err
=
f
.
ApplyOne
(
context
.
Background
(),
nil
,
a
.
clientset
,
appService
)
if
err
!=
nil
{
logrus
.
Errorf
(
"error applying rule: %v"
,
err
)
return
err
...
...
This diff is collapsed.
Click to expand it.
worker/master/controller/thirdcomponent/controller.go
+
3
-
3
View file @
b50b23b7
...
...
@@ -61,7 +61,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (res reconcile.Result, retErr e
defer
cancel
()
defer
func
()
{
if
retErr
==
nil
{
log
.
Info
f
(
"finished reconciling"
)
log
.
Debug
f
(
"finished reconciling"
)
}
else
{
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
apierrors
.
IsNotFound
(
err
)
{
log
.
Info
f
(
"thirdcomponent %s does not exist"
,
req
)
log
.
Warning
f
(
"thirdcomponent %s does not exist"
,
req
)
}
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
)
return
ctrl
.
Result
{},
nil
}
logrus
.
Info
f
(
"start to reconcile component %s/%s"
,
component
.
Namespace
,
component
.
Name
)
logrus
.
Debug
f
(
"start to reconcile component %s/%s"
,
component
.
Namespace
,
component
.
Name
)
discover
,
err
:=
NewDiscover
(
component
,
r
.
restConfig
)
if
err
!=
nil
{
component
.
Status
.
Phase
=
v1alpha1
.
ComponentFailed
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help