mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-10 12:32:03 +00:00
Fix watches in init container e2e tests
This commit is contained in:
Tomas Nozicka
parent
2256991c93
commit
c0ddbb0e97
@ -23,23 +23,32 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
"github.com/onsi/gomega"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/fields"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/apimachinery/pkg/util/uuid"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
watchtools "k8s.io/client-go/tools/watch"
|
||||
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
||||
"k8s.io/kubernetes/pkg/client/conditions"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
"github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
func recordEvents(events []watch.Event, f func(watch.Event) (bool, error)) func(watch.Event) (bool, error) {
|
||||
return func(e watch.Event) (bool, error) {
|
||||
events = append(events, e)
|
||||
return f(e)
|
||||
}
|
||||
}
|
||||
|
||||
// invariantFunc is a func that checks for invariant.
|
||||
type invariantFunc func(older, newer runtime.Object) error
|
||||
|
||||
@ -199,14 +208,23 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
}
|
||||
framework.Logf("PodSpec: initContainers in spec.initContainers")
|
||||
startedPod := podClient.Create(pod)
|
||||
w, err := podClient.Watch(context.TODO(), metav1.SingleObject(startedPod.ObjectMeta))
|
||||
framework.ExpectNoError(err, "error watching a pod")
|
||||
wr := watch.NewRecorder(w)
|
||||
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", startedPod.Name).String()
|
||||
w := &cache.ListWatch{
|
||||
WatchFunc: func(options metav1.ListOptions) (i watch.Interface, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return podClient.Watch(context.TODO(), options)
|
||||
},
|
||||
}
|
||||
var events []watch.Event
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), framework.PodStartTimeout)
|
||||
defer cancel()
|
||||
event, err := watchtools.UntilWithoutRetry(ctx, wr, conditions.PodCompleted)
|
||||
event, err := watchtools.Until(ctx, startedPod.ResourceVersion, w,
|
||||
recordEvents(events, conditions.PodCompleted),
|
||||
)
|
||||
gomega.Expect(err).To(gomega.BeNil())
|
||||
checkInvariants(wr.Events(), containerInitInvariant)
|
||||
|
||||
checkInvariants(events, containerInitInvariant)
|
||||
endPod := event.Object.(*v1.Pod)
|
||||
framework.ExpectEqual(endPod.Status.Phase, v1.PodSucceeded)
|
||||
_, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized)
|
||||
@ -269,14 +287,21 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
}
|
||||
framework.Logf("PodSpec: initContainers in spec.initContainers")
|
||||
startedPod := podClient.Create(pod)
|
||||
w, err := podClient.Watch(context.TODO(), metav1.SingleObject(startedPod.ObjectMeta))
|
||||
framework.ExpectNoError(err, "error watching a pod")
|
||||
wr := watch.NewRecorder(w)
|
||||
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", startedPod.Name).String()
|
||||
w := &cache.ListWatch{
|
||||
WatchFunc: func(options metav1.ListOptions) (i watch.Interface, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return podClient.Watch(context.TODO(), options)
|
||||
},
|
||||
}
|
||||
var events []watch.Event
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), framework.PodStartTimeout)
|
||||
defer cancel()
|
||||
event, err := watchtools.UntilWithoutRetry(ctx, wr, conditions.PodRunning)
|
||||
event, err := watchtools.Until(ctx, startedPod.ResourceVersion, w, recordEvents(events, conditions.PodRunning))
|
||||
gomega.Expect(err).To(gomega.BeNil())
|
||||
checkInvariants(wr.Events(), containerInitInvariant)
|
||||
|
||||
checkInvariants(events, containerInitInvariant)
|
||||
endPod := event.Object.(*v1.Pod)
|
||||
framework.ExpectEqual(endPod.Status.Phase, v1.PodRunning)
|
||||
_, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized)
|
||||
@ -340,14 +365,22 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
}
|
||||
framework.Logf("PodSpec: initContainers in spec.initContainers")
|
||||
startedPod := podClient.Create(pod)
|
||||
w, err := podClient.Watch(context.TODO(), metav1.SingleObject(startedPod.ObjectMeta))
|
||||
framework.ExpectNoError(err, "error watching a pod")
|
||||
|
||||
wr := watch.NewRecorder(w)
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", startedPod.Name).String()
|
||||
w := &cache.ListWatch{
|
||||
WatchFunc: func(options metav1.ListOptions) (i watch.Interface, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return podClient.Watch(context.TODO(), options)
|
||||
},
|
||||
}
|
||||
|
||||
var events []watch.Event
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), framework.PodStartTimeout)
|
||||
defer cancel()
|
||||
event, err := watchtools.UntilWithoutRetry(
|
||||
ctx, wr,
|
||||
event, err := watchtools.Until(
|
||||
ctx,
|
||||
startedPod.ResourceVersion,
|
||||
w,
|
||||
// check for the first container to fail at least once
|
||||
func(evt watch.Event) (bool, error) {
|
||||
switch t := evt.Object.(type) {
|
||||
@ -397,7 +430,8 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
},
|
||||
)
|
||||
gomega.Expect(err).To(gomega.BeNil())
|
||||
checkInvariants(wr.Events(), containerInitInvariant)
|
||||
|
||||
checkInvariants(events, containerInitInvariant)
|
||||
endPod := event.Object.(*v1.Pod)
|
||||
framework.ExpectEqual(endPod.Status.Phase, v1.PodPending)
|
||||
_, init := podutil.GetPodCondition(&endPod.Status, v1.PodInitialized)
|
||||
@ -457,14 +491,20 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
framework.Logf("PodSpec: initContainers in spec.initContainers")
|
||||
startedPod := podClient.Create(pod)
|
||||
|
||||
w, err := podClient.Watch(context.TODO(), metav1.SingleObject(startedPod.ObjectMeta))
|
||||
framework.ExpectNoError(err, "error watching a pod")
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", startedPod.Name).String()
|
||||
w := &cache.ListWatch{
|
||||
WatchFunc: func(options metav1.ListOptions) (i watch.Interface, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return podClient.Watch(context.TODO(), options)
|
||||
},
|
||||
}
|
||||
|
||||
wr := watch.NewRecorder(w)
|
||||
var events []watch.Event
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), framework.PodStartTimeout)
|
||||
defer cancel()
|
||||
event, err := watchtools.UntilWithoutRetry(
|
||||
ctx, wr,
|
||||
event, err := watchtools.Until(
|
||||
ctx, startedPod.ResourceVersion, w,
|
||||
recordEvents(events,
|
||||
// check for the second container to fail at least once
|
||||
func(evt watch.Event) (bool, error) {
|
||||
switch t := evt.Object.(type) {
|
||||
@ -501,11 +541,12 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
|
||||
default:
|
||||
return false, fmt.Errorf("unexpected object: %#v", t)
|
||||
}
|
||||
},
|
||||
conditions.PodCompleted,
|
||||
}),
|
||||
recordEvents(events, conditions.PodCompleted),
|
||||
)
|
||||
gomega.Expect(err).To(gomega.BeNil())
|
||||
checkInvariants(wr.Events(), containerInitInvariant)
|
||||
|
||||
checkInvariants(events, containerInitInvariant)
|
||||
endPod := event.Object.(*v1.Pod)
|
||||
|
||||
framework.ExpectEqual(endPod.Status.Phase, v1.PodFailed)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user