Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
eb8f5d35
Commit
eb8f5d35
authored
May 02, 2017
by
FengyunPan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Federation]Update event type
parent
29f37fde
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
servicecontroller.go
...on/pkg/federation-controller/service/servicecontroller.go
+2
-2
No files found.
federation/pkg/federation-controller/service/servicecontroller.go
View file @
eb8f5d35
...
@@ -537,7 +537,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
...
@@ -537,7 +537,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
if
fedService
.
DeletionTimestamp
!=
nil
{
if
fedService
.
DeletionTimestamp
!=
nil
{
if
err
:=
s
.
delete
(
fedService
);
err
!=
nil
{
if
err
:=
s
.
delete
(
fedService
);
err
!=
nil
{
runtime
.
HandleError
(
fmt
.
Errorf
(
"Failed to delete %s: %v"
,
key
,
err
))
runtime
.
HandleError
(
fmt
.
Errorf
(
"Failed to delete %s: %v"
,
key
,
err
))
s
.
eventRecorder
.
Eventf
(
fedService
,
api
.
EventType
Normal
,
"DeleteFailed"
,
"Deleting service failed: %v"
,
err
)
s
.
eventRecorder
.
Eventf
(
fedService
,
api
.
EventType
Warning
,
"DeleteFailed"
,
"Deleting service failed: %v"
,
err
)
return
statusRecoverableError
return
statusRecoverableError
}
}
glog
.
V
(
3
)
.
Infof
(
"Deleting federated service succeeded: %s"
,
key
)
glog
.
V
(
3
)
.
Infof
(
"Deleting federated service succeeded: %s"
,
key
)
...
@@ -604,7 +604,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
...
@@ -604,7 +604,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
err
=
s
.
federatedUpdater
.
UpdateWithOnError
(
operations
,
s
.
updateTimeout
,
err
=
s
.
federatedUpdater
.
UpdateWithOnError
(
operations
,
s
.
updateTimeout
,
func
(
op
fedutil
.
FederatedOperation
,
operror
error
)
{
func
(
op
fedutil
.
FederatedOperation
,
operror
error
)
{
runtime
.
HandleError
(
fmt
.
Errorf
(
"Service update in cluster %s failed: %v"
,
op
.
ClusterName
,
operror
))
runtime
.
HandleError
(
fmt
.
Errorf
(
"Service update in cluster %s failed: %v"
,
op
.
ClusterName
,
operror
))
s
.
eventRecorder
.
Eventf
(
fedService
,
api
.
EventType
Normal
,
"UpdateInClusterFailed"
,
"Service update in cluster %s failed: %v"
,
op
.
ClusterName
,
operror
)
s
.
eventRecorder
.
Eventf
(
fedService
,
api
.
EventType
Warning
,
"UpdateInClusterFailed"
,
"Service update in cluster %s failed: %v"
,
op
.
ClusterName
,
operror
)
})
})
if
err
!=
nil
{
if
err
!=
nil
{
if
!
errors
.
IsAlreadyExists
(
err
)
{
if
!
errors
.
IsAlreadyExists
(
err
)
{
...
...
Write
Preview
Markdown
is supported
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