github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47475 from crimsonfaith91/e2e

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47915, 47856, 44086, 47575, 47475)

deprecate created-by annotation for e2e test framework

**What this PR does / why we need it**: This PR deprecates created-by annotation for e2e test framework. This is needed as we now have ControllerRef.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: xref #44407

**Special notes for your reviewer**: This is the third PR for deprecating created-by annotation. Other PRs can be found here: #47469, #47471 

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-23 04:06:28 -07:00
committed by GitHub
parent aaa5b2b642 6b9a2f4a89
commit 4d748f5e03
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/util.go
View File

@@ -605,7 +605,7 @@ func WaitForPodsRunningReady(c clientset.Interface, ns string, minPods, allowedN
notReady++ notReady++
badPods = append(badPods, pod) badPods = append(badPods, pod)
default: default:
if _, ok := pod.Annotations[v1.CreatedByAnnotation]; !ok { if controller.GetControllerOf(&pod) == nil {
Logf("Pod %s is Failed, but it's not controlled by a controller", pod.ObjectMeta.Name) Logf("Pod %s is Failed, but it's not controlled by a controller", pod.ObjectMeta.Name)
badPods = append(badPods, pod) badPods = append(badPods, pod)
} }