mirror of https://github.com/k3s-io/k3s
Merge pull request #47475 from crimsonfaith91/e2e
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 ```pull/6/head
commit
4d748f5e03
|
@ -605,7 +605,7 @@ func WaitForPodsRunningReady(c clientset.Interface, ns string, minPods, allowedN
|
|||
notReady++
|
||||
badPods = append(badPods, pod)
|
||||
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)
|
||||
badPods = append(badPods, pod)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue