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

4
test/e2e/apps/daemon_set.go
View File

@@ -630,7 +630,7 @@ func checkDaemonPodOnNodes(f *framework.Framework, ds *extensions.DaemonSet, nod
nodesToPodCount := make(map[string]int)
for _, pod := range pods {
if controllerRef := metav1.GetControllerOf(&pod); controllerRef == nil || controllerRef.UID != ds.UID {
if !metav1.IsControlledBy(&pod, ds) {
continue
}
if pod.DeletionTimestamp != nil {
@@ -726,7 +726,7 @@ func checkDaemonPodsImageAndAvailability(c clientset.Interface, ds *extensions.D
unavailablePods := 0
allImagesUpdated := true
for _, pod := range pods {
if controllerRef := metav1.GetControllerOf(&pod); controllerRef == nil || controllerRef.UID != ds.UID {
if !metav1.IsControlledBy(&pod, ds) {
continue
}
podImage := pod.Spec.Containers[0].Image