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
069e77d5
Commit
069e77d5
authored
Feb 24, 2016
by
Janet Kuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the nil pointer dereference when counting RS replicas
parent
c0316978
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
13 deletions
+19
-13
deployment.go
pkg/util/deployment/deployment.go
+19
-13
No files found.
pkg/util/deployment/deployment.go
View file @
069e77d5
...
...
@@ -325,7 +325,9 @@ func SetFromReplicaSetTemplate(deployment *extensions.Deployment, template api.P
func
GetReplicaCountForReplicaSets
(
replicaSets
[]
*
extensions
.
ReplicaSet
)
int
{
totalReplicaCount
:=
0
for
_
,
rs
:=
range
replicaSets
{
totalReplicaCount
+=
rs
.
Spec
.
Replicas
if
rs
!=
nil
{
totalReplicaCount
+=
rs
.
Spec
.
Replicas
}
}
return
totalReplicaCount
}
...
...
@@ -334,7 +336,9 @@ func GetReplicaCountForReplicaSets(replicaSets []*extensions.ReplicaSet) int {
func
GetActualReplicaCountForReplicaSets
(
replicaSets
[]
*
extensions
.
ReplicaSet
)
int
{
totalReplicaCount
:=
0
for
_
,
rs
:=
range
replicaSets
{
totalReplicaCount
+=
rs
.
Status
.
Replicas
if
rs
!=
nil
{
totalReplicaCount
+=
rs
.
Status
.
Replicas
}
}
return
totalReplicaCount
}
...
...
@@ -379,17 +383,19 @@ func IsPodAvailable(pod *api.Pod, minReadySeconds int) bool {
func
GetPodsForReplicaSets
(
c
clientset
.
Interface
,
replicaSets
[]
*
extensions
.
ReplicaSet
)
([]
api
.
Pod
,
error
)
{
allPods
:=
map
[
string
]
api
.
Pod
{}
for
_
,
rs
:=
range
replicaSets
{
selector
,
err
:=
unversioned
.
LabelSelectorAsSelector
(
rs
.
Spec
.
Selector
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"invalid label selector: %v"
,
err
)
}
options
:=
api
.
ListOptions
{
LabelSelector
:
selector
}
podList
,
err
:=
c
.
Core
()
.
Pods
(
rs
.
ObjectMeta
.
Namespace
)
.
List
(
options
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"error listing pods: %v"
,
err
)
}
for
_
,
pod
:=
range
podList
.
Items
{
allPods
[
pod
.
Name
]
=
pod
if
rs
!=
nil
{
selector
,
err
:=
unversioned
.
LabelSelectorAsSelector
(
rs
.
Spec
.
Selector
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"invalid label selector: %v"
,
err
)
}
options
:=
api
.
ListOptions
{
LabelSelector
:
selector
}
podList
,
err
:=
c
.
Core
()
.
Pods
(
rs
.
ObjectMeta
.
Namespace
)
.
List
(
options
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"error listing pods: %v"
,
err
)
}
for
_
,
pod
:=
range
podList
.
Items
{
allPods
[
pod
.
Name
]
=
pod
}
}
}
requiredPods
:=
[]
api
.
Pod
{}
...
...
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