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
17c65cee
Commit
17c65cee
authored
Feb 06, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #20607 from bprashanth/svccontroller_events
Auto commit by PR queue bot
parents
aac20ed6
33654c8b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
servicecontroller.go
pkg/controller/service/servicecontroller.go
+10
-2
No files found.
pkg/controller/service/servicecontroller.go
View file @
17c65cee
...
@@ -274,7 +274,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, bool) {
...
@@ -274,7 +274,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, bool) {
// Returns whatever error occurred along with a boolean indicator of whether it
// Returns whatever error occurred along with a boolean indicator of whether it
// should be retried.
// should be retried.
func
(
s
*
ServiceController
)
createLoadBalancerIfNeeded
(
namespacedName
types
.
NamespacedName
,
service
,
appliedState
*
api
.
Service
)
(
error
,
bool
)
{
func
(
s
*
ServiceController
)
createLoadBalancerIfNeeded
(
namespacedName
types
.
NamespacedName
,
service
,
appliedState
*
api
.
Service
)
(
error
,
bool
)
{
if
appliedState
!=
nil
&&
!
needsUpdate
(
appliedState
,
service
)
{
if
appliedState
!=
nil
&&
!
s
.
needsUpdate
(
appliedState
,
service
)
{
glog
.
Infof
(
"LB already exists and doesn't need update for service %s"
,
namespacedName
)
glog
.
Infof
(
"LB already exists and doesn't need update for service %s"
,
namespacedName
)
return
nil
,
notRetryable
return
nil
,
notRetryable
}
}
...
@@ -457,24 +457,32 @@ func (s *serviceCache) delete(serviceName string) {
...
@@ -457,24 +457,32 @@ func (s *serviceCache) delete(serviceName string) {
delete
(
s
.
serviceMap
,
serviceName
)
delete
(
s
.
serviceMap
,
serviceName
)
}
}
func
needsUpdate
(
oldService
*
api
.
Service
,
newService
*
api
.
Service
)
bool
{
func
(
s
*
ServiceController
)
needsUpdate
(
oldService
*
api
.
Service
,
newService
*
api
.
Service
)
bool
{
if
!
wantsLoadBalancer
(
oldService
)
&&
!
wantsLoadBalancer
(
newService
)
{
if
!
wantsLoadBalancer
(
oldService
)
&&
!
wantsLoadBalancer
(
newService
)
{
return
false
return
false
}
}
if
wantsLoadBalancer
(
oldService
)
!=
wantsLoadBalancer
(
newService
)
{
if
wantsLoadBalancer
(
oldService
)
!=
wantsLoadBalancer
(
newService
)
{
s
.
eventRecorder
.
Eventf
(
newService
,
api
.
EventTypeNormal
,
"Type"
,
"%v -> %v"
,
oldService
.
Spec
.
Type
,
newService
.
Spec
.
Type
)
return
true
return
true
}
}
if
!
portsEqualForLB
(
oldService
,
newService
)
||
oldService
.
Spec
.
SessionAffinity
!=
newService
.
Spec
.
SessionAffinity
{
if
!
portsEqualForLB
(
oldService
,
newService
)
||
oldService
.
Spec
.
SessionAffinity
!=
newService
.
Spec
.
SessionAffinity
{
return
true
return
true
}
}
if
!
loadBalancerIPsAreEqual
(
oldService
,
newService
)
{
if
!
loadBalancerIPsAreEqual
(
oldService
,
newService
)
{
s
.
eventRecorder
.
Eventf
(
newService
,
api
.
EventTypeNormal
,
"LoadbalancerIP"
,
"%v -> %v"
,
oldService
.
Spec
.
LoadBalancerIP
,
newService
.
Spec
.
LoadBalancerIP
)
return
true
return
true
}
}
if
len
(
oldService
.
Spec
.
ExternalIPs
)
!=
len
(
newService
.
Spec
.
ExternalIPs
)
{
if
len
(
oldService
.
Spec
.
ExternalIPs
)
!=
len
(
newService
.
Spec
.
ExternalIPs
)
{
s
.
eventRecorder
.
Eventf
(
newService
,
api
.
EventTypeNormal
,
"ExternalIP"
,
"Count: %v -> %v"
,
len
(
oldService
.
Spec
.
ExternalIPs
),
len
(
newService
.
Spec
.
ExternalIPs
))
return
true
return
true
}
}
for
i
:=
range
oldService
.
Spec
.
ExternalIPs
{
for
i
:=
range
oldService
.
Spec
.
ExternalIPs
{
if
oldService
.
Spec
.
ExternalIPs
[
i
]
!=
newService
.
Spec
.
ExternalIPs
[
i
]
{
if
oldService
.
Spec
.
ExternalIPs
[
i
]
!=
newService
.
Spec
.
ExternalIPs
[
i
]
{
s
.
eventRecorder
.
Eventf
(
newService
,
api
.
EventTypeNormal
,
"ExternalIP"
,
"Added: %v"
,
newService
.
Spec
.
ExternalIPs
[
i
])
return
true
return
true
}
}
}
}
...
...
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