github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118935 from alculquicondor/fix-conformance

Browse Source 
Exclude terminal pods from Daemonset e2e tests
This commit is contained in:
Kubernetes Prow Robot 2023-06-29 08:21:37 -07:00 committed by GitHub
commit 134f971d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/sets"
@ -74,6 +75,16 @@ const (
// node selectors labels to namespaces
var NamespaceNodeSelectors = []string{"scheduler.alpha.kubernetes.io/node-selector"}
var nonTerminalPhaseSelector = func() labels.Selector {
var reqs []labels.Requirement
for _, phase := range []v1.PodPhase{v1.PodFailed, v1.PodSucceeded} {
req, _ := labels.NewRequirement("status.phase", selection.NotEquals, []string{string(phase)})
reqs = append(reqs, *req)
}
selector := labels.NewSelector()
return selector.Add(reqs...)
}()
type updateDSFunc func(*appsv1.DaemonSet)
// updateDaemonSetWithRetries updates daemonsets with the given applyUpdate func
@ -1025,7 +1036,10 @@ func newDaemonSetWithLabel(dsName, image string, label map[string]string) *appsv
func listDaemonPods(ctx context.Context, c clientset.Interface, ns string, label map[string]string) *v1.PodList {
selector := labels.Set(label).AsSelector()
options := metav1.ListOptions{LabelSelector: selector.String()}
options := metav1.ListOptions{
LabelSelector: selector.String(),
FieldSelector: nonTerminalPhaseSelector.String(),
}
podList, err := c.CoreV1().Pods(ns).List(ctx, options)
framework.ExpectNoError(err)
gomega.Expect(podList.Items).ToNot(gomega.BeEmpty())