github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114567 from aojea/e2e_dns_context

Browse Source 
e2e dns don't fail if configmap does not exist
This commit is contained in:
Kubernetes Prow Robot 2022-12-18 16:05:53 -08:00 committed by GitHub
commit 789dc88fd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/network/dns_common.go
View File

@ -24,6 +24,7 @@ import (
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
@ -186,7 +187,10 @@ func (t *dnsTestCommon) restoreDNSConfigMap(ctx context.Context, configMapData m
t.setConfigMap(ctx, &v1.ConfigMap{Data: configMapData}) t.setConfigMap(ctx, &v1.ConfigMap{Data: configMapData})
t.deleteCoreDNSPods(ctx) t.deleteCoreDNSPods(ctx)
} else { } else {
framework.ExpectNoError(t.c.CoreV1().ConfigMaps(t.ns).Delete(ctx, t.name, metav1.DeleteOptions{})) err := t.c.CoreV1().ConfigMaps(t.ns).Delete(ctx, t.name, metav1.DeleteOptions{})
if err != nil && !apierrors.IsNotFound(err) {
framework.Failf("Unexpected error deleting configmap %s/%s", t.ns, t.name)
}
} }
} }