github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate to IsControlledBy from meta/v1 package

Browse Source
This commit is contained in:
Mikhail Mazurskiy
2017-08-02 20:36:58 +10:00
parent 042b5642b9
commit 32b78aebf2
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/deployment/util/deployment_util.go
View File

@@ -579,8 +579,7 @@ func ListReplicaSets(deployment *extensions.Deployment, getRSList RsListFunc) ([
// Only include those whose ControllerRef matches the Deployment.
owned := make([]*extensions.ReplicaSet, 0, len(all))
for _, rs := range all {
controllerRef := metav1.GetControllerOf(rs)
if controllerRef != nil && controllerRef.UID == deployment.UID {
if metav1.IsControlledBy(rs, deployment) {
owned = append(owned, rs)
}
}
@@ -603,8 +602,7 @@ func ListReplicaSetsInternal(deployment *internalextensions.Deployment, getRSLis
// Only include those whose ControllerRef matches the Deployment.
filtered := make([]*internalextensions.ReplicaSet, 0, len(all))
for _, rs := range all {
controllerRef := metav1.GetControllerOf(rs)
if controllerRef != nil && controllerRef.UID == deployment.UID {
if metav1.IsControlledBy(rs, deployment) {
filtered = append(filtered, rs)
}
}