Skip to content

Commit 9928a81

Browse files
karmada-botkarmada-bot
authored
Merge pull request #6770 from rohan-019/add-error-logging-e2e-wait
Add error logging to E2E wait functions
2 parents 712cf40 + 035608e commit 9928a81

File tree

12 files changed

+22
-0
lines changed

12 files changed

+22
-0
lines changed

‎test/e2e/framework/clusterresourcebinding.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func WaitClusterResourceBindingFitWith(client karmada.Interface, name string, fi
3636
gomega.Eventually(func() bool {
3737
clusterResourceBinding, err := client.WorkV1alpha2().ClusterResourceBindings().Get(context.TODO(), name, metav1.GetOptions{})
3838
if err != nil {
39+
klog.Errorf("Failed to get ClusterResourceBinding(%s), err: %v", name, err)
3940
return false
4041
}
4142
return fit(clusterResourceBinding)

‎test/e2e/framework/configmap.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ func WaitConfigMapPresentOnClusterFitWith(cluster, namespace, name string, fit f
6565
gomega.Eventually(func() bool {
6666
configmap, err := clusterClient.CoreV1().ConfigMaps(namespace).Get(context.TODO(), name, metav1.GetOptions{})
6767
if err != nil {
68+
klog.Errorf("Failed to get ConfigMap(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
6869
return false
6970
}
7071
return fit(configmap)

‎test/e2e/framework/customresourcedefine.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,12 @@ func WaitCRDFitWith(client dynamic.Interface, crdName string, fit func(crd *apie
102102
crd := &apiextensionsv1.CustomResourceDefinition{}
103103
unstructured, err := client.Resource(crdGVR).Get(context.TODO(), crdName, metav1.GetOptions{})
104104
if err != nil {
105+
klog.Errorf("Failed to get CustomResourceDefinition(%s), err: %v", crdName, err)
105106
return false
106107
}
107108
err = helper.ConvertToTypedObject(unstructured, crd)
108109
if err != nil {
110+
klog.Errorf("Failed to convert CustomResourceDefinition(%s) to typed object, err: %v", crdName, err)
109111
return false
110112
}
111113
return fit(crd)

‎test/e2e/framework/deployment.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func WaitDeploymentPresentOnClusterFitWith(cluster, namespace, name string, fit
9191
gomega.Eventually(func() bool {
9292
dep, err := clusterClient.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
9393
if err != nil {
94+
klog.Errorf("Failed to get Deployment(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
9495
return false
9596
}
9697
return fit(dep)
@@ -102,6 +103,7 @@ func WaitDeploymentFitWith(client kubernetes.Interface, namespace, name string,
102103
gomega.Eventually(func() bool {
103104
dep, err := client.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
104105
if err != nil {
106+
klog.Errorf("Failed to get Deployment(%s/%s), err: %v", namespace, name, err)
105107
return false
106108
}
107109
return fit(dep)
@@ -123,6 +125,7 @@ func WaitDeploymentStatus(client kubernetes.Interface, deployment *appsv1.Deploy
123125
gomega.Eventually(func() bool {
124126
deploy, err := client.AppsV1().Deployments(deployment.Namespace).Get(context.TODO(), deployment.Name, metav1.GetOptions{})
125127
if err != nil {
128+
klog.Errorf("Failed to get Deployment(%s/%s), err: %v", deployment.Namespace, deployment.Name, err)
126129
return false
127130
}
128131
return CheckDeploymentReadyStatus(deploy, replicas)
@@ -271,6 +274,7 @@ func WaitDeploymentGetByClientFitWith(client kubernetes.Interface, namespace, na
271274
gomega.Eventually(func() bool {
272275
dep, err := client.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
273276
if err != nil {
277+
klog.Errorf("Failed to get Deployment(%s/%s), err: %v", namespace, name, err)
274278
return false
275279
}
276280
return fit(dep)

‎test/e2e/framework/job.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func WaitJobPresentOnClusterFitWith(cluster, namespace, name string, fit func(jo
6464
gomega.Eventually(func() bool {
6565
dep, err := clusterClient.BatchV1().Jobs(namespace).Get(context.TODO(), name, metav1.GetOptions{})
6666
if err != nil {
67+
klog.Errorf("Failed to get Job(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
6768
return false
6869
}
6970
return fit(dep)

‎test/e2e/framework/persistentvolumeclaim.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func WaitPVCPresentOnClusterFitWith(cluster, namespace, name string, fit func(pv
6363
gomega.Eventually(func() bool {
6464
pvc, err := clusterClient.CoreV1().PersistentVolumeClaims(namespace).Get(context.TODO(), name, metav1.GetOptions{})
6565
if err != nil {
66+
klog.Errorf("Failed to get PersistentVolumeClaim(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
6667
return false
6768
}
6869
return fit(pvc)

‎test/e2e/framework/pod.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func WaitPodPresentOnClusterFitWith(cluster, namespace, name string, fit func(po
6161
gomega.Eventually(func() bool {
6262
pod, err := clusterClient.CoreV1().Pods(namespace).Get(context.TODO(), name, metav1.GetOptions{})
6363
if err != nil {
64+
klog.Errorf("Failed to get Pod(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
6465
return false
6566
}
6667
return fit(pod)

‎test/e2e/framework/propagationpolicy.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/types"
29+
"k8s.io/klog/v2"
2930

3031
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
3132
karmada "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
@@ -91,6 +92,7 @@ func WaitPropagationPolicyFitWith(client karmada.Interface, namespace, name stri
9192
gomega.Eventually(func() bool {
9293
policy, err := client.PolicyV1alpha1().PropagationPolicies(namespace).Get(context.TODO(), name, metav1.GetOptions{})
9394
if err != nil {
95+
klog.Errorf("Failed to get PropagationPolicy(%s/%s), err: %v", namespace, name, err)
9496
return false
9597
}
9698
return fit(policy)

‎test/e2e/framework/rbac.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func WaitRolePresentOnClusterFitWith(cluster, namespace, name string, fit func(r
6767
gomega.Eventually(func() bool {
6868
role, err := clusterClient.RbacV1().Roles(namespace).Get(context.TODO(), name, metav1.GetOptions{})
6969
if err != nil {
70+
klog.Errorf("Failed to get Role(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
7071
return false
7172
}
7273
return fit(role)
@@ -139,6 +140,7 @@ func WaitClusterRolePresentOnClusterFitWith(cluster, name string, fit func(clust
139140
gomega.Eventually(func() bool {
140141
clusterRole, err := clusterClient.RbacV1().ClusterRoles().Get(context.TODO(), name, metav1.GetOptions{})
141142
if err != nil {
143+
klog.Errorf("Failed to get ClusterRole(%s) on cluster(%s), err: %v", name, cluster, err)
142144
return false
143145
}
144146
return fit(clusterRole)
@@ -180,6 +182,7 @@ func WaitClusterRoleGetByClientFitWith(client kubernetes.Interface, name string,
180182
gomega.Eventually(func() bool {
181183
clusterRole, err := client.RbacV1().ClusterRoles().Get(context.TODO(), name, metav1.GetOptions{})
182184
if err != nil {
185+
klog.Errorf("Failed to get ClusterRole(%s), err: %v", name, err)
183186
return false
184187
}
185188
return fit(clusterRole)
@@ -224,6 +227,7 @@ func WaitRoleBindingPresentOnClusterFitWith(cluster, namespace, name string, fit
224227
gomega.Eventually(func() bool {
225228
roleBinding, err := clusterClient.RbacV1().RoleBindings(namespace).Get(context.TODO(), name, metav1.GetOptions{})
226229
if err != nil {
230+
klog.Errorf("Failed to get RoleBinding(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
227231
return false
228232
}
229233
return fit(roleBinding)
@@ -296,6 +300,7 @@ func WaitClusterRoleBindingPresentOnClusterFitWith(cluster, name string, fit fun
296300
gomega.Eventually(func() bool {
297301
clusterRoleBinding, err := clusterClient.RbacV1().ClusterRoleBindings().Get(context.TODO(), name, metav1.GetOptions{})
298302
if err != nil {
303+
klog.Errorf("Failed to get ClusterRoleBinding(%s) on cluster(%s), err: %v", name, cluster, err)
299304
return false
300305
}
301306
return fit(clusterRoleBinding)
@@ -359,6 +364,7 @@ func WaitServiceAccountPresentOnClusterFitWith(cluster, namespace, name string,
359364
gomega.Eventually(func() bool {
360365
sa, err := clusterClient.CoreV1().ServiceAccounts(namespace).Get(context.TODO(), name, metav1.GetOptions{})
361366
if err != nil {
367+
klog.Errorf("Failed to get ServiceAccount(%s/%s) on cluster(%s), err: %v", namespace, name, cluster, err)
362368
return false
363369
}
364370
return fit(sa)

‎test/e2e/framework/resourcebinding.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func WaitResourceBindingFitWith(client karmada.Interface, namespace, name string
4040
gomega.Eventually(func() bool {
4141
resourceBinding, err := client.WorkV1alpha2().ResourceBindings(namespace).Get(context.TODO(), name, metav1.GetOptions{})
4242
if err != nil {
43+
klog.Errorf("Failed to get ResourceBinding(%s/%s), err: %v", namespace, name, err)
4344
return false
4445
}
4546
return fit(resourceBinding)

0 commit comments

Comments
 (0)